@kohaku-eth/tornado-cash 0.0.2-alpha.17 → 0.0.2-alpha.18

package/dist/index.d.ts

@@ -502,6 +502,12 @@ interface IPaymasterWithdrawParams extends IWithdrawBaseParams {
     mode: 'paymaster';
     delegation?: DelegationConfig;
     tailCalls?: (address: AccountId) => Promise<TxData[]>;
+    /**
+     * Optional baseline for the execution-phase gas of user `tailCalls` (not
+     * including per-note direct withdraws). Used when bundler estimation fails;
+     * when estimation succeeds the bundler estimate still wins.
+     */
+    tailCallsGasEstimate?: bigint;
 }
 type IWithdrawapOperationParams = IRelayerWithdrawParams | IPaymasterWithdrawParams;
 interface IGetNotesParams extends IBaseOperationParams {
@@ -567,6 +573,13 @@ interface TCRelayerUnshieldOptions extends UnshieldOptions {
 interface TCPaymasterUnshieldOptions extends UnshieldOptions {
     mode: 'paymaster';
     delegation?: DelegationConfig;
+    /**
+     * Optional baseline for the execution-phase gas of user `tailCalls` (not
+     * including per-note direct withdraws). Used as the batch execution-tail
+     * baseline when bundler estimation fails; when estimation succeeds the
+     * bundler estimate still wins. Defaults to the SDK's static callGasLimit.
+     */
+    tailCallsGasEstimate?: bigint;
 }
 type TCPrepareUnshieldOptions = TCRelayerUnshieldOptions | TCPaymasterUnshieldOptions;
 interface TCPrepareShieldOptions {

package/dist/index.js

@@ -592,7 +592,8 @@ var TornadoCashProtocol = class {
         ...baseParams,
         mode: "paymaster",
         delegation: options.delegation,
-        tailCalls: options.tailCalls
+        tailCalls: options.tailCalls,
+        tailCallsGasEstimate: options.tailCallsGasEstimate
       });
     } else {
       withdrawals = await stateManager.getWithdrawalPayloads({

package/dist/state-manager.worker.js

@@ -22386,11 +22386,11 @@ var PER_DIRECT_WITHDRAW_GAS = 400000n;
 var PER_DIRECT_WITHDRAW_GAS_ERC20 = 500000n;
 var FORWARD_GAS = 60000n;
 var baseGasUnits = {
-  preVerificationGas: 80000n,
+  preVerificationGas: 85000n,
   verificationGasLimit: 50000n,
   callGasLimit: 300000n,
   paymasterVerificationGasLimit: 350000n,
-  paymasterPostOpGasLimit: 10000n
+  paymasterPostOpGasLimit: 50000n
 };
 function reasonableGasUnits(isERC20) {
   if (!isERC20) return baseGasUnits;
@@ -22399,10 +22399,10 @@ function reasonableGasUnits(isERC20) {
     paymasterVerificationGasLimit: baseGasUnits.paymasterVerificationGasLimit + ERC20_TRANSFER_GAS
   };
 }
-function reasonableGasUnitsForBatch(isERC20, extraWithdrawals, hasUserTailCalls) {
+function reasonableGasUnitsForBatch(isERC20, extraWithdrawals, hasUserTailCalls, tailCallsGasEstimate) {
   const base = reasonableGasUnits(isERC20);
   const perWithdraw = isERC20 ? PER_DIRECT_WITHDRAW_GAS_ERC20 : PER_DIRECT_WITHDRAW_GAS;
-  const executionTail = hasUserTailCalls ? base.callGasLimit : FORWARD_GAS;
+  const executionTail = hasUserTailCalls ? tailCallsGasEstimate ?? base.callGasLimit : FORWARD_GAS;
   return {
     ...base,
     callGasLimit: BigInt(extraWithdrawals) * perWithdraw + executionTail
@@ -24224,6 +24224,7 @@ var paymasterWithdrawThunk = createAsyncThunk("withdraw/executePaymasterWithdraw
   },
   secretManager,
   tailCalls,
+  tailCallsGasEstimate,
   ...rest
 }, { getState, dispatch }) => {
   const state = getState();
@@ -24369,7 +24370,12 @@ var paymasterWithdrawThunk = createAsyncThunk("withdraw/executePaymasterWithdraw
     tailCalls: composeTailCalls(fee2),
     nonce: 0n
   });
-  const baselineGas = reasonableGasUnitsForBatch(poolInfo.isERC20, directDeposits.length, tailCalls != null);
+  const baselineGas = reasonableGasUnitsForBatch(
+    poolInfo.isERC20,
+    directDeposits.length,
+    tailCalls != null,
+    tailCallsGasEstimate
+  );
   let fee = await quoteFee(computeMinimumViableFee(baselineGas, maxFeePerGas));
   let gas = baselineGas;
   let sponsoringProof = await prove(sponsoringDeposit, senderAddress, relayerAddress, fee);
@@ -24685,7 +24691,8 @@ var storeStateManager = async ({
                 delegation: params.delegation
               },
               secretManager,
-              tailCalls: params.tailCalls
+              tailCalls: params.tailCalls,
+              tailCallsGasEstimate: params.tailCallsGasEstimate
             })
           )
         );

package/dist/state-manager.worker.node.js

@@ -21612,11 +21612,11 @@ var PER_DIRECT_WITHDRAW_GAS = 400000n;
 var PER_DIRECT_WITHDRAW_GAS_ERC20 = 500000n;
 var FORWARD_GAS = 60000n;
 var baseGasUnits = {
-  preVerificationGas: 80000n,
+  preVerificationGas: 85000n,
   verificationGasLimit: 50000n,
   callGasLimit: 300000n,
   paymasterVerificationGasLimit: 350000n,
-  paymasterPostOpGasLimit: 10000n
+  paymasterPostOpGasLimit: 50000n
 };
 function reasonableGasUnits(isERC20) {
   if (!isERC20) return baseGasUnits;
@@ -21625,10 +21625,10 @@ function reasonableGasUnits(isERC20) {
     paymasterVerificationGasLimit: baseGasUnits.paymasterVerificationGasLimit + ERC20_TRANSFER_GAS
   };
 }
-function reasonableGasUnitsForBatch(isERC20, extraWithdrawals, hasUserTailCalls) {
+function reasonableGasUnitsForBatch(isERC20, extraWithdrawals, hasUserTailCalls, tailCallsGasEstimate) {
   const base = reasonableGasUnits(isERC20);
   const perWithdraw = isERC20 ? PER_DIRECT_WITHDRAW_GAS_ERC20 : PER_DIRECT_WITHDRAW_GAS;
-  const executionTail = hasUserTailCalls ? base.callGasLimit : FORWARD_GAS;
+  const executionTail = hasUserTailCalls ? tailCallsGasEstimate ?? base.callGasLimit : FORWARD_GAS;
   return {
     ...base,
     callGasLimit: BigInt(extraWithdrawals) * perWithdraw + executionTail
@@ -23450,6 +23450,7 @@ var paymasterWithdrawThunk = createAsyncThunk("withdraw/executePaymasterWithdraw
   },
   secretManager,
   tailCalls,
+  tailCallsGasEstimate,
   ...rest
 }, { getState, dispatch }) => {
   const state = getState();
@@ -23595,7 +23596,12 @@ var paymasterWithdrawThunk = createAsyncThunk("withdraw/executePaymasterWithdraw
     tailCalls: composeTailCalls(fee2),
     nonce: 0n
   });
-  const baselineGas = reasonableGasUnitsForBatch(poolInfo.isERC20, directDeposits.length, tailCalls != null);
+  const baselineGas = reasonableGasUnitsForBatch(
+    poolInfo.isERC20,
+    directDeposits.length,
+    tailCalls != null,
+    tailCallsGasEstimate
+  );
   let fee = await quoteFee(computeMinimumViableFee(baselineGas, maxFeePerGas));
   let gas = baselineGas;
   let sponsoringProof = await prove(sponsoringDeposit, senderAddress, relayerAddress, fee);
@@ -23911,7 +23917,8 @@ var storeStateManager = async ({
                 delegation: params.delegation
               },
               secretManager,
-              tailCalls: params.tailCalls
+              tailCalls: params.tailCalls,
+              tailCallsGasEstimate: params.tailCallsGasEstimate
             })
           )
         );

