From 6038af844860cb78eac8635f6a5d3526c3331f01 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Mon, 16 Sep 2024 19:16:38 -0400 Subject: [PATCH] fix getBlockTemplate --- src/services/bitcoin-rpc.service.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/services/bitcoin-rpc.service.ts b/src/services/bitcoin-rpc.service.ts index 2372494..d8c85be 100644 --- a/src/services/bitcoin-rpc.service.ts +++ b/src/services/bitcoin-rpc.service.ts @@ -98,16 +98,17 @@ export class BitcoinRpcService implements OnModuleInit { const block = await this.rpcBlockService.getBlock(blockHeight); const completeBlock = block?.data != null; - // If the block has already been loaded, and the same instance is fetching the template again, we just need to refresh it. - if (completeBlock && process.env.MASTER == 'true') { - result = await this.loadBlockTemplate(blockHeight); - } - else if (completeBlock) { + + if (completeBlock) { return Promise.resolve(JSON.parse(block.data)); - }else { - //wait for block + } + + if(process.env.MASTER == 'true'){ + result = await this.loadBlockTemplate(blockHeight); + }else{ result = await this.waitForBlock(blockHeight); } + } catch (e) { console.error('Error getblocktemplate:', e.message); throw new Error('Error getblocktemplate');