Merge pull request #61 from HathorNetwork/dev

Release v1.4.0-alpha
HathorNetwork · Jul 13, 2022 · ad315e2 · ad315e2
2 parents c0e12ea + aec8d95
commit ad315e2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.2-alpha",
+  "version": "1.4.0-alpha",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

diff --git a/src/types.ts b/src/types.ts
@@ -296,6 +296,7 @@ export interface Meta {
   height: number;
   validation?: string;
   first_block?: string | null;
+  first_block_height?: number | null;
 }
 
 export interface RawTxResponse {

diff --git a/src/utils.ts b/src/utils.ts
@@ -136,11 +136,17 @@ export const recursivelyDownloadTx = async (
 
   // Transaction was already confirmed by a different block
   if (meta.first_block && meta.first_block !== blockId) {
-    const firstBlockResponse = await downloadTx(meta.first_block);
+    let firstBlockHeight = meta.first_block_height;
+
+    // This should never happen
+    // Using == to include `undefined` on this check
+    if (firstBlockHeight == null) {
+      throw new Error('Transaction was confirmed by a block but we were unable to detect its height');
+    }
 
     // If the transaction was confirmed by an older block, ignore it as it was
     // already sent to the wallet-service
-    if (firstBlockResponse.tx.height < blockHeight) {
+    if (firstBlockHeight < blockHeight) {
       return recursivelyDownloadTx(blockId, blockHeight, txIds, data);
     }
   }