package/dist/worker-loader.browser.d.ts

@@ -211,6 +211,12 @@ interface IPaymasterWithdrawParams extends IWithdrawBaseParams {
     mode: 'paymaster';
     delegation?: DelegationConfig;
     tailCalls?: (address: AccountId) => Promise<TxData[]>;
+    /**
+     * Optional baseline for the execution-phase gas of user `tailCalls` (not
+     * including per-note direct withdraws). Used when bundler estimation fails;
+     * when estimation succeeds the bundler estimate still wins.
+     */
+    tailCallsGasEstimate?: bigint;
 }
 type IWithdrawapOperationParams = IRelayerWithdrawParams | IPaymasterWithdrawParams;
 interface IGetNotesParams extends IBaseOperationParams {

package/dist/worker-loader.node.d.ts

@@ -212,6 +212,12 @@ interface IPaymasterWithdrawParams extends IWithdrawBaseParams {
     mode: 'paymaster';
     delegation?: DelegationConfig;
     tailCalls?: (address: AccountId) => Promise<TxData[]>;
+    /**
+     * Optional baseline for the execution-phase gas of user `tailCalls` (not
+     * including per-note direct withdraws). Used when bundler estimation fails;
+     * when estimation succeeds the bundler estimate still wins.
+     */
+    tailCallsGasEstimate?: bigint;
 }
 type IWithdrawapOperationParams = IRelayerWithdrawParams | IPaymasterWithdrawParams;
 interface IGetNotesParams extends IBaseOperationParams {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kohaku-eth/tornado-cash",
-  "version": "0.0.2-alpha.17",
+  "version": "0.0.2-alpha.18",
   "description": "Tornado Cash Shielded Pool Kohaku Plugin",
   "type": "module",
   "private": false,
@@ -75,8 +75,8 @@
     "ox": "^0.12.0",
     "viem": "^2.51.3",
     "@kohaku-eth/plugins": "0.0.1-alpha.11",
-    "@kohaku-eth/mimc-tree": "0.0.3",
-    "@kohaku-eth/provider": "0.1.0-alpha.8"
+    "@kohaku-eth/provider": "0.1.0-alpha.8",
+    "@kohaku-eth/mimc-tree": "0.0.3"
   },
   "devDependencies": {
     "@types/node": "^24.12.2",