Merge pull request #169 from blocknative/release/4.0.0

Release 4.0.0
blocknative · Jan 26, 2022 · 8202a07 · 8202a07
2 parents 7fc29c3 + 8fe2ec2
commit 8202a07
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bnc-sdk",
-  "version": "3.7.1",
+  "version": "4.0.0",
   "description": "SDK to connect to the blocknative backend via a websocket connection",
   "keywords": [
     "ethereum",

diff --git a/src/messages.ts b/src/messages.ts
@@ -238,7 +238,8 @@ export function handleMessage(this: any, msg: { data: string }): void {
 
     // replace originalHash to match webhook API
     if (newState.originalHash) {
-      newState.replaceHash = newState.originalHash
+      newState.replaceHash = newState.hash
+      newState.hash = newState.originalHash
       delete newState.originalHash
     }
 
@@ -296,7 +297,7 @@ export function handleMessage(this: any, msg: { data: string }): void {
       )
     } else {
       const transactionObj = this._watchedTransactions.find(
-        (tx: Tx) => tx.hash === transaction.hash || transaction.txid
+        (tx: Tx) => tx.hash === newState.hash || newState.txid
       )
 
       const emitterResult =
@@ -305,6 +306,17 @@ export function handleMessage(this: any, msg: { data: string }): void {
       this._transactionHandlers.forEach((handler: TransactionHandler) =>
         handler({ transaction: newState, emitterResult })
       )
+
+      // replace the emitter hash to the replace hash on replacement txs
+      if (newState.status === 'speedup' || newState.status === 'cancel') {
+        this._watchedTransactions = this._watchedTransactions.map((tx: Tx) => {
+          if (tx.hash === newState.hash || newState.txid) {
+            return { ...tx, hash: newState.replaceHash }
+          }
+
+          return tx
+        })
+      }
     }
   }
 }