chore: added additional confirmation of UO on RPC side before the processing

Author: 0xdeval

packages/sdk/src/test/mocks/ChainManagerMock.ts

@@ -11,6 +11,7 @@ export const createMockChainManager = (): ChainManager => {
   const mockPublicClient = {
     readContract: vi.fn(),
     getBalance: vi.fn(),
+    waitForTransactionReceipt: vi.fn(),
   } as unknown as PublicClient;
 
   const mockBundlerClient = {

packages/sdk/src/wallet/DefaultSmartWallet.spec.ts

@@ -172,9 +172,9 @@ describe('DefaultSmartWallet integration tests', () => {
       };
       vi.mocked(bundlerClient.estimateUserOperationGas).mockResolvedValue(mockGasEstimate);
       vi.mocked(bundlerClient.sendUserOperation).mockResolvedValue('0xTransactionHash');
-      // vi.mocked(bundlerClient.waitForUserOperationReceipt).mockResolvedValue({
-      //   receipt: {} as unknown as TransactionReceipt,
-      // });
+      vi.mocked(bundlerClient.waitForUserOperationReceipt).mockResolvedValue({
+        receipt: { transactionHash: '0xTransactionHash' },
+      });
 
       const result = await wallet.send(transactionData, chainId);
 
@@ -264,6 +264,9 @@ describe('DefaultSmartWallet integration tests', () => {
       };
       vi.mocked(bundlerClient.estimateUserOperationGas).mockResolvedValue(mockGasEstimate);
       vi.mocked(bundlerClient.sendUserOperation).mockResolvedValue('0xTransactionHash');
+      vi.mocked(bundlerClient.waitForUserOperationReceipt).mockResolvedValue({
+        receipt: { transactionHash: '0xTransactionHash' },
+      });
 
       const result = await wallet.sendBatch(transactionData, chainId);
 

packages/sdk/src/wallet/DefaultSmartWallet.ts

@@ -286,25 +286,31 @@ export class DefaultSmartWallet extends SmartWallet {
       }
 
       const bundlerClient = this.chainManager.getBundlerClient(chainId, account);
+      const publicClient = this.chainManager.getPublicClient(chainId);
 
       const gas = await bundlerClient.estimateUserOperationGas({
         account,
         calls: [transactionData],
       });
 
-      const hash = await bundlerClient.sendUserOperation({
+      const userOperationHash = await bundlerClient.sendUserOperation({
         account,
         calls: [transactionData],
         callGasLimit: this.bumpGasLimits(gas.callGasLimit),
         verificationGasLimit: this.bumpGasLimits(gas.verificationGasLimit),
         preVerificationGas: this.bumpGasLimits(gas.preVerificationGas),
       });
 
-      await bundlerClient.waitForUserOperationReceipt({
-        hash,
+      const userOperationReceipt = await bundlerClient.waitForUserOperationReceipt({
+        hash: userOperationHash,
       });
 
-      return hash;
+      // Extra check that RPC node has included the transaction in the block
+      await publicClient.waitForTransactionReceipt({
+        hash: userOperationReceipt.receipt.transactionHash,
+      });
+
+      return userOperationHash;
     } catch (error) {
       throw new Error(
         `Failed to send transaction: ${error instanceof Error ? error.message.toString().slice(0, 100) : 'Unknown error'}`,
@@ -346,25 +352,31 @@ export class DefaultSmartWallet extends SmartWallet {
       }
 
       const bundlerClient = this.chainManager.getBundlerClient(chainId, account);
+      const publicClient = this.chainManager.getPublicClient(chainId);
 
       const gas = await bundlerClient.estimateUserOperationGas({
         account,
         calls: transactionData,
       });
 
-      const hash = await bundlerClient.sendUserOperation({
+      const userOperationHash = await bundlerClient.sendUserOperation({
         account,
         calls: transactionData,
         callGasLimit: this.bumpGasLimits(gas.callGasLimit),
         verificationGasLimit: this.bumpGasLimits(gas.verificationGasLimit),
         preVerificationGas: this.bumpGasLimits(gas.preVerificationGas),
       });
 
-      await bundlerClient.waitForUserOperationReceipt({
-        hash,
+      const userOperationReceipt = await bundlerClient.waitForUserOperationReceipt({
+        hash: userOperationHash,
+      });
+
+      // Extra check that RPC node has included the transaction in the block
+      await publicClient.waitForTransactionReceipt({
+        hash: userOperationReceipt.receipt.transactionHash,
       });
 
-      return hash;
+      return userOperationHash;
     } catch (error) {
       throw new Error(
         `Failed to send transaction: ${error instanceof Error ? error.message : 'Unknown error'}`,