fix(predict): harden deposit wallet onboarding

ghgoodreau · cursoragent · ghgoodreau · commit c83ebdbb6712 · 2026-05-05T22:07:54.000-05:00
Refresh deposit wallet account state and align relayer batch deadlines with Polymarket guidance while adding focused coverage for the new wallet paths.

Co-authored-by: Cursor &lt;cursoragent@cursor.com&gt;
diff --git a/app/components/UI/Predict/providers/polymarket/PolymarketProvider.test.ts b/app/components/UI/Predict/providers/polymarket/PolymarketProvider.test.ts
@@ -5426,18 +5426,35 @@ describe('PolymarketProvider', () => {
       });
     });
 
-    it('caches account state by owner address', async () => {
-      // Given an account state check
+    it('refreshes account state for repeated owner lookups', async () => {
       const provider = createProvider();
-      (isSmartContractAddress as jest.Mock).mockResolvedValue(true);
-      (hasAllowances as jest.Mock).mockResolvedValue(true);
+      (isSmartContractAddress as jest.Mock)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(true);
+      (hasAllowances as jest.Mock)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(true);
 
-      // When getting account state twice
-      await provider.getAccountState({ ownerAddress: '0x123' });
-      await provider.getAccountState({ ownerAddress: '0x123' });
+      const firstResult = await provider.getAccountState({
+        ownerAddress: '0x123',
+      });
+      const secondResult = await provider.getAccountState({
+        ownerAddress: '0x123',
+      });
 
-      // Then Safe address is only computed once
-      expect(computeProxyAddress).toHaveBeenCalledTimes(1);
+      expect(firstResult).toEqual({
+        address: '0xSafeAddress',
+        isDeployed: false,
+        hasAllowances: false,
+        walletType: 'safe',
+      });
+      expect(secondResult).toEqual({
+        address: '0xSafeAddress',
+        isDeployed: true,
+        hasAllowances: true,
+        walletType: 'safe',
+      });
+      expect(computeProxyAddress).toHaveBeenCalledTimes(2);
     });
 
     it('computes Safe address for each unique owner', async () => {
diff --git a/app/components/UI/Predict/providers/polymarket/PolymarketProvider.ts b/app/components/UI/Predict/providers/polymarket/PolymarketProvider.ts
@@ -2391,11 +2391,6 @@ export class PolymarketProvider implements PredictProvider {
         throw new Error('Owner address is required');
       }
 
-      const cachedAccountState = this.#accountStateByAddress.get(ownerAddress);
-      if (cachedAccountState) {
-        return cachedAccountState;
-      }
-
       const protocol = this.#getProtocol();
       const { feeCollection: flagFeeCollection } = this.#getFeatureFlags();
       const extraUsdcSpenders = flagFeeCollection.permit2Enabled
diff --git a/app/components/UI/Predict/providers/polymarket/depositWallet.test.ts b/app/components/UI/Predict/providers/polymarket/depositWallet.test.ts
@@ -1,11 +1,15 @@
 import {
+  createDepositWalletPermit2FeeAuthorization,
   DEPOSIT_WALLET_FACTORY_ADDRESS,
   deriveDepositWalletAddress,
+  executeDepositWalletBatch,
   getDepositWalletNonce,
   requestDepositWalletCreate,
   syncDepositWalletClobBalanceAllowance,
   toDepositWalletCalls,
+  waitForDepositWalletTransaction,
 } from './depositWallet';
+import { getPermit2Nonce } from './safe/utils';
 import { getL2Headers } from './utils';
 
 jest.mock('./utils', () => ({
@@ -15,8 +19,20 @@ jest.mock('./utils', () => ({
   })),
 }));
 
+jest.mock('./safe/utils', () => ({
+  getPermit2Nonce: jest.fn(),
+}));
+
 describe('deposit wallet helpers', () => {
   const mockFetch = jest.fn();
+  const ownerAddress = '0x1111111111111111111111111111111111111111';
+  const depositWalletAddress = '0x2222222222222222222222222222222222222222';
+  const typedSignature = `0x${'11'.repeat(32)}${'22'.repeat(32)}1b`;
+  const signer = {
+    address: ownerAddress,
+    signTypedMessage: jest.fn().mockResolvedValue(typedSignature),
+    signPersonalMessage: jest.fn(),
+  };
 
   beforeEach(() => {
     jest.clearAllMocks();
@@ -28,11 +44,17 @@ describe('deposit wallet helpers', () => {
       POLY_API_KEY: 'apiKey',
       POLY_PASSPHRASE: 'passphrase',
     });
+    (getPermit2Nonce as jest.Mock).mockResolvedValue('7');
+    signer.signTypedMessage.mockResolvedValue(typedSignature);
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
   });
 
   it('derives the deterministic deposit wallet address for an owner', () => {
     expect(
-      deriveDepositWalletAddress('0x1111111111111111111111111111111111111111'),
+      deriveDepositWalletAddress(ownerAddress),
     ).toBe('0xfAeA0f08159fcF2f573fE24E9E989B0d48f7651B');
   });
 
@@ -44,7 +66,7 @@ describe('deposit wallet helpers', () => {
 
     await expect(
       requestDepositWalletCreate({
-        ownerAddress: '0x1111111111111111111111111111111111111111',
+        ownerAddress,
       }),
     ).resolves.toEqual({ transactionID: 'wallet-create-1' });
 
@@ -53,7 +75,7 @@ describe('deposit wallet helpers', () => {
       expect.objectContaining({
         method: 'POST',
         body: JSON.stringify({
-          owner: '0x1111111111111111111111111111111111111111',
+          owner: ownerAddress,
           factory: DEPOSIT_WALLET_FACTORY_ADDRESS,
         }),
       }),
@@ -68,21 +90,125 @@ describe('deposit wallet helpers', () => {
 
     await expect(
       getDepositWalletNonce({
-        ownerAddress: '0x1111111111111111111111111111111111111111',
+        ownerAddress,
       }),
     ).resolves.toBe('42');
 
     expect(mockFetch).toHaveBeenCalledWith(
       'https://predict.api.cx.metamask.io/wallet/nonce',
       expect.objectContaining({
         body: JSON.stringify({
-          owner: '0x1111111111111111111111111111111111111111',
+          owner: ownerAddress,
           type: 'WALLET',
         }),
       }),
     );
   });
 
+  it('signs and submits deposit wallet batches with the current wallet nonce', async () => {
+    jest.spyOn(Date, 'now').mockReturnValue(1_700_000_000_000);
+    mockFetch
+      .mockResolvedValueOnce({
+        ok: true,
+        json: async () => ({ nonce: '42' }),
+      })
+      .mockResolvedValueOnce({
+        ok: true,
+        json: async () => ({ transactionID: 'wallet-batch-1' }),
+      });
+
+    await expect(
+      executeDepositWalletBatch({
+        signer,
+        walletAddress: depositWalletAddress,
+        calls: [
+          {
+            target: '0x3333333333333333333333333333333333333333',
+            value: '0',
+            data: '0xabcdef',
+          },
+        ],
+      }),
+    ).resolves.toEqual({ transactionID: 'wallet-batch-1' });
+
+    expect(signer.signTypedMessage).toHaveBeenCalledWith(
+      expect.objectContaining({
+        from: ownerAddress,
+        data: expect.objectContaining({
+          domain: expect.objectContaining({
+            name: 'DepositWallet',
+            version: '1',
+            verifyingContract: depositWalletAddress,
+          }),
+          primaryType: 'Batch',
+          message: expect.objectContaining({
+            wallet: depositWalletAddress,
+            nonce: '42',
+            deadline: '1700000240',
+          }),
+        }),
+      }),
+      'V4',
+    );
+    expect(mockFetch).toHaveBeenLastCalledWith(
+      'https://predict.api.cx.metamask.io/wallet/execute',
+      expect.objectContaining({
+        body: JSON.stringify({
+          owner: ownerAddress,
+          factory: DEPOSIT_WALLET_FACTORY_ADDRESS,
+          nonce: '42',
+          signature: typedSignature,
+          depositWalletParams: {
+            depositWallet: depositWalletAddress,
+            deadline: '1700000240',
+            calls: [
+              {
+                target: '0x3333333333333333333333333333333333333333',
+                value: '0',
+                data: '0xabcdef',
+              },
+            ],
+          },
+        }),
+      }),
+    );
+  });
+
+  it('polls deposit wallet transactions until the relayer confirms them', async () => {
+    mockFetch
+      .mockResolvedValueOnce({
+        ok: true,
+        json: async () => [{ state: 'STATE_PENDING' }],
+      })
+      .mockResolvedValueOnce({
+        ok: true,
+        json: async () => [{ state: 'STATE_CONFIRMED' }],
+      });
+
+    await expect(
+      waitForDepositWalletTransaction({
+        transactionID: 'wallet-batch-1',
+        pollIntervalMs: 0,
+      }),
+    ).resolves.toBeUndefined();
+
+    expect(mockFetch).toHaveBeenCalledTimes(2);
+  });
+
+  it('rejects failed deposit wallet relayer transactions', async () => {
+    mockFetch.mockResolvedValueOnce({
+      ok: true,
+      json: async () => ({ state: 'STATE_FAILED' }),
+    });
+
+    await expect(
+      waitForDepositWalletTransaction({
+        transactionID: 'wallet-batch-1',
+        pollIntervalMs: 0,
+      }),
+    ).rejects.toThrow('Deposit wallet transaction failed: STATE_FAILED');
+  });
+
   it('maps internal Safe-style calls to deposit wallet calls', () => {
     expect(
       toDepositWalletCalls([
@@ -115,7 +241,7 @@ describe('deposit wallet helpers', () => {
           clobVersionHeader: '2',
         },
       },
-      signerAddress: '0x1111111111111111111111111111111111111111',
+      signerAddress: ownerAddress,
       apiKey: {
         apiKey: 'key',
         secret: 'secret',
@@ -129,7 +255,7 @@ describe('deposit wallet helpers', () => {
         requestPath:
           '/balance-allowance/update?asset_type=COLLATERAL&signature_type=3',
       },
-      address: '0x1111111111111111111111111111111111111111',
+      address: ownerAddress,
       apiKey: {
         apiKey: 'key',
         secret: 'secret',
@@ -143,4 +269,51 @@ describe('deposit wallet helpers', () => {
       }),
     );
   });
+
+  it('creates Permit2 fee authorizations signed by the deposit wallet owner', async () => {
+    jest.spyOn(Date, 'now').mockReturnValue(1_700_000_000_000);
+
+    const authorization = await createDepositWalletPermit2FeeAuthorization({
+      signer,
+      amount: 123n,
+      spender: '0x3333333333333333333333333333333333333333',
+      tokenAddress: '0x4444444444444444444444444444444444444444',
+    });
+
+    expect(signer.signTypedMessage).toHaveBeenCalledWith(
+      expect.objectContaining({
+        from: ownerAddress,
+        data: expect.objectContaining({
+          domain: expect.objectContaining({ name: 'Permit2' }),
+          primaryType: 'PermitTransferFrom',
+          message: {
+            permitted: {
+              token: '0x4444444444444444444444444444444444444444',
+              amount: '123',
+            },
+            spender: '0x3333333333333333333333333333333333333333',
+            nonce: '7',
+            deadline: '1700003600',
+          },
+        }),
+      }),
+      'V4',
+    );
+    expect(authorization).toEqual({
+      type: 'safe-permit2',
+      authorization: {
+        permit: {
+          permitted: {
+            token: '0x4444444444444444444444444444444444444444',
+            amount: '123',
+          },
+          spender: '0x3333333333333333333333333333333333333333',
+          nonce: '7',
+          deadline: '1700003600',
+        },
+        spender: '0x3333333333333333333333333333333333333333',
+        signature: typedSignature,
+      },
+    });
+  });
 });
diff --git a/app/components/UI/Predict/providers/polymarket/depositWallet.ts b/app/components/UI/Predict/providers/polymarket/depositWallet.ts
@@ -32,7 +32,7 @@ const ERC1967_CONST1 =
 const ERC1967_CONST2 =
   '0x5155f3363d3d373d3d363d7f360894a13ba1a3210667c828492db98dca3e2076';
 const ERC1967_PREFIX = 0x61003d3d8160233d3973n;
-const DEPOSIT_WALLET_BATCH_TTL_SECONDS = 15 * 60;
+const DEPOSIT_WALLET_BATCH_TTL_SECONDS = 240;
 const RELAYER_SUCCESS_STATES = new Set(['STATE_MINED', 'STATE_CONFIRMED']);
 const RELAYER_FAILED_STATES = new Set(['STATE_FAILED', 'STATE_INVALID']);
 
