@gasfree-kit/evm-4337 0.1.0 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gasfree-kit/evm-4337",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "ERC-4337 gasless transactions for EVM chains — powered by WDK",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -15,15 +15,27 @@
   "files": [
     "dist",
     "patches",
-    "scripts"
+    "scripts",
+    "README.md"
   ],
   "dependencies": {
+    "@noble/hashes": "^2.0.1",
     "abstractionkit": "^0.2.30",
-    "@gasfree-kit/core": "0.1.0"
+    "@gasfree-kit/core": "0.1.1"
   },
   "peerDependencies": {
+    "@safe-global/protocol-kit": "^5.0.0",
+    "@safe-global/relay-kit": "^4.0.0",
     "@tetherto/wdk-wallet-evm-erc-4337": "^1.0.0-beta.5"
   },
+  "peerDependenciesMeta": {
+    "@safe-global/protocol-kit": {
+      "optional": true
+    },
+    "@safe-global/relay-kit": {
+      "optional": true
+    }
+  },
   "license": "MIT",
   "publishConfig": {
     "access": "public"

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,80 +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 { execSync } = require('child_process');
-const fs = require('fs');
-const path = require('path');
-
-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 possiblePaths = [
-  // npm/yarn hoisted
-  path.resolve(__dirname, '..', '..', '@tetherto', 'wdk-safe-relay-kit'),
-  // pnpm non-hoisted
-  path.resolve(__dirname, '..', 'node_modules', '@tetherto', 'wdk-safe-relay-kit'),
-  // monorepo root
-  path.resolve(__dirname, '..', '..', '..', '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);
-  }
-}
-
-try {
-  execSync(`npx patch-package --patch-dir "${path.dirname(patchFile)}"`, {
-    cwd: path.resolve(targetDir, '..', '..'),
-    stdio: 'pipe',
-  });
-  console.log('@gasfree-kit/evm-4337: Applied wdk-safe-relay-kit patch (Candide paymaster fix)');
-} catch {
-  // patch-package not available — try git apply
-  try {
-    execSync(`git apply --directory="${targetDir}" "${patchFile}"`, {
-      stdio: 'pipe',
-    });
-    console.log('@gasfree-kit/evm-4337: Applied wdk-safe-relay-kit patch via git apply');
-  } 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',
+  );
+}