@eth-optimism/actions-sdk 0.6.0 → 0.7.0

package/src/wallet/core/wallets/eoa/__tests__/EOAWallet.spec.ts

@@ -120,10 +120,44 @@ describe('EOAWallet', () => {
 
       expect(createWalletClient).toHaveBeenCalledOnce()
       const callArgs = vi.mocked(createWalletClient).mock.calls[0][0]
-      expect(callArgs.account).toBe(mockLocalAccount)
+      expect(callArgs.account).toMatchObject({
+        address: mockLocalAccount.address,
+      })
       expect(callArgs.chain).toBe(unichain)
       expect(walletClient).toBe(mockWalletClient)
     })
+
+    it('attaches a nonce manager so back-to-back sends get sequential nonces', async () => {
+      await wallet.walletClient(unichain.id)
+
+      const callArgs = vi.mocked(createWalletClient).mock.calls[0][0]
+      const account = callArgs.account as { nonceManager?: unknown }
+      expect(account.nonceManager).toMatchObject({
+        consume: expect.any(Function),
+        increment: expect.any(Function),
+        get: expect.any(Function),
+        reset: expect.any(Function),
+      })
+    })
+
+    it('respects a nonce manager already set on the signer', async () => {
+      const customNonceManager = {
+        consume: vi.fn(),
+        increment: vi.fn(),
+        get: vi.fn(),
+        reset: vi.fn(),
+      }
+      ;(mockLocalAccount as LocalAccount).nonceManager =
+        customNonceManager as unknown as LocalAccount['nonceManager']
+
+      await wallet.walletClient(unichain.id)
+
+      const callArgs = vi.mocked(createWalletClient).mock.calls[0][0]
+      const account = callArgs.account as { nonceManager?: unknown }
+      expect(account.nonceManager).toBe(customNonceManager)
+
+      delete (mockLocalAccount as LocalAccount).nonceManager
+    })
   })
 
   describe('send', () => {
@@ -191,13 +225,12 @@ describe('EOAWallet', () => {
         .mockResolvedValueOnce(mockReceipt2.transactionHash)
         .mockResolvedValueOnce(mockReceipt3.transactionHash)
 
+      // sendBatch performs exactly one inclusion wait per transaction (the
+      // wait inside `send()`). One mock per tx.
       vi.mocked(mockPublicClient.waitForTransactionReceipt)
         .mockResolvedValueOnce(mockReceipt)
-        .mockResolvedValueOnce(mockReceipt)
-        .mockResolvedValueOnce(mockReceipt2)
         .mockResolvedValueOnce(mockReceipt2)
         .mockResolvedValueOnce(mockReceipt3)
-        .mockResolvedValueOnce(mockReceipt3)
     })
 
     it('should send multiple transactions sequentially', async () => {
@@ -226,33 +259,19 @@ describe('EOAWallet', () => {
       )
     })
 
-    it('should wait for extra confirmations after each transaction', async () => {
+    it('waits for exactly one confirmation per transaction', async () => {
       await wallet.sendBatch(
         [mockTransactionData1, mockTransactionData2],
         unichain.id,
       )
 
-      // Should be called twice per transaction:
-      // 1. Initial wait in send()
-      // 2. Extra confirmation wait (confirmations: 2) in sendBatch()
+      // One inclusion wait per tx, via `send()`.
       expect(mockPublicClient.waitForTransactionReceipt).toHaveBeenCalledTimes(
-        4,
+        2,
       )
-
-      // Check that extra confirmation wait was called with confirmations: 2
       expect(
         mockPublicClient.waitForTransactionReceipt,
-      ).toHaveBeenNthCalledWith(2, {
-        hash: mockReceipt.transactionHash,
-        confirmations: 2,
-      })
-
-      expect(
-        mockPublicClient.waitForTransactionReceipt,
-      ).toHaveBeenNthCalledWith(4, {
-        hash: mockReceipt2.transactionHash,
-        confirmations: 2,
-      })
+      ).not.toHaveBeenCalledWith(expect.objectContaining({ confirmations: 2 }))
     })
 
     it('should get public client for each transaction', async () => {
@@ -261,8 +280,8 @@ describe('EOAWallet', () => {
         unichain.id,
       )
 
-      // Called twice per transaction (once in send, once for extra confirmation)
-      expect(mockChainManager.getPublicClient).toHaveBeenCalledTimes(4)
+      // One getPublicClient call per transaction (via send()).
+      expect(mockChainManager.getPublicClient).toHaveBeenCalledTimes(2)
       expect(mockChainManager.getPublicClient).toHaveBeenCalledWith(unichain.id)
     })
 

package/src/wallet/node/wallets/hosted/privy/__tests__/PrivyWallet.spec.ts

@@ -115,7 +115,10 @@ describe('PrivyWallet', () => {
 
     expect(createWalletClient).toHaveBeenCalledOnce()
     const callArgs = vi.mocked(createWalletClient).mock.calls[0][0]
-    expect(callArgs.account).toBe(mockLocalAccount)
+    expect(callArgs.account).toMatchObject({
+      address: mockLocalAccount.address,
+    })
+    expect(callArgs.account).toHaveProperty('nonceManager')
     expect(callArgs.chain).toBe(mockChainManager.getChain(unichain.id))
     expect(walletClient).toBe(mockWalletClient)
   })

package/src/wallet/node/wallets/hosted/turnkey/__tests__/TurnkeyWallet.spec.ts

@@ -97,7 +97,8 @@ describe('TurnkeyWallet', () => {
 
     expect(createWalletClient).toHaveBeenCalledOnce()
     const args = vi.mocked(createWalletClient).mock.calls[0][0]
-    expect(args.account).toBe(mockLocalAccount)
+    expect(args.account).toMatchObject({ address: mockLocalAccount.address })
+    expect(args.account).toHaveProperty('nonceManager')
     expect(args.chain).toBe(mockChainManager.getChain(unichain.id))
     expect(walletClient).toBe(mockWalletClient)
   })

package/src/wallet/node/wallets/local/__tests__/LocalWallet.spec.ts

@@ -57,7 +57,8 @@ describe('LocalWallet', () => {
 
     expect(createWalletClient).toHaveBeenCalledOnce()
     const args = vi.mocked(createWalletClient).mock.calls[0][0]
-    expect(args.account).toBe(mockAccount)
+    expect(args.account).toMatchObject({ address: mockAccount.address })
+    expect(args.account).toHaveProperty('nonceManager')
     expect(args.chain).toBe(mockChainManager.getChain(unichain.id))
     expect(walletClient).toBe(mockWalletClient)
   })

package/src/wallet/react/wallets/hosted/dynamic/__tests__/DynamicWallet.spec.ts

@@ -123,7 +123,8 @@ describe('DynamicWallet', () => {
 
     expect(createWalletClient).toHaveBeenCalledOnce()
     const args = vi.mocked(createWalletClient).mock.calls[0][0]
-    expect(args.account).toBe(mockLocalAccount)
+    expect(args.account).toMatchObject({ address: mockLocalAccount.address })
+    expect(args.account).toHaveProperty('nonceManager')
     expect(args.chain).toBe(mockChainManager.getChain(unichain.id))
     expect(walletClient).toBe(mockWalletClient)
   })

package/src/wallet/react/wallets/hosted/privy/__tests__/PrivyWallet.spec.ts

@@ -102,7 +102,8 @@ describe('PrivyWallet (React)', () => {
 
     expect(createWalletClient).toHaveBeenCalledOnce()
     const args = vi.mocked(createWalletClient).mock.calls[0][0]
-    expect(args.account).toBe(mockLocalAccount)
+    expect(args.account).toMatchObject({ address: mockLocalAccount.address })
+    expect(args.account).toHaveProperty('nonceManager')
     expect(args.chain).toBe(mockChainManager.getChain(unichain.id))
     expect(walletClient).toBe(mockWalletClient)
   })

package/src/wallet/react/wallets/hosted/turnkey/__tests__/TurnkeyWallet.spec.ts

@@ -92,7 +92,8 @@ describe('TurnkeyWallet', () => {
 
     expect(createWalletClient).toHaveBeenCalledOnce()
     const args = vi.mocked(createWalletClient).mock.calls[0][0]
-    expect(args.account).toBe(mockLocalAccount)
+    expect(args.account).toMatchObject({ address: mockLocalAccount.address })
+    expect(args.account).toHaveProperty('nonceManager')
     expect(args.chain).toBe(mockChainManager.getChain(unichain.id))
     expect(walletClient).toBe(mockWalletClient)
   })