@kohaku-eth/tornado-cash 0.0.2-alpha.19 → 0.0.2-alpha.21

package/dist/state-manager.worker.js

@@ -17284,10 +17284,16 @@ async function SecretManager({
   const deriveDelegatorSigner = async ({ path }) => {
     return Promise.resolve(keystore.deriveAt(path));
   };
+  const LEGACY_EPHEMERAL_SALT = asciiToBytes("KOHAKU7702");
+  const deriveLegacyEphemeralSigner = async ({ nullifier }) => {
+    const hash2 = keccak_256(concatBytes2(numberToBytesLE(nullifier, 31), LEGACY_EPHEMERAL_SALT));
+    return `0x${bytesToHex2(hash2)}`;
+  };
   return {
     getDepositSecrets: (params) => deriveSecrets(params),
     deriveEphemeralSigner,
-    deriveDelegatorSigner
+    deriveDelegatorSigner,
+    deriveLegacyEphemeralSigner
   };
 }
 function tcPath({ accountIndex, secretType, depositIndex }) {
@@ -18323,10 +18329,10 @@ function getUnexpectedStateShapeWarningMessage(inputState, reducers2, action, un
 function assertReducerShape(reducers2) {
   Object.keys(reducers2).forEach((key) => {
     const reducer = reducers2[key];
-    const initialState9 = reducer(void 0, {
+    const initialState10 = reducer(void 0, {
       type: actionTypes_default.INIT
     });
-    if (typeof initialState9 === "undefined") {
+    if (typeof initialState10 === "undefined") {
       throw new Error(false ? formatProdErrorMessage(12) : `The slice reducer for key "${key}" returned undefined during initialization. If the state passed to the reducer is undefined, you must explicitly return the initial state. The initial state may not be undefined. If you don't want to set a value for this reducer, you can use null instead of undefined.`);
     }
     if (typeof reducer(void 0, {
@@ -19567,7 +19573,7 @@ function createThunkMiddleware(extraArgument) {
 var thunk = createThunkMiddleware();
 var withExtraArgument = createThunkMiddleware;
 
-// ../../node_modules/.pnpm/@reduxjs+toolkit@2.12.0_react@19.2.7/node_modules/@reduxjs/toolkit/dist/redux-toolkit.modern.mjs
+// ../../node_modules/.pnpm/@reduxjs+toolkit@2.12.0_react@19.2.8/node_modules/@reduxjs/toolkit/dist/redux-toolkit.modern.mjs
 var composeWithDevTools = typeof window !== "undefined" && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ ? window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ : function() {
   if (arguments.length === 0) return void 0;
   if (typeof arguments[0] === "object") return compose;
@@ -20188,7 +20194,7 @@ function executeReducerBuilderCallback(builderCallback) {
 function isStateFunction(x) {
   return typeof x === "function";
 }
-function createReducer(initialState9, mapOrBuilderCallback) {
+function createReducer(initialState10, mapOrBuilderCallback) {
   if (true) {
     if (typeof mapOrBuilderCallback === "object") {
       throw new Error(false ? formatProdErrorMessage(8) : "The object notation for `createReducer` has been removed. Please use the 'builder callback' notation instead: https://redux-toolkit.js.org/api/createReducer");
@@ -20196,10 +20202,10 @@ function createReducer(initialState9, mapOrBuilderCallback) {
   }
   let [actionsMap, finalActionMatchers, finalDefaultCaseReducer] = executeReducerBuilderCallback(mapOrBuilderCallback);
   let getInitialState;
-  if (isStateFunction(initialState9)) {
-    getInitialState = () => freezeDraftable(initialState9());
+  if (isStateFunction(initialState10)) {
+    getInitialState = () => freezeDraftable(initialState10());
   } else {
-    const frozenInitialState = freezeDraftable(initialState9);
+    const frozenInitialState = freezeDraftable(initialState10);
     getInitialState = () => frozenInitialState;
   }
   function reducer(state = getInitialState(), action) {
@@ -20851,10 +20857,29 @@ var relayersSelector = createSelector(
   )
 );
 var relayerFeeConfigSelector = (state) => state.relayers.feeConfig;
-var userSecretsSelector = selectEntityMap(
+var derivedUserSecretsSelector = selectEntityMap(
   (s) => s.userSecrets.byPool,
   deserialize
 );
+var legacyUserSecretsSelector = selectEntityMap(
+  (s) => s.legacySecrets.byPool,
+  deserialize
+);
+var userSecretsSelector = createSelector(
+  [derivedUserSecretsSelector, legacyUserSecretsSelector],
+  (derived, legacy) => {
+    const result = /* @__PURE__ */ new Map();
+    for (const [poolAddress, records] of legacy) {
+      const existing = result.get(poolAddress) ?? [];
+      result.set(poolAddress, [...existing, ...records.map((record) => ({ kind: "legacy", ...record }))]);
+    }
+    for (const [poolAddress, records] of derived) {
+      const existing = result.get(poolAddress) ?? [];
+      result.set(poolAddress, [...existing, ...records.map((record) => ({ kind: "derived", ...record }))]);
+    }
+    return result;
+  }
+);
 
 // src/state/selectors/deposits.selector.ts
 var myDepositsSelector = createSelector(
@@ -20868,7 +20893,7 @@ var myDepositsSelector = createSelector(
         const commitment = BigInt(r.commitment);
         const deposit = poolDeposits.get(commitment);
         if (deposit) {
-          result.set(commitment, { ...deposit, index: r.depositIndex });
+          result.set(commitment, { ...deposit, index: r.kind === "derived" ? r.depositIndex : -1 });
         }
       }
     }
@@ -21249,6 +21274,28 @@ var userSecretsSlice = createSlice({
 var { addUserSecret } = userSecretsSlice.actions;
 var userSecretsReducer = userSecretsSlice.reducer;
 
+// src/state/slices/legacySecretsSlice.ts
+var initialState9 = {
+  byPool: []
+};
+var legacySecretsSlice = createSlice({
+  name: "legacySecrets",
+  initialState: initialState9,
+  reducers: {
+    addLegacyUserSecret: ({ byPool }, { payload: { poolAddress, record } }) => {
+      const map = new Map(deserialize(byPool));
+      const records = map.get(poolAddress) || [];
+      if (!records.some((r) => r.commitment === record.commitment)) {
+        records.push(record);
+      }
+      map.set(poolAddress, records);
+      return serialize({ byPool: [...map] });
+    }
+  }
+});
+var { addLegacyUserSecret } = legacySecretsSlice.actions;
+var legacySecretsReducer = legacySecretsSlice.reducer;
+
 // src/state/store.ts
 var reducers = {
   deposits: depositsReducer,
@@ -21258,7 +21305,8 @@ var reducers = {
   relayers: relayersReducer,
   instanceRegistryInfo: protocolConfigReducer,
   sync: syncReducer,
-  userSecrets: userSecretsReducer
+  userSecrets: userSecretsReducer,
+  legacySecrets: legacySecretsReducer
 };
 var loggerFactory = (logLevel) => (api) => (next) => (action) => {
   const result = next(action);
@@ -21288,11 +21336,11 @@ var loggerFactory = (logLevel) => (api) => (next) => (action) => {
 };
 var storeFactory = ({
   protocolConfig,
-  initialState: initialState9,
+  initialState: initialState10,
   logLevel = "error"
 }) => {
   const store = configureStore({
-    preloadedState: initialState9,
+    preloadedState: initialState10,
     reducer: reducers,
     middleware: (getDefaultMiddleware) => {
       const defaultMiddleware = getDefaultMiddleware({
@@ -22003,7 +22051,7 @@ var discoverUserEventsThunk = createAsyncThunk(
     const deposits = depositsSelector(state);
     const pools = poolsSelector(state);
     const { chainId } = instanceRegistryInfoSelector(state);
-    const userSecrets = userSecretsSelector(state);
+    const userSecrets = derivedUserSecretsSelector(state);
     for (const [poolAddress] of pools) {
       const startIndex = userSecrets.get(poolAddress)?.length ?? 0;
       const poolDeposits = deposits.get(poolAddress);
@@ -22207,7 +22255,7 @@ var createTx = (address, payload, value = BigInt(0)) => {
 init_exports();
 init_encodeAbiParameters2();
 
-// ../../node_modules/.pnpm/@privacy-paymasters+sdk@0.0.4_typescript@5.9.3_zod@4.4.3/node_modules/@privacy-paymasters/sdk/dist/index.js
+// ../../node_modules/.pnpm/@privacy-paymasters+sdk@0.0.5_typescript@5.9.3_zod@4.4.3/node_modules/@privacy-paymasters/sdk/dist/index.js
 function encodePaymasterData(adapter, adapterData) {
   return encodeAbiParameters2(parseAbiParameters("(address adapter, bytes adapterData)"), [{ adapter, adapterData }]);
 }
@@ -22389,7 +22437,7 @@ var baseGasUnits = {
   preVerificationGas: 100000n,
   verificationGasLimit: 50000n,
   callGasLimit: 300000n,
-  paymasterVerificationGasLimit: 350000n,
+  paymasterVerificationGasLimit: 450000n,
   paymasterPostOpGasLimit: 50000n
 };
 function reasonableGasUnits(isERC20) {
@@ -24255,6 +24303,22 @@ var paymasterWithdrawThunk = createAsyncThunk("withdraw/executePaymasterWithdraw
   );
   const bundlerClient = createPaymasterBundlerClient(bundlerUrl);
   const { standard: { maxFeePerGas, maxPriorityFeePerGas } } = await getUserOperationGasPrice(bundlerClient);
+  const refineGasWithBundler = async (baselineGas2, provisionalUserOperation) => {
+    try {
+      const estimated = await estimateUserOperationGas2(bundlerClient, provisionalUserOperation, entryPointAddress);
+      const buffer2 = (x) => x * 12n / 10n;
+      const orBaseline = (e, b) => e > 0n ? buffer2(e) : b;
+      return {
+        callGasLimit: orBaseline(estimated.callGasLimit, baselineGas2.callGasLimit),
+        verificationGasLimit: orBaseline(estimated.verificationGasLimit, baselineGas2.verificationGasLimit),
+        preVerificationGas: orBaseline(estimated.preVerificationGas, baselineGas2.preVerificationGas),
+        paymasterVerificationGasLimit: orBaseline(estimated.paymasterVerificationGasLimit, baselineGas2.paymasterVerificationGasLimit),
+        paymasterPostOpGasLimit: orBaseline(estimated.paymasterPostOpGasLimit, baselineGas2.paymasterPostOpGasLimit)
+      };
+    } catch {
+      return baselineGas2;
+    }
+  };
   const relayerAddress = BigInt(paymasterAddress);
   const bigintChainId = await dataService.getChainId();
   const { recipient: originalRecipient, ...restWithoutRecipient } = rest;
@@ -24281,11 +24345,13 @@ var paymasterWithdrawThunk = createAsyncThunk("withdraw/executePaymasterWithdraw
       )
     );
   };
-  const ephemeralSigner = async (deposit) => privateKeyToAccount(await secretManager.deriveEphemeralSigner({
-    depositIndex: deposit.index,
-    chainId: bigintChainId,
-    poolAddress: deposit.pool
-  }));
+  const ephemeralSigner = async (deposit) => privateKeyToAccount(
+    deposit.kind === "legacy" ? await secretManager.deriveLegacyEphemeralSigner({ nullifier: deposit.nullifier }) : await secretManager.deriveEphemeralSigner({
+      depositIndex: deposit.depositIndex,
+      chainId: bigintChainId,
+      poolAddress: deposit.pool
+    })
+  );
   const resolveBatchDelegator = async () => {
     if (delegation?.mode === "random") return privateKeyToAccount(generatePrivateKey());
     if (delegation?.mode === "deterministic" && delegation.path) {
@@ -24299,19 +24365,36 @@ var paymasterWithdrawThunk = createAsyncThunk("withdraw/executePaymasterWithdraw
   if (!needsConsolidation) {
     const deposit = deposits[0];
     const signer2 = await resolveIndependentSigner(deposit);
-    const gasUnits = reasonableGasUnits(poolInfo.isERC20);
-    const fee2 = await quoteFee(computeMinimumViableFee(gasUnits, maxFeePerGas));
-    const proof = await prove(deposit, originalRecipient, relayerAddress, fee2);
-    const userOperation2 = await buildSignedTornadoUserOp({
+    const baselineGas2 = { ...reasonableGasUnits(poolInfo.isERC20), callGasLimit: 0n };
+    let fee2 = await quoteFee(computeMinimumViableFee(baselineGas2, maxFeePerGas));
+    let gas2 = baselineGas2;
+    let proof = await prove(deposit, originalRecipient, relayerAddress, fee2);
+    let userOperation2 = await buildSignedTornadoUserOp({
       signer: signer2,
       chainId,
       paymasterAddress,
       paymasterData: buildPaymasterData(deposit.pool, proof),
-      gas: { ...gasUnits, callGasLimit: 0n },
+      gas: gas2,
       maxFeePerGas,
       maxPriorityFeePerGas,
       nonce: 0n
     });
+    const estimatedGas = await refineGasWithBundler(baselineGas2, userOperation2);
+    if (estimatedGas !== baselineGas2) {
+      gas2 = { ...estimatedGas, callGasLimit: 0n };
+      fee2 = await quoteFee(computeMinimumViableFee(gas2, maxFeePerGas));
+      proof = await prove(deposit, originalRecipient, relayerAddress, fee2);
+      userOperation2 = await buildSignedTornadoUserOp({
+        signer: signer2,
+        chainId,
+        paymasterAddress,
+        paymasterData: buildPaymasterData(deposit.pool, proof),
+        gas: gas2,
+        maxFeePerGas,
+        maxPriorityFeePerGas,
+        nonce: 0n
+      });
+    }
     return [{
       mode: "paymaster",
       proof,
@@ -24380,22 +24463,12 @@ var paymasterWithdrawThunk = createAsyncThunk("withdraw/executePaymasterWithdraw
   let gas = baselineGas;
   let sponsoringProof = await prove(sponsoringDeposit, senderAddress, relayerAddress, fee);
   let userOperation = await buildOp(gas, fee, buildPaymasterData(sponsoringDeposit.pool, sponsoringProof));
-  try {
-    const estimated = await estimateUserOperationGas2(bundlerClient, userOperation, entryPointAddress);
-    const buffer2 = (x) => x * 12n / 10n;
-    const orBaseline = (e, b) => e > 0n ? buffer2(e) : b;
-    const refinedGas = {
-      callGasLimit: orBaseline(estimated.callGasLimit, baselineGas.callGasLimit),
-      verificationGasLimit: orBaseline(estimated.verificationGasLimit, baselineGas.verificationGasLimit),
-      preVerificationGas: orBaseline(estimated.preVerificationGas, baselineGas.preVerificationGas),
-      paymasterVerificationGasLimit: orBaseline(estimated.paymasterVerificationGasLimit, baselineGas.paymasterVerificationGasLimit),
-      paymasterPostOpGasLimit: orBaseline(estimated.paymasterPostOpGasLimit, baselineGas.paymasterPostOpGasLimit)
-    };
-    fee = await quoteFee(computeMinimumViableFee(refinedGas, maxFeePerGas));
+  const refinedGas = await refineGasWithBundler(baselineGas, userOperation);
+  if (refinedGas !== baselineGas) {
     gas = refinedGas;
+    fee = await quoteFee(computeMinimumViableFee(gas, maxFeePerGas));
     sponsoringProof = await prove(sponsoringDeposit, senderAddress, relayerAddress, fee);
     userOperation = await buildOp(gas, fee, buildPaymasterData(sponsoringDeposit.pool, sponsoringProof));
-  } catch {
   }
   return [{
     mode: "paymaster",
@@ -24477,7 +24550,7 @@ var getDepositPayloadThunk = createAsyncThunk(
     const state = getState();
     const pools = poolsSelector(state);
     const { chainId } = instanceRegistryInfoSelector(state);
-    const userSecrets = userSecretsSelector(state);
+    const userSecrets = derivedUserSecretsSelector(state);
     const poolsCandidates = Array.from(pools.values()).filter((p) => p.asset === asset);
     if (poolsCandidates.length === 0) throw new Error(`No pools available for asset ${addressToHex(asset)}`);
     const poolsToDepositInto = calculatePoolsDeposits(poolsCandidates, amount, strategy);
@@ -24526,6 +24599,62 @@ var getDepositPayloadThunk = createAsyncThunk(
   }
 );
 
+// src/account/legacyNote.ts
+init_utils2();
+var NOTE_REGEX = /^tornado-([a-zA-Z0-9]+)-([0-9.]+)-(\d+)-0x([0-9a-fA-F]+)$/;
+function parseLegacyNote(note) {
+  const match = NOTE_REGEX.exec(note.trim());
+  if (!match) {
+    throw new Error(`Invalid tornado cash note: ${note}`);
+  }
+  const [, currency, denomination, chainId, preimageHex] = match;
+  const preimageBytes = hexToBytes2(preimageHex);
+  if (preimageBytes.length !== 62) {
+    throw new Error(`Invalid tornado cash note preimage length: ${note}`);
+  }
+  const nullifierBytes = preimageBytes.subarray(0, 31);
+  const saltBytes = preimageBytes.subarray(31, 62);
+  return {
+    currency,
+    denomination,
+    chainId: BigInt(chainId),
+    nullifier: bytesToNumberLE(nullifierBytes),
+    salt: bytesToNumberLE(saltBytes),
+    commitment: pedersenHash2(preimageBytes),
+    nullifierHash: pedersenHash2(nullifierBytes)
+  };
+}
+
+// src/state/thunks/importLegacyNotesThunk.ts
+var importLegacyNotesThunk = createAsyncThunk(
+  "userSecrets/importLegacy",
+  async ({ notes }, { getState, dispatch }) => {
+    const state = getState();
+    const deposits = depositsSelector(state);
+    const { chainId } = instanceRegistryInfoSelector(state);
+    return notes.map((note) => {
+      const parsed = parseLegacyNote(note);
+      if (parsed.chainId !== chainId) {
+        return { note, status: "wrong-chain" };
+      }
+      const matchedPool = [...deposits].find(([, poolDeposits]) => poolDeposits.has(parsed.commitment))?.[0];
+      if (!matchedPool) {
+        return { note, status: "not-found" };
+      }
+      dispatch(addLegacyUserSecret({
+        poolAddress: matchedPool,
+        record: {
+          commitment: parsed.commitment,
+          nullifierHash: parsed.nullifierHash,
+          nullifier: parsed.nullifier,
+          salt: parsed.salt
+        }
+      }));
+      return { note, status: "imported", poolAddress: matchedPool };
+    });
+  }
+);
+
 // src/state/state-manager.ts
 var ETH_SEPOLIA_CHAIN_ID = 11155111n;
 var getStoreKey = ({
@@ -24540,6 +24669,10 @@ var initializeSelectors = (store) => ({
     getAllNotes: () => allNotesSelector(store.getState())
   },
   getPublicState: () => {
+    const { userSecrets, legacySecrets, ...publicState } = store.getState();
+    return publicState;
+  },
+  getPrivateState: () => {
     const { userSecrets, ...publicState } = store.getState();
     return publicState;
   }
@@ -24569,13 +24702,13 @@ var storeByChainAndEntrypoint = ({
         const rawStoredState = storageToSyncTo ? await storageToSyncTo.get(storageKey) : void 0;
         const storedState = rawStoredState ? JSON.parse(rawStoredState) : void 0;
         const snapshotInitialState = storedState || !resolveInitialState ? void 0 : (await resolveInitialState())[storageKey];
-        let initialState9 = storedState || snapshotInitialState;
-        if (!initialState9 && getChainStoreParams.chainId === ETH_SEPOLIA_CHAIN_ID) {
-          initialState9 = await Promise.resolve().then(() => __toESM(require_state_11155111_minimal(), 1)).then((a) => a["tornado-cash-state-11155111-447664927873626138772898946646079239273904189887"]);
+        let initialState10 = storedState || snapshotInitialState;
+        if (!initialState10 && getChainStoreParams.chainId === ETH_SEPOLIA_CHAIN_ID) {
+          initialState10 = await Promise.resolve().then(() => __toESM(require_state_11155111_minimal(), 1)).then((a) => a["tornado-cash-state-11155111-447664927873626138772898946646079239273904189887"]);
         }
         const store = storeFactory({
           protocolConfig,
-          initialState: initialState9
+          initialState: initialState10
         });
         store.dispatch(setRelayerFeeConfig(relayerConfig));
         storeWithSelectors = initializeSelectors(store);
@@ -24604,14 +24737,14 @@ var storeStateManager = async ({
   paymasterConfig,
   proverFactory,
   storageToSyncTo,
-  initialState: initialState9,
+  initialState: initialState10,
   protocolConfig,
   relayerConfig
 }) => {
   const secretManager = await secretManagerFactory();
   const { getChainStore, getAllStores } = storeByChainAndEntrypoint({
     storageToSyncTo,
-    initialState: initialState9
+    initialState: initialState10
   });
   const getChainInfo = async () => {
     const chainId = await dataService.getChainId();
@@ -24625,6 +24758,14 @@ var storeStateManager = async ({
       }
     };
   };
+  const persistStateIfAvailable = async (chainInfo, store) => {
+    if (storageToSyncTo) {
+      await storageToSyncTo.set(
+        getStoreStorageKey(chainInfo),
+        JSON.stringify(store.getPrivateState())
+      );
+    }
+  };
   return {
     sync: async () => {
       const chainInfo = await getChainInfo();
@@ -24640,12 +24781,7 @@ var storeStateManager = async ({
           })
         )
       );
-      if (storageToSyncTo) {
-        await storageToSyncTo.set(
-          getStoreStorageKey(chainInfo),
-          JSON.stringify(store.getPublicState())
-        );
-      }
+      await persistStateIfAvailable(chainInfo, store);
     },
     getBalances: async (assets) => {
       const { selectors: { specificAssetsBalanceSelector: specificAssetsBalanceSelector2 } } = await getChainStore(await getChainInfo());
@@ -24711,6 +24847,15 @@ var storeStateManager = async ({
         )
       );
     },
+    importNotes: async ({ notes }) => {
+      const chainInfo = await getChainInfo();
+      const store = await getChainStore(chainInfo);
+      const result = unwrapResult(
+        await store.dispatch(importLegacyNotesThunk({ notes }))
+      );
+      await persistStateIfAvailable(chainInfo, store);
+      return result;
+    },
     dumpState: () => getAllStores()
   };
 };
@@ -24722,12 +24867,12 @@ function getStateManager() {
   return _stateManager;
 }
 var workerApi = {
-  async init(provider, relayerClient, keystore, rawStorage, initialState9, artifactsLoader, externalSyncProvider, { protocolConfig, accountIndex, relayerConfig, paymasterConfig, minExternalSyncBlocksAmount }) {
+  async init(provider, relayerClient, keystore, rawStorage, initialState10, artifactsLoader, secretManager, externalSyncProvider, { protocolConfig, accountIndex, relayerConfig, paymasterConfig, minExternalSyncBlocksAmount }) {
     const storage = rawStorage;
     const dataService = new DataService({ provider });
     _stateManager = await storeStateManager({
       paymasterConfig,
-      secretManagerFactory: () => SecretManager({ host: { keystore }, accountIndex }),
+      secretManagerFactory: () => secretManager ? Promise.resolve(secretManager) : SecretManager({ host: { keystore }, accountIndex }),
       dataService,
       syncService: new SyncService({ dataService, externalSyncProvider, minExternalSyncBlocksAmount }),
       relayerClient,
@@ -24735,7 +24880,7 @@ var workerApi = {
       storageToSyncTo: storage,
       protocolConfig,
       relayerConfig,
-      initialState: initialState9
+      initialState: initialState10
     });
   },
   sync() {
@@ -24750,6 +24895,9 @@ var workerApi = {
   getDepositPayload(params) {
     return getStateManager().getDepositPayload(params);
   },
+  importNotes(params) {
+    return getStateManager().importNotes(params);
+  },
   getWithdrawalPayloads(params, tailCalls) {
     const fullParams = params.mode === "paymaster" && tailCalls ? { ...params, tailCalls } : params;
     return getStateManager().getWithdrawalPayloads(fullParams);