fix(wait-for-tx-confirm): validate transaction height after awaitHeight

aeternity · May 21, 2021 · 95e0d93 · 95e0d93
1 parent e57b2ba
commit 95e0d93
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/chain/node.js b/src/chain/node.js
@@ -68,7 +68,16 @@ async function sendTransaction (tx, options = {}) {
 async function waitForTxConfirm (txHash, options = { confirm: 3 }) {
   options.confirm = options.confirm === true ? 3 : options.confirm
   const { blockHeight } = await this.tx(txHash)
-  return this.awaitHeight(blockHeight + options.confirm, options)
+  const height = await this.awaitHeight(blockHeight + options.confirm, options)
+  const { blockHeight: newBlockHeight } = await this.tx(txHash)
+  switch (newBlockHeight) {
+    case -1:
+      throw new Error(`Transaction ${txHash} is removed from chain`)
+    case blockHeight:
+      return height
+    default:
+      return waitForTxConfirm(txHash, options)
+  }
 }
 
 async function getAccount (address, { height, hash } = {}) {