changeset

Author: joaquim-verges

.changeset/tiny-pugs-hunt.md

@@ -0,0 +1,20 @@
+---
+"thirdweb": minor
+---
+
+ERC20 Token Paymaster support
+
+You can now use ERC20 Token Paymasters with Smart Wallets.
+
+```typescript
+import { base } from "thirdweb/chains";
+import { TokenPaymaster, smartWallet } from "thirdweb/wallets";
+
+const wallet = smartWallet({
+  chain: base,
+  sponsorGas: true, // only sponsor gas for the first ERC20 approval
+  overrides: {
+    tokenPaymaster: TokenPaymaster.BASE_USDC,
+  },
+});
+```

packages/thirdweb/src/wallets/smart/lib/bundler.ts

@@ -72,8 +72,13 @@ export async function estimateUserOpGas(
     userOp: UserOperationV06 | UserOperationV07;
     options: BundlerOptions;
   },
-  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-  stateOverrides?: any,
+  stateOverrides?: {
+    [x: string]: {
+      stateDiff: {
+        [x: string]: `0x${string}`;
+      };
+    };
+  },
 ): Promise<EstimationResult> {
   const res = await sendBundlerRequest({
     ...args,

packages/thirdweb/src/wallets/smart/lib/constants.ts

@@ -18,7 +18,7 @@ export const ENTRYPOINT_ADDRESS_v0_7 =
 
 export const MANAGED_ACCOUNT_GAS_BUFFER = 50000n;
 
-export type PAYMASTERS = "BASE_USDC" | "CELO_CUSD" | "LISK_LSK";
+type PAYMASTERS = "BASE_USDC" | "CELO_CUSD" | "LISK_LSK";
 export const TokenPaymaster: Record<PAYMASTERS, TokenPaymasterConfig> = {
   BASE_USDC: {
     chainId: 8453,

packages/thirdweb/src/wallets/smart/smart-wallet-tokenpaymaster.test.ts

@@ -5,9 +5,7 @@ import { celo } from "../../chains/chain-definitions/celo.js";
 import { defineChain } from "../../chains/utils.js";
 import { sendTransaction } from "../../transaction/actions/send-transaction.js";
 import { prepareTransaction } from "../../transaction/prepare-transaction.js";
-import type { Address } from "../../utils/address.js";
 import { privateKeyToAccount } from "../private-key.js";
-import { getWalletBalance } from "../utils/getWalletBalance.js";
 import { TokenPaymaster } from "./lib/constants.js";
 import { smartWallet } from "./smart-wallet.js";
 
@@ -39,17 +37,6 @@ describe.runIf(process.env.TW_SECRET_KEY).skip.sequential(
         client: TEST_CLIENT,
         personalAccount,
       });
-      const smartWalletAddress = smartAccount.address as Address;
-      console.log("smartWalletAddress", smartWalletAddress);
-      console.log(
-        "balance before",
-        await getWalletBalance({
-          address: smartAccount.address,
-          chain: chain,
-          client,
-          tokenAddress: tokenPaymaster.tokenAddress,
-        }),
-      );
       const tx = prepareTransaction({
         client,
         chain,
@@ -61,15 +48,6 @@ describe.runIf(process.env.TW_SECRET_KEY).skip.sequential(
         account: smartAccount,
       });
       expect(receipt.transactionHash).toBeDefined();
-      console.log(
-        "balance after",
-        await getWalletBalance({
-          address: smartAccount.address,
-          chain: chain,
-          client,
-          tokenAddress: tokenPaymaster.tokenAddress,
-        }),
-      );
     });
 
     it.skip("should send a transaction with base celo", async () => {
@@ -91,17 +69,6 @@ describe.runIf(process.env.TW_SECRET_KEY).skip.sequential(
         client: TEST_CLIENT,
         personalAccount,
       });
-      const smartWalletAddress = smartAccount.address as Address;
-      console.log("smartWalletAddress", smartWalletAddress);
-      console.log(
-        "balance before",
-        await getWalletBalance({
-          address: smartAccount.address,
-          chain: chain,
-          client,
-          tokenAddress: tokenPaymaster.tokenAddress,
-        }),
-      );
       const tx = prepareTransaction({
         client,
         chain,
@@ -113,15 +80,6 @@ describe.runIf(process.env.TW_SECRET_KEY).skip.sequential(
         account: smartAccount,
       });
       expect(receipt.transactionHash).toBeDefined();
-      console.log(
-        "balance after",
-        await getWalletBalance({
-          address: smartAccount.address,
-          chain: chain,
-          client,
-          tokenAddress: tokenPaymaster.tokenAddress,
-        }),
-      );
     });
 
     it("should send a transaction with base lisk", async () => {
@@ -143,17 +101,6 @@ describe.runIf(process.env.TW_SECRET_KEY).skip.sequential(
         client: TEST_CLIENT,
         personalAccount,
       });
-      const smartWalletAddress = smartAccount.address as Address;
-      console.log("smartWalletAddress", smartWalletAddress);
-      console.log(
-        "balance before",
-        await getWalletBalance({
-          address: smartAccount.address,
-          chain: chain,
-          client,
-          tokenAddress: tokenPaymaster.tokenAddress,
-        }),
-      );
       const tx = prepareTransaction({
         client,
         chain,
@@ -165,15 +112,6 @@ describe.runIf(process.env.TW_SECRET_KEY).skip.sequential(
         account: smartAccount,
       });
       expect(receipt.transactionHash).toBeDefined();
-      console.log(
-        "balance after",
-        await getWalletBalance({
-          address: smartAccount.address,
-          chain: chain,
-          client,
-          tokenAddress: tokenPaymaster.tokenAddress,
-        }),
-      );
     });
   },
 );

packages/thirdweb/src/wallets/smart/smart-wallet.ts

@@ -118,7 +118,7 @@ import { getDefaultAccountFactory } from "./lib/constants.js";
  *    accountAddress: "0x...", // override account address
  *    accountSalt: "0x...", // override account salt
  *    entrypointAddress: "0x...", // override entrypoint address
- *    erc20Paymaster: "BASE_USDC", // enable erc20 paymaster
+ *    tokenPaymaster: TokenPaymaster.BASE_USDC, // enable erc20 paymaster
  *    bundlerUrl: "https://...", // override bundler url
  *    paymaster: (userOp) => { ... }, // override paymaster
  *    ...