@gasfree-kit/evm-4337 0.1.1 → 0.3.0

package/README.md

@@ -1,271 +1,329 @@
-# @gasfree-kit/evm-4337
-
-ERC-4337 USDT transfers for EVM chains using WDK-backed Safe smart accounts.
-
-This package gives you:
-
-- standard seed-phrase driven transfers
-- sponsored mode, where a paymaster covers gas
-- token-paid mode, where gas is charged in USDT
-- optional passkey linking and passkey-signed transfers
-
-## How It Works
-
-```mermaid
-flowchart LR
-  App["Your app"] --> SDK["@gasfree-kit/evm-4337"]
-  SDK --> WDK["WDK wallet manager"]
-  WDK --> Safe["Safe smart account"]
-  Safe --> UserOp["ERC-4337 UserOperation"]
-  UserOp --> Bundler["Bundler"]
-  Paymaster["Paymaster"] --> Bundler
-  Bundler --> Chain["Supported EVM chain"]
-```
-
-## Supported Chains
-
-| Chain    | Chain ID | Typical fallback fee estimate |
-| -------- | -------- | ----------------------------- |
-| Ethereum | 1        | `1.40` USDT                   |
-| Base     | 8453     | `0.15` USDT                   |
-| Arbitrum | 42161    | `0.10` USDT                   |
-| Optimism | 10       | `0.10` USDT                   |
-| Polygon  | 137      | `0.10` USDT                   |
-| Celo     | 42220    | `0.05` USDT                   |
-| Plasma   | 9745     | `0.05` USDT                   |
-
-## Installation
-
-```bash
-npm install @gasfree-kit/evm-4337
-```
-
-Required peer dependency:
-
-```bash
-npm install @tetherto/wdk-wallet-evm-erc-4337
-```
-
-Optional passkey peer dependencies:
-
-```bash
-npm install @safe-global/protocol-kit @safe-global/relay-kit
-```
-
-## Choose Your Gas Mode
-
-| Mode       | When to use it                    | Required config                                  |
-| ---------- | --------------------------------- | ------------------------------------------------ |
-| Sponsored  | Your paymaster fully covers gas   | `isSponsored: true` and `sponsorshipPolicyId`    |
-| Token-paid | Gas is deducted from USDT balance | `isSponsored: false` and a paymaster/token setup |
-
-## Quick Start
-
-### 1. Create a config
-
-Sponsored mode:
-
-```ts
-import type { EVM4337ClientConfig } from '@gasfree-kit/evm-4337';
-
-const sponsoredConfig: EVM4337ClientConfig = {
-  chain: 'base',
-  rpcUrl: 'https://mainnet.base.org',
-  bundlerUrl: 'https://your-bundler.example.com',
-  paymasterUrl: 'https://your-paymaster.example.com',
-  isSponsored: true,
-  sponsorshipPolicyId: 'your-policy-id',
-};
-```
-
-Token-paid mode:
-
-```ts
-const tokenPaidConfig: EVM4337ClientConfig = {
-  chain: 'base',
-  rpcUrl: 'https://mainnet.base.org',
-  bundlerUrl: 'https://your-bundler.example.com',
-  paymasterUrl: 'https://your-paymaster.example.com',
-  isSponsored: false,
-  paymasterAddress: '0xYourPaymasterAddress',
-  // Optional:
-  // paymasterTokenAddress: '0xYourUSDTLikeToken'
-};
-```
-
-### 2. Set up the Safe smart account
-
-```ts
-import { setupErc4337Wallet } from '@gasfree-kit/evm-4337';
-
-const seedPhrase = 'your twelve word seed phrase here ...';
-const { wallet, account, address } = await setupErc4337Wallet(seedPhrase, sponsoredConfig);
-
-console.log(address); // Safe address
-```
-
-### 3. Check balance
-
-```ts
-import { EvmTransfer } from '@gasfree-kit/evm-4337';
-import { EVM_CHAINS } from '@gasfree-kit/core';
-
-const balance = await EvmTransfer.checkTokenBalance(
-  seedPhrase,
-  sponsoredConfig,
-  EVM_CHAINS.base.usdtAddress,
-);
-
-console.log(balance.data.usdBalance);
-```
-
-### 4. Estimate fees
-
-```ts
-const estimate = await EvmTransfer.getTransactionEstimateFee(
-  seedPhrase,
-  sponsoredConfig,
-  '0x1111111111111111111111111111111111111111',
-);
-
-console.log(estimate.data.fee);
-```
-
-### 5. Send a transfer
-
-```ts
-const result = await EvmTransfer.sendToken(
-  seedPhrase,
-  sponsoredConfig,
-  EVM_CHAINS.base.usdtAddress,
-  '50.00',
-  '0x1111111111111111111111111111111111111111',
-);
-
-console.log(result.transactionHash);
-```
-
-### 6. Send a batch transfer
-
-```ts
-const batch = await EvmTransfer.sendBatchToken(
-  seedPhrase,
-  sponsoredConfig,
-  EVM_CHAINS.base.usdtAddress,
-  [
-    { address: '0x1111111111111111111111111111111111111111', amount: '25.00' },
-    { address: '0x2222222222222222222222222222222222222222', amount: '10.00' },
-  ],
-);
-```
-
-## Passkey Flow
-
-Passkeys are optional. They let you add a WebAuthn signer to an existing Safe so transfers can be approved with biometrics instead of a seed phrase.
-
-Important:
-
-- the Safe must already be deployed on-chain before you link a passkey
-- `storage: 'persist'` is convenience storage only, not hardened secret storage
-
-### Passkey diagram
-
-```mermaid
-flowchart TD
-  Seed["Seed phrase owner"] --> Safe["Safe smart account"]
-  Passkey["Passkey owner"] --> Safe
-  Safe --> Transfer["Passkey-signed transfer"]
-  Transfer --> Bundler["Bundler + paymaster"]
-  Bundler --> Chain["EVM chain"]
-```
-
-### Link a passkey to an existing Safe
-
-```ts
-import { linkPasskeyToSafe } from '@gasfree-kit/evm-4337';
-
-const passkey = await linkPasskeyToSafe(seedPhrase, sponsoredConfig, {
-  rpName: 'My App',
-  userName: 'user@example.com',
-  storage: 'not_persist',
-});
-
-console.log(passkey.safeAddress);
-console.log(passkey.credential.signerAddress);
-```
-
-### Check whether a passkey is linked
-
-```ts
-import { isPasskeyLinked } from '@gasfree-kit/evm-4337';
-
-const status = await isPasskeyLinked(seedPhrase, sponsoredConfig);
-
-if (status.linked) {
-  console.log(status.signerAddress);
-}
-```
-
-### Send a transfer with a passkey
-
-```ts
-import { PasskeyTransfer } from '@gasfree-kit/evm-4337';
-import { EVM_CHAINS } from '@gasfree-kit/core';
-
-const tx = await PasskeyTransfer.sendToken(
-  passkey.credential,
-  sponsoredConfig,
-  EVM_CHAINS.base.usdtAddress,
-  '10.00',
-  '0x1111111111111111111111111111111111111111',
-);
-```
-
-### Remove a passkey owner
-
-```ts
-import { unlinkPasskeyFromSafe } from '@gasfree-kit/evm-4337';
-
-await unlinkPasskeyFromSafe(seedPhrase, sponsoredConfig, passkey.credential);
-```
-
-## Main Exports
-
-| Export                                                                         | What it does                                                                 |
-| ------------------------------------------------------------------------------ | ---------------------------------------------------------------------------- |
-| `setupErc4337Wallet`                                                           | Creates a WDK-backed ERC-4337 wallet and resolves the Safe address           |
-| `EvmTransfer`                                                                  | Estimates, checks balance, sends single transfers, and sends batch transfers |
-| `PasskeyTransfer`                                                              | Sends passkey-signed transfers after a passkey has been linked               |
-| `linkPasskeyToSafe`                                                            | Registers a passkey and adds its signer to the Safe owner set                |
-| `isPasskeyLinked`                                                              | Checks whether a stored passkey is still an owner on-chain                   |
-| `unlinkPasskeyFromSafe`                                                        | Removes a passkey signer from the Safe                                       |
-| `getErc4337ConfigForChain`                                                     | Normalizes the public client config into runtime config                      |
-| `GAS_FEE_FALLBACKS` and `GAS_FEE_ESTIMATES`                                    | Exposes fallback fee heuristics per chain                                    |
-| `toUsdtBaseUnitsEvm`, `formatTokenBalance`, `feeToUsdt`, `encodeErc20Transfer` | Utility helpers for amounts and calldata                                     |
-
-## Export Example
-
-```ts
-import {
-  setupErc4337Wallet,
-  EvmTransfer,
-  PasskeyTransfer,
-  linkPasskeyToSafe,
-  isPasskeyLinked,
-  unlinkPasskeyFromSafe,
-  getErc4337ConfigForChain,
-  GAS_FEE_FALLBACKS,
-  GAS_FEE_ESTIMATES,
-} from '@gasfree-kit/evm-4337';
-```
-
-## Notes
-
-- `sponsorshipPolicyId` is required when `isSponsored` is `true`
-- self-transfers are blocked
-- token-paid mode checks that the USDT balance can cover the transfer and gas reserve
-- passkey linking verifies the signer deployment before adding it as an owner
-
-## License
-
-MIT
+# @gasfree-kit/evm-4337
+
+ERC-4337 USDT transfers for EVM chains using WDK-backed Safe smart accounts.
+
+This package gives you:
+
+- standard seed-phrase driven transfers
+- sponsored mode, where a paymaster covers gas
+- token-paid mode, where gas is charged in USDT
+- optional passkey linking and passkey-signed transfers
+
+## How It Works
+
+```
+ ┌──────────────────────┐
+ │       Your app       │
+ └──────────┬───────────┘
+            │
+            v
+ ┌──────────────────────┐
+ │ @gasfree-kit/evm-4337│
+ └──────────┬───────────┘
+            │
+            v
+ ┌──────────────────────┐       ┌──────────────────────┐
+ │  WDK wallet manager  │──────>│  Safe smart account   │
+ └──────────────────────┘       └──────────┬───────────┘
+                                           │
+                                           v
+                                ┌──────────────────────┐
+ ┌──────────────────────┐       │    UserOperation      │
+ │      Paymaster       │·····> │     (ERC-4337)        │
+ │                      │       └──────────┬───────────┘
+ │  sponsors gas or     │                  │
+ │  charges in USDT     │                  v
+ └──────────────────────┘       ┌──────────────────────┐
+                                │       Bundler         │
+                                └──────────┬───────────┘
+                                           │
+                                           v
+                                ┌──────────────────────┐
+                                │      EVM chain        │
+                                └──────────────────────┘
+```
+
+## Supported Chains
+
+| Chain    | Chain ID | Typical fallback fee estimate |
+| -------- | -------- | ----------------------------- |
+| Ethereum | 1        | `1.40` USDT                   |
+| Base     | 8453     | `0.15` USDT                   |
+| Arbitrum | 42161    | `0.10` USDT                   |
+| Optimism | 10       | `0.10` USDT                   |
+| Polygon  | 137      | `0.10` USDT                   |
+| Celo     | 42220    | `0.05` USDT                   |
+| Plasma   | 9745     | `0.05` USDT                   |
+
+## Prerequisites
+
+This package depends on [`@gasfree-kit/core`](../core/README.md) for:
+
+- **Seed phrase generation** — `generateSeedPhrase()` creates the mnemonic used to set up wallets
+- **Chain metadata** — `EVM_CHAINS` provides chain IDs, USDT addresses, and explorer URLs
+- **Address validation** — `validateEvmAddress()` catches malformed addresses before sending
+- **Error classes** — `GasfreeError`, `InsufficientBalanceError`, etc. for consistent error handling
+
+`@gasfree-kit/core` is installed automatically as a dependency.
+
+## Installation
+
+```bash
+npm install @gasfree-kit/evm-4337 @gasfree-kit/core
+```
+
+Required peer dependency:
+
+```bash
+npm install @tetherto/wdk-wallet-evm-erc-4337
+```
+
+Optional passkey peer dependencies:
+
+```bash
+npm install @safe-global/protocol-kit @safe-global/relay-kit
+```
+
+## Choose Your Gas Mode
+
+| Mode       | When to use it                    | Required config                                  |
+| ---------- | --------------------------------- | ------------------------------------------------ |
+| Sponsored  | Your paymaster fully covers gas   | `isSponsored: true` and `sponsorshipPolicyId`    |
+| Token-paid | Gas is deducted from USDT balance | `isSponsored: false` and a paymaster/token setup |
+
+## Quick Start
+
+### 1. Create a config
+
+Sponsored mode:
+
+```ts
+import type { EVM4337ClientConfig } from '@gasfree-kit/evm-4337';
+
+const sponsoredConfig: EVM4337ClientConfig = {
+  chain: 'base',
+  rpcUrl: 'https://mainnet.base.org',
+  bundlerUrl: 'https://your-bundler.example.com',
+  paymasterUrl: 'https://your-paymaster.example.com',
+  isSponsored: true,
+  sponsorshipPolicyId: 'your-policy-id',
+};
+```
+
+Token-paid mode:
+
+```ts
+const tokenPaidConfig: EVM4337ClientConfig = {
+  chain: 'base',
+  rpcUrl: 'https://mainnet.base.org',
+  bundlerUrl: 'https://your-bundler.example.com',
+  paymasterUrl: 'https://your-paymaster.example.com',
+  isSponsored: false,
+  paymasterAddress: '0xYourPaymasterAddress',
+  // Optional:
+  // paymasterTokenAddress: '0xYourUSDTLikeToken'
+};
+```
+
+### 2. Generate a seed phrase
+
+```ts
+import { generateSeedPhrase } from '@gasfree-kit/core';
+
+const seedPhrase = await generateSeedPhrase();
+```
+
+### 3. Set up the Safe smart account
+
+```ts
+import { setupErc4337Wallet } from '@gasfree-kit/evm-4337';
+
+const { wallet, account, address } = await setupErc4337Wallet(seedPhrase, sponsoredConfig);
+
+console.log(address); // Safe address
+```
+
+### 4. Check balance
+
+```ts
+import { EvmTransfer } from '@gasfree-kit/evm-4337';
+import { EVM_CHAINS } from '@gasfree-kit/core';
+
+const balance = await EvmTransfer.checkTokenBalance(
+  seedPhrase,
+  sponsoredConfig,
+  EVM_CHAINS.base.usdtAddress,
+);
+
+console.log(balance.data.usdBalance);
+```
+
+### 5. Estimate fees
+
+```ts
+const estimate = await EvmTransfer.getTransactionEstimateFee(
+  seedPhrase,
+  sponsoredConfig,
+  '0x1111111111111111111111111111111111111111',
+);
+
+console.log(estimate.data.fee);
+```
+
+### 6. Send a transfer
+
+```ts
+const result = await EvmTransfer.sendToken(
+  seedPhrase,
+  sponsoredConfig,
+  EVM_CHAINS.base.usdtAddress,
+  '50.00',
+  '0x1111111111111111111111111111111111111111',
+);
+
+console.log(result.transactionHash);
+```
+
+### 7. Send a batch transfer
+
+```ts
+const batch = await EvmTransfer.sendBatchToken(
+  seedPhrase,
+  sponsoredConfig,
+  EVM_CHAINS.base.usdtAddress,
+  [
+    { address: '0x1111111111111111111111111111111111111111', amount: '25.00' },
+    { address: '0x2222222222222222222222222222222222222222', amount: '10.00' },
+  ],
+);
+```
+
+## Passkey Flow
+
+Passkeys are optional. They let you add a WebAuthn signer to an existing Safe so transfers can be approved with biometrics instead of a seed phrase.
+
+Important:
+
+- the Safe must already be deployed on-chain before you link a passkey
+- `storage: 'persist'` is convenience storage only, not hardened secret storage
+
+### Passkey diagram
+
+```
+ ┌──────────────────────┐
+ │  Seed phrase owner   │──────┐
+ └──────────────────────┘      │
+                               v
+                      ┌──────────────────────┐
+                      │  Safe smart account   │
+                      └──────────┬───────────┘
+ ┌──────────────────────┐      │
+ │  Passkey (WebAuthn)  │──────┘
+ └──────────────────────┘
+                                │
+                                v
+                      ┌──────────────────────┐
+                      │  Signed UserOperation │
+                      └──────────┬───────────┘
+                                │
+                                v
+                      ┌──────────────────────┐
+                      │  Bundler + Paymaster  │
+                      └──────────┬───────────┘
+                                │
+                                v
+                      ┌──────────────────────┐
+                      │       EVM chain       │
+                      └──────────────────────┘
+```
+
+### Link a passkey to an existing Safe
+
+```ts
+import { linkPasskeyToSafe } from '@gasfree-kit/evm-4337';
+
+const passkey = await linkPasskeyToSafe(seedPhrase, sponsoredConfig, {
+  rpName: 'My App',
+  userName: 'user@example.com',
+  storage: 'not_persist',
+});
+
+console.log(passkey.safeAddress);
+console.log(passkey.credential.signerAddress);
+```
+
+### Check whether a passkey is linked
+
+```ts
+import { isPasskeyLinked } from '@gasfree-kit/evm-4337';
+
+const status = await isPasskeyLinked(seedPhrase, sponsoredConfig);
+
+if (status.linked) {
+  console.log(status.signerAddress);
+}
+```
+
+### Send a transfer with a passkey
+
+```ts
+import { PasskeyTransfer } from '@gasfree-kit/evm-4337';
+import { EVM_CHAINS } from '@gasfree-kit/core';
+
+const tx = await PasskeyTransfer.sendToken(
+  passkey.credential,
+  sponsoredConfig,
+  EVM_CHAINS.base.usdtAddress,
+  '10.00',
+  '0x1111111111111111111111111111111111111111',
+);
+```
+
+### Remove a passkey owner
+
+```ts
+import { unlinkPasskeyFromSafe } from '@gasfree-kit/evm-4337';
+
+await unlinkPasskeyFromSafe(seedPhrase, sponsoredConfig, passkey.credential);
+```
+
+## Main Exports
+
+| Export                                                                         | What it does                                                                 |
+| ------------------------------------------------------------------------------ | ---------------------------------------------------------------------------- |
+| `setupErc4337Wallet`                                                           | Creates a WDK-backed ERC-4337 wallet and resolves the Safe address           |
+| `EvmTransfer`                                                                  | Estimates, checks balance, sends single transfers, and sends batch transfers |
+| `PasskeyTransfer`                                                              | Sends passkey-signed transfers after a passkey has been linked               |
+| `linkPasskeyToSafe`                                                            | Registers a passkey and adds its signer to the Safe owner set                |
+| `isPasskeyLinked`                                                              | Checks whether a stored passkey is still an owner on-chain                   |
+| `unlinkPasskeyFromSafe`                                                        | Removes a passkey signer from the Safe                                       |
+| `getErc4337ConfigForChain`                                                     | Normalizes the public client config into runtime config                      |
+| `GAS_FEE_FALLBACKS` and `GAS_FEE_ESTIMATES`                                    | Exposes fallback fee heuristics per chain                                    |
+| `toUsdtBaseUnitsEvm`, `formatTokenBalance`, `feeToUsdt`, `encodeErc20Transfer` | Utility helpers for amounts and calldata                                     |
+
+## Export Example
+
+```ts
+import {
+  setupErc4337Wallet,
+  EvmTransfer,
+  PasskeyTransfer,
+  linkPasskeyToSafe,
+  isPasskeyLinked,
+  unlinkPasskeyFromSafe,
+  getErc4337ConfigForChain,
+  GAS_FEE_FALLBACKS,
+  GAS_FEE_ESTIMATES,
+} from '@gasfree-kit/evm-4337';
+```
+
+## Notes
+
+- `sponsorshipPolicyId` is required when `isSponsored` is `true`
+- self-transfers are blocked
+- token-paid mode checks that the USDT balance can cover the transfer and gas reserve
+- passkey linking verifies the signer deployment before adding it as an owner
+
+## License
+
+MIT

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gasfree-kit/evm-4337",
-  "version": "0.1.1",
+  "version": "0.3.0",
   "description": "ERC-4337 gasless transactions for EVM chains — powered by WDK",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -21,7 +21,7 @@
   "dependencies": {
     "@noble/hashes": "^2.0.1",
     "abstractionkit": "^0.2.30",
-    "@gasfree-kit/core": "0.1.1"
+    "@gasfree-kit/core": "0.2.0"
   },
   "peerDependencies": {
     "@safe-global/protocol-kit": "^5.0.0",

package/patches/@tetherto__wdk-safe-relay-kit@4.1.5.patch

@@ -1,68 +1,68 @@
-diff --git a/dist/cjs/src/index.cjs b/dist/cjs/src/index.cjs
---- a/dist/cjs/src/index.cjs
-+++ b/dist/cjs/src/index.cjs
-@@ -1946,6 +1946,9 @@ var GenericFeeEstimator = class {
-       const context = "paymasterTokenAddress" in paymasterOptions ? {
-         token: paymasterOptions.paymasterTokenAddress
-       } : paymasterOptions.paymasterContext ?? {};
-+      if (paymasterOptions.sponsorshipPolicyId) {
-+        context.sponsorshipPolicyId = paymasterOptions.sponsorshipPolicyId;
-+      }
-       const [feeData, paymasterStubData] = await Promise.all([
-         this.#getUserOperationGasPrices(this.rpcUrl),
-         paymasterClient.request({
-@@ -2017,7 +2020,8 @@ var GenericFeeEstimator = class {
-       const sponsoredData = await paymasterClient.request({
-         method: "pm_getPaymasterData" /* GET_PAYMASTER_DATA */,
-         params
-       });
--      return sponsoredData;
-+      sponsoredData.callGasLimit = userOperation.callGasLimit.toString();
-+      return sponsoredData;
-     }
-     const erc20PaymasterData = await paymasterClient.request({
-       method: "pm_getPaymasterData" /* GET_PAYMASTER_DATA */,
-@@ -2032,7 +2036,8 @@ var GenericFeeEstimator = class {
-       const threshold = await protocolKit.getThreshold();
-       erc20PaymasterData.verificationGasLimit = (BigInt(erc20PaymasterData.verificationGasLimit) + BigInt(threshold) * this.defaultVerificationGasLimitOverhead).toString();
-     }
--    return erc20PaymasterData;
-+    erc20PaymasterData.callGasLimit = userOperation.callGasLimit.toString();
-+    return erc20PaymasterData;
-   }
-   async #getUserOperationGasPrices(rpcUrl) {
-     const client = (0, import_viem11.createPublicClient)({
-diff --git a/dist/esm/src/index.mjs b/dist/esm/src/index.mjs
---- a/dist/esm/src/index.mjs
-+++ b/dist/esm/src/index.mjs
-@@ -1923,6 +1923,9 @@ var GenericFeeEstimator = class {
-       const context = "paymasterTokenAddress" in paymasterOptions ? {
-         token: paymasterOptions.paymasterTokenAddress
-       } : paymasterOptions.paymasterContext ?? {};
-+      if (paymasterOptions.sponsorshipPolicyId) {
-+        context.sponsorshipPolicyId = paymasterOptions.sponsorshipPolicyId;
-+      }
-       const [feeData, paymasterStubData] = await Promise.all([
-         this.#getUserOperationGasPrices(this.rpcUrl),
-         paymasterClient.request({
-@@ -1994,7 +1997,8 @@ var GenericFeeEstimator = class {
-       const sponsoredData = await paymasterClient.request({
-         method: "pm_getPaymasterData" /* GET_PAYMASTER_DATA */,
-         params
-       });
--      return sponsoredData;
-+      sponsoredData.callGasLimit = userOperation.callGasLimit.toString();
-+      return sponsoredData;
-     }
-     const erc20PaymasterData = await paymasterClient.request({
-       method: "pm_getPaymasterData" /* GET_PAYMASTER_DATA */,
-@@ -2009,7 +2013,8 @@ var GenericFeeEstimator = class {
-       const threshold = await protocolKit.getThreshold();
-       erc20PaymasterData.verificationGasLimit = (BigInt(erc20PaymasterData.verificationGasLimit) + BigInt(threshold) * this.defaultVerificationGasLimitOverhead).toString();
-     }
--    return erc20PaymasterData;
-+    erc20PaymasterData.callGasLimit = userOperation.callGasLimit.toString();
-+    return erc20PaymasterData;
-   }
-   async #getUserOperationGasPrices(rpcUrl) {
-     const client = createPublicClient2({
+diff --git a/dist/cjs/src/index.cjs b/dist/cjs/src/index.cjs
+--- a/dist/cjs/src/index.cjs
++++ b/dist/cjs/src/index.cjs
+@@ -1946,6 +1946,9 @@ var GenericFeeEstimator = class {
+       const context = "paymasterTokenAddress" in paymasterOptions ? {
+         token: paymasterOptions.paymasterTokenAddress
+       } : paymasterOptions.paymasterContext ?? {};
++      if (paymasterOptions.sponsorshipPolicyId) {
++        context.sponsorshipPolicyId = paymasterOptions.sponsorshipPolicyId;
++      }
+       const [feeData, paymasterStubData] = await Promise.all([
+         this.#getUserOperationGasPrices(this.rpcUrl),
+         paymasterClient.request({
+@@ -2017,7 +2020,8 @@ var GenericFeeEstimator = class {
+       const sponsoredData = await paymasterClient.request({
+         method: "pm_getPaymasterData" /* GET_PAYMASTER_DATA */,
+         params
+       });
+-      return sponsoredData;
++      sponsoredData.callGasLimit = userOperation.callGasLimit.toString();
++      return sponsoredData;
+     }
+     const erc20PaymasterData = await paymasterClient.request({
+       method: "pm_getPaymasterData" /* GET_PAYMASTER_DATA */,
+@@ -2032,7 +2036,8 @@ var GenericFeeEstimator = class {
+       const threshold = await protocolKit.getThreshold();
+       erc20PaymasterData.verificationGasLimit = (BigInt(erc20PaymasterData.verificationGasLimit) + BigInt(threshold) * this.defaultVerificationGasLimitOverhead).toString();
+     }
+-    return erc20PaymasterData;
++    erc20PaymasterData.callGasLimit = userOperation.callGasLimit.toString();
++    return erc20PaymasterData;
+   }
+   async #getUserOperationGasPrices(rpcUrl) {
+     const client = (0, import_viem11.createPublicClient)({
+diff --git a/dist/esm/src/index.mjs b/dist/esm/src/index.mjs
+--- a/dist/esm/src/index.mjs
++++ b/dist/esm/src/index.mjs
+@@ -1923,6 +1923,9 @@ var GenericFeeEstimator = class {
+       const context = "paymasterTokenAddress" in paymasterOptions ? {
+         token: paymasterOptions.paymasterTokenAddress
+       } : paymasterOptions.paymasterContext ?? {};
++      if (paymasterOptions.sponsorshipPolicyId) {
++        context.sponsorshipPolicyId = paymasterOptions.sponsorshipPolicyId;
++      }
+       const [feeData, paymasterStubData] = await Promise.all([
+         this.#getUserOperationGasPrices(this.rpcUrl),
+         paymasterClient.request({
+@@ -1994,7 +1997,8 @@ var GenericFeeEstimator = class {
+       const sponsoredData = await paymasterClient.request({
+         method: "pm_getPaymasterData" /* GET_PAYMASTER_DATA */,
+         params
+       });
+-      return sponsoredData;
++      sponsoredData.callGasLimit = userOperation.callGasLimit.toString();
++      return sponsoredData;
+     }
+     const erc20PaymasterData = await paymasterClient.request({
+       method: "pm_getPaymasterData" /* GET_PAYMASTER_DATA */,
+@@ -2009,7 +2013,8 @@ var GenericFeeEstimator = class {
+       const threshold = await protocolKit.getThreshold();
+       erc20PaymasterData.verificationGasLimit = (BigInt(erc20PaymasterData.verificationGasLimit) + BigInt(threshold) * this.defaultVerificationGasLimitOverhead).toString();
+     }
+-    return erc20PaymasterData;
++    erc20PaymasterData.callGasLimit = userOperation.callGasLimit.toString();
++    return erc20PaymasterData;
+   }
+   async #getUserOperationGasPrices(rpcUrl) {
+     const client = createPublicClient2({

package/scripts/postinstall.js

@@ -1,101 +1,101 @@
-#!/usr/bin/env node
-
-/**
- * Postinstall script for @gasfree-kit/evm-4337.
- *
- * Applies a critical patch to @tetherto/wdk-safe-relay-kit that fixes:
- * 1. sponsorshipPolicyId not being passed to Candide paymaster context
- * 2. callGasLimit being dropped by paymaster response (both sponsored & ERC-20)
- *
- * Without this patch, gas estimation fails on Candide-sponsored transactions.
- *
- * Works with npm, pnpm, and yarn.
- * pnpm users can also use patchedDependencies in package.json instead.
- */
-
-const { spawnSync } = require('child_process');
-const fs = require('fs');
-const path = require('path');
-const packageRoot = path.resolve(__dirname, '..');
-
-function findProjectRoot(startDir) {
-  let current = startDir;
-  while (true) {
-    const parent = path.dirname(current);
-    if (parent === current) {
-      return startDir;
-    }
-    if (fs.existsSync(path.join(parent, 'package.json'))) {
-      return parent;
-    }
-    current = parent;
-  }
-}
-
-function runOrThrow(command, args, options) {
-  const result = spawnSync(command, args, {
-    stdio: 'pipe',
-    windowsHide: true,
-    ...options,
-  });
-
-  if (result.error) {
-    throw result.error;
-  }
-
-  if (result.status !== 0) {
-    const stderr = result.stderr ? result.stderr.toString().trim() : '';
-    throw new Error(stderr || `${command} exited with code ${result.status}`);
-  }
-}
-
-const patchFile = path.join(
-  __dirname,
-  '..',
-  'patches',
-  '@tetherto__wdk-safe-relay-kit@4.1.5.patch',
-);
-
-if (!fs.existsSync(patchFile)) {
-  // Patch file not found — skip (might be in a CI environment or already applied)
-  process.exit(0);
-}
-
-// Find the target package
-const projectRoot = findProjectRoot(packageRoot);
-const possiblePaths = [
-  path.join(projectRoot, 'node_modules', '@tetherto', 'wdk-safe-relay-kit'),
-  path.join(packageRoot, 'node_modules', '@tetherto', 'wdk-safe-relay-kit'),
-];
-
-const targetDir = possiblePaths.find((p) => fs.existsSync(p));
-
-if (!targetDir) {
-  // @tetherto/wdk-safe-relay-kit not installed yet — skip
-  // The user's package manager will install peer deps and this runs again
-  process.exit(0);
-}
-
-// Check if patch is already applied by looking for our marker
-const cjsFile = path.join(targetDir, 'dist', 'cjs', 'src', 'index.cjs');
-if (fs.existsSync(cjsFile)) {
-  const content = fs.readFileSync(cjsFile, 'utf8');
-  if (content.includes('context.sponsorshipPolicyId')) {
-    // Patch already applied
-    process.exit(0);
-  }
-}
-
-// Apply the patch using git apply without shell interpolation.
-try {
-  runOrThrow('git', ['apply', '--unsafe-paths', `--directory=${targetDir}`, patchFile], {
-    cwd: projectRoot,
-  });
-  console.log('@gasfree-kit/evm-4337: Applied wdk-safe-relay-kit patch (Candide paymaster fix)');
-} catch {
-  console.warn(
-    '@gasfree-kit/evm-4337: Could not auto-apply wdk-safe-relay-kit patch.\n' +
-      'Please apply manually: patches/@tetherto__wdk-safe-relay-kit@4.1.5.patch\n' +
-      'See: https://github.com/gasfree-kit/evm-4337#patch',
-  );
-}
+#!/usr/bin/env node
+
+/**
+ * Postinstall script for @gasfree-kit/evm-4337.
+ *
+ * Applies a critical patch to @tetherto/wdk-safe-relay-kit that fixes:
+ * 1. sponsorshipPolicyId not being passed to Candide paymaster context
+ * 2. callGasLimit being dropped by paymaster response (both sponsored & ERC-20)
+ *
+ * Without this patch, gas estimation fails on Candide-sponsored transactions.
+ *
+ * Works with npm, pnpm, and yarn.
+ * pnpm users can also use patchedDependencies in package.json instead.
+ */
+
+const { spawnSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+const packageRoot = path.resolve(__dirname, '..');
+
+function findProjectRoot(startDir) {
+  let current = startDir;
+  while (true) {
+    const parent = path.dirname(current);
+    if (parent === current) {
+      return startDir;
+    }
+    if (fs.existsSync(path.join(parent, 'package.json'))) {
+      return parent;
+    }
+    current = parent;
+  }
+}
+
+function runOrThrow(command, args, options) {
+  const result = spawnSync(command, args, {
+    stdio: 'pipe',
+    windowsHide: true,
+    ...options,
+  });
+
+  if (result.error) {
+    throw result.error;
+  }
+
+  if (result.status !== 0) {
+    const stderr = result.stderr ? result.stderr.toString().trim() : '';
+    throw new Error(stderr || `${command} exited with code ${result.status}`);
+  }
+}
+
+const patchFile = path.join(
+  __dirname,
+  '..',
+  'patches',
+  '@tetherto__wdk-safe-relay-kit@4.1.5.patch',
+);
+
+if (!fs.existsSync(patchFile)) {
+  // Patch file not found — skip (might be in a CI environment or already applied)
+  process.exit(0);
+}
+
+// Find the target package
+const projectRoot = findProjectRoot(packageRoot);
+const possiblePaths = [
+  path.join(projectRoot, 'node_modules', '@tetherto', 'wdk-safe-relay-kit'),
+  path.join(packageRoot, 'node_modules', '@tetherto', 'wdk-safe-relay-kit'),
+];
+
+const targetDir = possiblePaths.find((p) => fs.existsSync(p));
+
+if (!targetDir) {
+  // @tetherto/wdk-safe-relay-kit not installed yet — skip
+  // The user's package manager will install peer deps and this runs again
+  process.exit(0);
+}
+
+// Check if patch is already applied by looking for our marker
+const cjsFile = path.join(targetDir, 'dist', 'cjs', 'src', 'index.cjs');
+if (fs.existsSync(cjsFile)) {
+  const content = fs.readFileSync(cjsFile, 'utf8');
+  if (content.includes('context.sponsorshipPolicyId')) {
+    // Patch already applied
+    process.exit(0);
+  }
+}
+
+// Apply the patch using git apply without shell interpolation.
+try {
+  runOrThrow('git', ['apply', '--unsafe-paths', `--directory=${targetDir}`, patchFile], {
+    cwd: projectRoot,
+  });
+  console.log('@gasfree-kit/evm-4337: Applied wdk-safe-relay-kit patch (Candide paymaster fix)');
+} catch {
+  console.warn(
+    '@gasfree-kit/evm-4337: Could not auto-apply wdk-safe-relay-kit patch.\n' +
+      'Please apply manually: patches/@tetherto__wdk-safe-relay-kit@4.1.5.patch\n' +
+      'See: https://github.com/gasfree-kit/evm-4337#patch',
+  );
+}