@gasfree-kit/evm-4337 0.3.0 → 0.3.2

package/README.md

@@ -1,6 +1,6 @@
 # @gasfree-kit/evm-4337
 
-ERC-4337 USDT transfers for EVM chains using WDK-backed Safe smart accounts.
+ERC-4337 USDT transfers for EVM chains using Safe smart accounts.
 
 This package gives you:
 
@@ -23,7 +23,7 @@ This package gives you:
             │
             v
  ┌──────────────────────┐       ┌──────────────────────┐
- │  WDK wallet manager  │──────>│  Safe smart account   │
+ │   Wallet manager     │──────>│  Safe smart account   │
  └──────────────────────┘       └──────────┬───────────┘
                                            │
                                            v
@@ -72,17 +72,7 @@ This package depends on [`@gasfree-kit/core`](../core/README.md) for:
 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
-```
+After installing, your package manager will prompt you to install the required peer dependencies listed in `package.json`. Some peer dependencies are marked optional and only needed if you enable passkey linking.
 
 ## Choose Your Gas Mode
 
@@ -291,7 +281,7 @@ await unlinkPasskeyFromSafe(seedPhrase, sponsoredConfig, passkey.credential);
 
 | Export                                                                         | What it does                                                                 |
 | ------------------------------------------------------------------------------ | ---------------------------------------------------------------------------- |
-| `setupErc4337Wallet`                                                           | Creates a WDK-backed ERC-4337 wallet and resolves the Safe address           |
+| `setupErc4337Wallet`                                                           | Creates an ERC-4337 wallet from a seed phrase 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                |

package/dist/index.d.mts

@@ -32,7 +32,6 @@ type EVM4337ClientConfig = {
 };
 /**
  * Build the full ERC-4337 network config from user-provided client config.
- * Matches the structure expected by @tetherto/wdk-wallet-evm-erc-4337.
  */
 declare function getErc4337ConfigForChain(config: EVM4337ClientConfig): EvmErc4337NetworkConfig;
 /** Conservative gas fee fallback estimates per chain (USDT 6 decimals). */
@@ -89,12 +88,14 @@ declare const SAFE_WEBAUTHN_SIGNER_FACTORY: Record<string, string>;
 declare const FCL_P256_VERIFIER: Record<string, string>;
 
 /**
- * Set up an ERC-4337 wallet via WDK.
+ * Set up an ERC-4337 wallet.
  *
- * Dynamically imports @tetherto/wdk-wallet-evm-erc-4337 and builds the
- * correct discriminated-union config:
- * - Sponsored mode → EvmErc4337WalletSponsorshipPolicyConfig
- * - Non-sponsored  → EvmErc4337WalletPaymasterTokenConfig
+ * Builds the correct discriminated-union config:
+ * - Sponsored mode → sponsorship-policy config
+ * - Non-sponsored  → paymaster-token config
+ *
+ * Derives the EOA at the BIP-44 path m/44'/60'/0'/0/{accountIndex} so the
+ * resulting Safe address stays stable across underlying-library upgrades.
  *
  * Optionally links a passkey to the Safe account when passkeyOptions is provided.
  */
@@ -193,6 +194,11 @@ declare function waitForUserOpConfirmation(userOpHash: string, bundlerUrl: strin
  */
 declare function handleTransferError(error: unknown, chain: string): Error;
 
+declare function jsonRpcCall(rpcUrl: string, request: {
+    method: string;
+    params: unknown[];
+}): Promise<string>;
+
 /**
  * Register a new passkey via WebAuthn and link it to an existing Safe account.
  *
@@ -290,4 +296,4 @@ interface CredentialStore {
  */
 declare function createCredentialStore(): CredentialStore;
 
-export { type CredentialStore, type EVM4337ClientConfig, type EvmErc4337NetworkConfig, EvmTransfer, FCL_P256_VERIFIER, GAS_FEE_ESTIMATES, GAS_FEE_FALLBACKS, type PasskeyConfig, type PasskeyCredential, type PasskeyLinkResult, type PasskeyOptions, type PasskeyStorageMode, PasskeyTransfer, SAFE_WEBAUTHN_SIGNER_FACTORY, createCredentialStore, encodeErc20Transfer, feeToUsdt, formatTokenBalance, getErc4337ConfigForChain, handleTransferError, isPasskeyLinked, linkPasskeyToSafe, setupErc4337Wallet, toUsdtBaseUnitsEvm, unlinkPasskeyFromSafe, waitForUserOpConfirmation };
+export { type CredentialStore, type EVM4337ClientConfig, type EvmErc4337NetworkConfig, EvmTransfer, FCL_P256_VERIFIER, GAS_FEE_ESTIMATES, GAS_FEE_FALLBACKS, type PasskeyConfig, type PasskeyCredential, type PasskeyLinkResult, type PasskeyOptions, type PasskeyStorageMode, PasskeyTransfer, SAFE_WEBAUTHN_SIGNER_FACTORY, createCredentialStore, encodeErc20Transfer, feeToUsdt, formatTokenBalance, getErc4337ConfigForChain, handleTransferError, isPasskeyLinked, jsonRpcCall, linkPasskeyToSafe, setupErc4337Wallet, toUsdtBaseUnitsEvm, unlinkPasskeyFromSafe, waitForUserOpConfirmation };

package/dist/index.d.ts

@@ -32,7 +32,6 @@ type EVM4337ClientConfig = {
 };
 /**
  * Build the full ERC-4337 network config from user-provided client config.
- * Matches the structure expected by @tetherto/wdk-wallet-evm-erc-4337.
  */
 declare function getErc4337ConfigForChain(config: EVM4337ClientConfig): EvmErc4337NetworkConfig;
 /** Conservative gas fee fallback estimates per chain (USDT 6 decimals). */
@@ -89,12 +88,14 @@ declare const SAFE_WEBAUTHN_SIGNER_FACTORY: Record<string, string>;
 declare const FCL_P256_VERIFIER: Record<string, string>;
 
 /**
- * Set up an ERC-4337 wallet via WDK.
+ * Set up an ERC-4337 wallet.
  *
- * Dynamically imports @tetherto/wdk-wallet-evm-erc-4337 and builds the
- * correct discriminated-union config:
- * - Sponsored mode → EvmErc4337WalletSponsorshipPolicyConfig
- * - Non-sponsored  → EvmErc4337WalletPaymasterTokenConfig
+ * Builds the correct discriminated-union config:
+ * - Sponsored mode → sponsorship-policy config
+ * - Non-sponsored  → paymaster-token config
+ *
+ * Derives the EOA at the BIP-44 path m/44'/60'/0'/0/{accountIndex} so the
+ * resulting Safe address stays stable across underlying-library upgrades.
  *
  * Optionally links a passkey to the Safe account when passkeyOptions is provided.
  */
@@ -193,6 +194,11 @@ declare function waitForUserOpConfirmation(userOpHash: string, bundlerUrl: strin
  */
 declare function handleTransferError(error: unknown, chain: string): Error;
 
+declare function jsonRpcCall(rpcUrl: string, request: {
+    method: string;
+    params: unknown[];
+}): Promise<string>;
+
 /**
  * Register a new passkey via WebAuthn and link it to an existing Safe account.
  *
@@ -290,4 +296,4 @@ interface CredentialStore {
  */
 declare function createCredentialStore(): CredentialStore;
 
-export { type CredentialStore, type EVM4337ClientConfig, type EvmErc4337NetworkConfig, EvmTransfer, FCL_P256_VERIFIER, GAS_FEE_ESTIMATES, GAS_FEE_FALLBACKS, type PasskeyConfig, type PasskeyCredential, type PasskeyLinkResult, type PasskeyOptions, type PasskeyStorageMode, PasskeyTransfer, SAFE_WEBAUTHN_SIGNER_FACTORY, createCredentialStore, encodeErc20Transfer, feeToUsdt, formatTokenBalance, getErc4337ConfigForChain, handleTransferError, isPasskeyLinked, linkPasskeyToSafe, setupErc4337Wallet, toUsdtBaseUnitsEvm, unlinkPasskeyFromSafe, waitForUserOpConfirmation };
+export { type CredentialStore, type EVM4337ClientConfig, type EvmErc4337NetworkConfig, EvmTransfer, FCL_P256_VERIFIER, GAS_FEE_ESTIMATES, GAS_FEE_FALLBACKS, type PasskeyConfig, type PasskeyCredential, type PasskeyLinkResult, type PasskeyOptions, type PasskeyStorageMode, PasskeyTransfer, SAFE_WEBAUTHN_SIGNER_FACTORY, createCredentialStore, encodeErc20Transfer, feeToUsdt, formatTokenBalance, getErc4337ConfigForChain, handleTransferError, isPasskeyLinked, jsonRpcCall, linkPasskeyToSafe, setupErc4337Wallet, toUsdtBaseUnitsEvm, unlinkPasskeyFromSafe, waitForUserOpConfirmation };

package/dist/index.js

@@ -43,6 +43,7 @@ __export(index_exports, {
   getErc4337ConfigForChain: () => getErc4337ConfigForChain,
   handleTransferError: () => handleTransferError,
   isPasskeyLinked: () => isPasskeyLinked,
+  jsonRpcCall: () => jsonRpcCall,
   linkPasskeyToSafe: () => linkPasskeyToSafe,
   setupErc4337Wallet: () => setupErc4337Wallet,
   toUsdtBaseUnitsEvm: () => toUsdtBaseUnitsEvm,
@@ -1178,6 +1179,7 @@ var PasskeyTransfer = class {
   getErc4337ConfigForChain,
   handleTransferError,
   isPasskeyLinked,
+  jsonRpcCall,
   linkPasskeyToSafe,
   setupErc4337Wallet,
   toUsdtBaseUnitsEvm,

package/dist/index.mjs

@@ -1128,6 +1128,7 @@ export {
   getErc4337ConfigForChain,
   handleTransferError,
   isPasskeyLinked,
+  jsonRpcCall,
   linkPasskeyToSafe,
   setupErc4337Wallet,
   toUsdtBaseUnitsEvm,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gasfree-kit/evm-4337",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "ERC-4337 gasless transactions for EVM chains — powered by WDK",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -14,14 +14,12 @@
   },
   "files": [
     "dist",
-    "patches",
-    "scripts",
     "README.md"
   ],
   "dependencies": {
     "@noble/hashes": "^2.0.1",
     "abstractionkit": "^0.2.30",
-    "@gasfree-kit/core": "0.2.0"
+    "@gasfree-kit/core": "0.2.1"
   },
   "peerDependencies": {
     "@safe-global/protocol-kit": "^5.0.0",
@@ -36,12 +34,27 @@
       "optional": true
     }
   },
+  "keywords": [
+    "gasless",
+    "gas-free",
+    "erc-4337",
+    "account-abstraction",
+    "paymaster",
+    "bundler",
+    "user-operation",
+    "ethereum",
+    "evm",
+    "web3",
+    "sdk",
+    "meta-transactions",
+    "safe",
+    "smart-account"
+  ],
   "license": "MIT",
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
-    "postinstall": "node scripts/postinstall.js",
     "build": "tsup",
     "dev": "tsup --watch",
     "test": "vitest run",

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

@@ -1,68 +0,0 @@
-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 +0,0 @@
-#!/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',
-  );
-}