fix: correct logic for identifying repriced transactions (#3194)

* fix: correct logic for identifying repriced transactions * Update sixty-mice-build.md --------- Co-authored-by: jxom <[email protected]>
wevm · Jan 7, 2025 · 497fa72 · 497fa72
1 parent 7d1f85f
commit 497fa72
Show file tree

Hide file tree

Showing 4 changed files with 132 additions and 2 deletions.
diff --git a/.changeset/sixty-mice-build.md b/.changeset/sixty-mice-build.md
@@ -0,0 +1,5 @@
+---
+"viem": patch
+---
+
+Fixed transaction reprice logic in `waitForTransactionReceipt` to account for `transaction.input` as well.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/actions/public/waitForTransactionReceipt.test.ts b/src/actions/public/waitForTransactionReceipt.test.ts
@@ -292,6 +292,104 @@ describe('replaced transactions', () => {
     expect(receipt !== null).toBeTruthy()
   })
 
+  test('repriced (same input)', async () => {
+    setup()
+
+    await mine(client, { blocks: 10 })
+
+    const nonce = hexToNumber(
+      (await client.request({
+        method: 'eth_getTransactionCount',
+        params: [sourceAccount.address, 'latest'],
+      })) ?? '0x0',
+    )
+
+    const hash = await sendTransaction(client, {
+      account: sourceAccount.address,
+      to: targetAccount.address,
+      value: parseEther('1'),
+      data: '0x',
+      maxFeePerGas: parseGwei('10'),
+      nonce,
+    })
+
+    let replacement: any
+    const [receipt] = await Promise.all([
+      waitForTransactionReceipt(client, {
+        hash,
+        onReplaced: (replacement_) => (replacement = replacement_),
+      }),
+      (async () => {
+        await wait(100)
+
+        // speed up
+        await sendTransaction(client, {
+          account: sourceAccount.address,
+          to: targetAccount.address,
+          value: parseEther('1'),
+          data: '0x',
+          nonce,
+          maxFeePerGas: parseGwei('20'),
+        })
+      })(),
+    ])
+
+    expect(receipt !== null).toBeTruthy()
+    expect(replacement.reason).toBe('repriced')
+    expect(replacement.replacedTransaction).toBeDefined()
+    expect(replacement.transaction).toBeDefined()
+    expect(replacement.transactionReceipt).toBeDefined()
+  })
+
+  test('replaced (different input)', async () => {
+    setup()
+
+    await mine(client, { blocks: 10 })
+
+    const nonce = hexToNumber(
+      (await client.request({
+        method: 'eth_getTransactionCount',
+        params: [sourceAccount.address, 'latest'],
+      })) ?? '0x0',
+    )
+
+    const hash = await sendTransaction(client, {
+      account: sourceAccount.address,
+      to: targetAccount.address,
+      value: parseEther('1'),
+      data: '0x',
+      maxFeePerGas: parseGwei('10'),
+      nonce,
+    })
+
+    let replacement: any
+    const [receipt] = await Promise.all([
+      waitForTransactionReceipt(client, {
+        hash,
+        onReplaced: (replacement_) => (replacement = replacement_),
+      }),
+      (async () => {
+        await wait(100)
+
+        // speed up
+        await sendTransaction(client, {
+          account: sourceAccount.address,
+          to: targetAccount.address,
+          value: parseEther('1'),
+          data: '0xdeadbeef',
+          nonce,
+          maxFeePerGas: parseGwei('20'),
+        })
+      })(),
+    ])
+
+    expect(receipt !== null).toBeTruthy()
+    expect(replacement.reason).toBe('replaced')
+    expect(replacement.replacedTransaction).toBeDefined()
+    expect(replacement.transaction).toBeDefined()
+    expect(replacement.transactionReceipt).toBeDefined()
+  })
+
   test('cancelled', async () => {
     setup()
 

diff --git a/src/actions/public/waitForTransactionReceipt.ts b/src/actions/public/waitForTransactionReceipt.ts
@@ -308,7 +308,8 @@ export async function waitForTransactionReceipt<
                 let reason: ReplacementReason = 'replaced'
                 if (
                   replacementTransaction.to === replacedTransaction.to &&
-                  replacementTransaction.value === replacedTransaction.value
+                  replacementTransaction.value === replacedTransaction.value &&
+                  replacementTransaction.input === replacedTransaction.input
                 ) {
                   reason = 'repriced'
                 } else if (