@kohaku-eth/tornado-cash 0.0.2-alpha.11 → 0.0.2-alpha.13

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

@@ -1,10 +1,14 @@
 import * as comlink from 'comlink';
 import { combineReducers } from '@reduxjs/toolkit';
 import * as _kohaku_eth_plugins from '@kohaku-eth/plugins';
-import { SignedAuthorization } from 'viem';
+import { ExternalSyncPoolId, ExternalRawEvent, AccountId } from '@kohaku-eth/plugins';
+import { Hex } from 'ox/Hex';
 import * as _kohaku_eth_provider from '@kohaku-eth/provider';
+import { TxData } from '@kohaku-eth/provider';
+import { Address as Address$1 } from 'ox/Address';
 
 type Address = bigint & {};
+type Commitment = bigint & {};
 interface IContract {
     address: Address;
 }
@@ -26,6 +30,43 @@ interface ProtocolConfigState {
 type RootState = ReturnType<ReturnType<typeof combineReducers<typeof reducers>>>;
 type PublicRootState = Omit<RootState, 'userSecrets'>;
 
+interface IBaseEvent {
+    blockNumber: bigint;
+    transactionHash: bigint;
+}
+interface IPoolEvent extends IBaseEvent {
+    pool: Address;
+}
+interface IDepositEvent extends IPoolEvent {
+    commitment: Commitment;
+    leafIndex: number;
+    timestamp: bigint;
+}
+interface IIndexedDepositEvent extends IDepositEvent {
+    index: number;
+}
+interface IDepositWithAsset extends IIndexedDepositEvent {
+    assetAddress: Address;
+}
+interface IDepositWithBalance extends IDepositWithAsset {
+    balance: bigint;
+}
+
+/**
+ * Worker-facing view of the host's `ExternalSyncProvider`. The host exposes a
+ * streaming provider (`streamEvents` returning an async iterator), but async
+ * iterators cannot cross the Comlink worker boundary. The plugin adapts the
+ * provider into this materialized-array shape on the main thread before proxying
+ * it into the state-manager worker (see `plugin/base.ts`).
+ */
+type ExternalSyncClient = {
+    getEvents(params: ExternalSyncPoolId & {
+        fromBlock: Hex;
+        toBlock: Hex;
+    }): Promise<ExternalRawEvent[]>;
+    lastCoveredBlock(params: ExternalSyncPoolId): Promise<Hex | null>;
+};
+
 interface IRelayerStatusResponse {
     currentQueue: number;
     netId: number;
@@ -47,18 +88,6 @@ interface IRelayerClient {
     withdraw(relayerUrl: string, body: ITornadoWithdrawRequest): Promise<ITornadoWithdrawResponse>;
 }
 
-interface TornadoWithdrawInputs {
-    nullifier: bigint;
-    secret: bigint;
-    pathElements: bigint[];
-    pathIndices: number[];
-    root: bigint;
-    nullifierHash: bigint;
-    recipient: bigint;
-    relayer: bigint;
-    fee: bigint;
-    refund: bigint;
-}
 interface TornadoProveOutput {
     proof: `0x${string}`;
     args: [
@@ -70,9 +99,6 @@ interface TornadoProveOutput {
         `0x${string}`
     ];
 }
-interface ITornadoProver {
-    prove(inputs: TornadoWithdrawInputs): Promise<TornadoProveOutput>;
-}
 
 interface IRelayerFeeConfig {
     minFee: number;
@@ -84,10 +110,36 @@ declare enum DepositStrategy {
     MinFee = 1
 }
 
-interface SignedDelegation {
-    senderAddress: `0x${string}`;
-    authorization: SignedAuthorization;
+interface SerializedAuth {
+    address: Address$1;
+    chainId: Hex;
+    nonce: Hex;
+    r: Hex;
+    s: Hex;
+    yParity: Hex;
+}
+/**
+ * A userOp serialized to the hex shape expected by `eth_sendUserOperation`, so
+ * it can be carried as plain (JSON-serializable) data from the prepare phase
+ * (thunk) to the broadcast phase.
+ */
+interface SerializedUserOperation {
+    sender: `0x${string}`;
+    nonce: `0x${string}`;
+    callData: `0x${string}`;
+    callGasLimit: `0x${string}`;
+    verificationGasLimit: `0x${string}`;
+    preVerificationGas: `0x${string}`;
+    maxFeePerGas: `0x${string}`;
+    maxPriorityFeePerGas: `0x${string}`;
+    paymaster?: `0x${string}`;
+    paymasterVerificationGasLimit?: `0x${string}`;
+    paymasterPostOpGasLimit?: `0x${string}`;
+    paymasterData?: `0x${string}`;
+    signature: `0x${string}`;
+    eip7702Auth?: SerializedAuth;
 }
+
 interface IGenericPaymasterWithdrawalPayload {
     mode: 'paymaster';
     proof: TornadoProveOutput;
@@ -96,8 +148,7 @@ interface IGenericPaymasterWithdrawalPayload {
     paymasterAddress: `0x${string}`;
     entryPointAddress: `0x${string}`;
     bundlerUrl: string;
-    accountAddress: `0x${string}`;
-    delegation?: SignedDelegation;
+    userOperation: SerializedUserOperation;
 }
 
 type DelegationConfig = {
@@ -144,28 +195,37 @@ interface IRelayerWithdrawParams extends IWithdrawBaseParams {
 interface IPaymasterWithdrawParams extends IWithdrawBaseParams {
     mode: 'paymaster';
     delegation?: DelegationConfig;
+    tailCalls?: (address: AccountId) => Promise<TxData[]>;
 }
 type IWithdrawapOperationParams = IRelayerWithdrawParams | IPaymasterWithdrawParams;
+interface IGetNotesParams extends IBaseOperationParams {
+    includeSpent?: boolean;
+    assets?: Address[];
+}
+type TCNote = Pick<IDepositWithBalance, 'commitment' | 'balance' | 'assetAddress' | 'timestamp' | 'leafIndex' | 'pool'> & {
+    /** Fixed pool denomination for this note. */
+    amount: bigint;
+    depositIndex: number;
+};
 type StoreKey = `${string}-${string}`;
 type StoreStorageKey = `tornado-cash-state-${StoreKey}`;
 
-declare function makeLazyProverFactory(artifactsLoader: () => Promise<ITornadoArtifacts>, version?: 'legacy' | 'js'): () => Promise<ITornadoProver>;
-
 interface WorkerInitOptions {
     protocolConfig: TCProtocolConfig;
     relayerConfig?: IRelayerFeeConfig;
     accountIndex: number;
     paymasterConfig: IChainsPaymastersConfig;
-    proverVersion?: Parameters<typeof makeLazyProverFactory>[1];
+    minExternalSyncBlocksAmount?: number;
 }
 
 declare function loadStateManagerWorker(workerUrl?: string | URL): {
     remote: comlink.Remote<{
-        init(provider: _kohaku_eth_provider.EthereumProvider, relayerClient: IRelayerClient, keystore: _kohaku_eth_plugins.Keystore, rawStorage: Omit<_kohaku_eth_plugins.Storage, "_brand">, initialState: () => Promise<Record<string, PublicRootState>>, artifactsLoader: () => Promise<ITornadoArtifacts>, { protocolConfig, accountIndex, relayerConfig, paymasterConfig, proverVersion }: WorkerInitOptions): Promise<void>;
+        init(provider: _kohaku_eth_provider.EthereumProvider, relayerClient: IRelayerClient, keystore: _kohaku_eth_plugins.Keystore, rawStorage: Omit<_kohaku_eth_plugins.Storage, "_brand">, initialState: () => Promise<Record<string, PublicRootState>>, artifactsLoader: () => Promise<ITornadoArtifacts>, externalSyncProvider: ExternalSyncClient | undefined, { protocolConfig, accountIndex, relayerConfig, paymasterConfig, minExternalSyncBlocksAmount }: WorkerInitOptions): Promise<void>;
         sync(): Promise<void>;
         getBalances(assets?: Address[]): Promise<Map<Address, bigint>>;
+        getNotes(params: IGetNotesParams): Promise<TCNote[]>;
         getDepositPayload(params: IDepositOperationParams): Promise<_kohaku_eth_provider.TxData[]>;
-        getWithdrawalPayloads(params: IWithdrawapOperationParams): Promise<IWithdrawalPayload[]>;
+        getWithdrawalPayloads(params: IWithdrawapOperationParams, tailCalls?: IPaymasterWithdrawParams["tailCalls"]): Promise<IWithdrawalPayload[]>;
         dumpState(): Record<StoreStorageKey, Omit<RootState, "userSecrets">>;
     }>;
     onError: (handler: (err: Error) => void) => void;

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

@@ -1,11 +1,15 @@
 import * as comlink from 'comlink';
 import { combineReducers } from '@reduxjs/toolkit';
 import * as _kohaku_eth_plugins from '@kohaku-eth/plugins';
-import { SignedAuthorization } from 'viem';
+import { ExternalSyncPoolId, ExternalRawEvent, AccountId } from '@kohaku-eth/plugins';
+import { Hex } from 'ox/Hex';
 import * as _kohaku_eth_provider from '@kohaku-eth/provider';
+import { TxData } from '@kohaku-eth/provider';
+import { Address as Address$1 } from 'ox/Address';
 import { Worker } from 'worker_threads';
 
 type Address = bigint & {};
+type Commitment = bigint & {};
 interface IContract {
     address: Address;
 }
@@ -27,6 +31,43 @@ interface ProtocolConfigState {
 type RootState = ReturnType<ReturnType<typeof combineReducers<typeof reducers>>>;
 type PublicRootState = Omit<RootState, 'userSecrets'>;
 
+interface IBaseEvent {
+    blockNumber: bigint;
+    transactionHash: bigint;
+}
+interface IPoolEvent extends IBaseEvent {
+    pool: Address;
+}
+interface IDepositEvent extends IPoolEvent {
+    commitment: Commitment;
+    leafIndex: number;
+    timestamp: bigint;
+}
+interface IIndexedDepositEvent extends IDepositEvent {
+    index: number;
+}
+interface IDepositWithAsset extends IIndexedDepositEvent {
+    assetAddress: Address;
+}
+interface IDepositWithBalance extends IDepositWithAsset {
+    balance: bigint;
+}
+
+/**
+ * Worker-facing view of the host's `ExternalSyncProvider`. The host exposes a
+ * streaming provider (`streamEvents` returning an async iterator), but async
+ * iterators cannot cross the Comlink worker boundary. The plugin adapts the
+ * provider into this materialized-array shape on the main thread before proxying
+ * it into the state-manager worker (see `plugin/base.ts`).
+ */
+type ExternalSyncClient = {
+    getEvents(params: ExternalSyncPoolId & {
+        fromBlock: Hex;
+        toBlock: Hex;
+    }): Promise<ExternalRawEvent[]>;
+    lastCoveredBlock(params: ExternalSyncPoolId): Promise<Hex | null>;
+};
+
 interface IRelayerStatusResponse {
     currentQueue: number;
     netId: number;
@@ -48,18 +89,6 @@ interface IRelayerClient {
     withdraw(relayerUrl: string, body: ITornadoWithdrawRequest): Promise<ITornadoWithdrawResponse>;
 }
 
-interface TornadoWithdrawInputs {
-    nullifier: bigint;
-    secret: bigint;
-    pathElements: bigint[];
-    pathIndices: number[];
-    root: bigint;
-    nullifierHash: bigint;
-    recipient: bigint;
-    relayer: bigint;
-    fee: bigint;
-    refund: bigint;
-}
 interface TornadoProveOutput {
     proof: `0x${string}`;
     args: [
@@ -71,9 +100,6 @@ interface TornadoProveOutput {
         `0x${string}`
     ];
 }
-interface ITornadoProver {
-    prove(inputs: TornadoWithdrawInputs): Promise<TornadoProveOutput>;
-}
 
 interface IRelayerFeeConfig {
     minFee: number;
@@ -85,10 +111,36 @@ declare enum DepositStrategy {
     MinFee = 1
 }
 
-interface SignedDelegation {
-    senderAddress: `0x${string}`;
-    authorization: SignedAuthorization;
+interface SerializedAuth {
+    address: Address$1;
+    chainId: Hex;
+    nonce: Hex;
+    r: Hex;
+    s: Hex;
+    yParity: Hex;
+}
+/**
+ * A userOp serialized to the hex shape expected by `eth_sendUserOperation`, so
+ * it can be carried as plain (JSON-serializable) data from the prepare phase
+ * (thunk) to the broadcast phase.
+ */
+interface SerializedUserOperation {
+    sender: `0x${string}`;
+    nonce: `0x${string}`;
+    callData: `0x${string}`;
+    callGasLimit: `0x${string}`;
+    verificationGasLimit: `0x${string}`;
+    preVerificationGas: `0x${string}`;
+    maxFeePerGas: `0x${string}`;
+    maxPriorityFeePerGas: `0x${string}`;
+    paymaster?: `0x${string}`;
+    paymasterVerificationGasLimit?: `0x${string}`;
+    paymasterPostOpGasLimit?: `0x${string}`;
+    paymasterData?: `0x${string}`;
+    signature: `0x${string}`;
+    eip7702Auth?: SerializedAuth;
 }
+
 interface IGenericPaymasterWithdrawalPayload {
     mode: 'paymaster';
     proof: TornadoProveOutput;
@@ -97,8 +149,7 @@ interface IGenericPaymasterWithdrawalPayload {
     paymasterAddress: `0x${string}`;
     entryPointAddress: `0x${string}`;
     bundlerUrl: string;
-    accountAddress: `0x${string}`;
-    delegation?: SignedDelegation;
+    userOperation: SerializedUserOperation;
 }
 
 type DelegationConfig = {
@@ -145,28 +196,37 @@ interface IRelayerWithdrawParams extends IWithdrawBaseParams {
 interface IPaymasterWithdrawParams extends IWithdrawBaseParams {
     mode: 'paymaster';
     delegation?: DelegationConfig;
+    tailCalls?: (address: AccountId) => Promise<TxData[]>;
 }
 type IWithdrawapOperationParams = IRelayerWithdrawParams | IPaymasterWithdrawParams;
+interface IGetNotesParams extends IBaseOperationParams {
+    includeSpent?: boolean;
+    assets?: Address[];
+}
+type TCNote = Pick<IDepositWithBalance, 'commitment' | 'balance' | 'assetAddress' | 'timestamp' | 'leafIndex' | 'pool'> & {
+    /** Fixed pool denomination for this note. */
+    amount: bigint;
+    depositIndex: number;
+};
 type StoreKey = `${string}-${string}`;
 type StoreStorageKey = `tornado-cash-state-${StoreKey}`;
 
-declare function makeLazyProverFactory(artifactsLoader: () => Promise<ITornadoArtifacts>, version?: 'legacy' | 'js'): () => Promise<ITornadoProver>;
-
 interface WorkerInitOptions {
     protocolConfig: TCProtocolConfig;
     relayerConfig?: IRelayerFeeConfig;
     accountIndex: number;
     paymasterConfig: IChainsPaymastersConfig;
-    proverVersion?: Parameters<typeof makeLazyProverFactory>[1];
+    minExternalSyncBlocksAmount?: number;
 }
 
 declare function loadStateManagerWorker(workerUrl?: string | URL): {
     remote: comlink.Remote<{
-        init(provider: _kohaku_eth_provider.EthereumProvider, relayerClient: IRelayerClient, keystore: _kohaku_eth_plugins.Keystore, rawStorage: Omit<_kohaku_eth_plugins.Storage, "_brand">, initialState: () => Promise<Record<string, PublicRootState>>, artifactsLoader: () => Promise<ITornadoArtifacts>, { protocolConfig, accountIndex, relayerConfig, paymasterConfig, proverVersion }: WorkerInitOptions): Promise<void>;
+        init(provider: _kohaku_eth_provider.EthereumProvider, relayerClient: IRelayerClient, keystore: _kohaku_eth_plugins.Keystore, rawStorage: Omit<_kohaku_eth_plugins.Storage, "_brand">, initialState: () => Promise<Record<string, PublicRootState>>, artifactsLoader: () => Promise<ITornadoArtifacts>, externalSyncProvider: ExternalSyncClient | undefined, { protocolConfig, accountIndex, relayerConfig, paymasterConfig, minExternalSyncBlocksAmount }: WorkerInitOptions): Promise<void>;
         sync(): Promise<void>;
         getBalances(assets?: Address[]): Promise<Map<Address, bigint>>;
+        getNotes(params: IGetNotesParams): Promise<TCNote[]>;
         getDepositPayload(params: IDepositOperationParams): Promise<_kohaku_eth_provider.TxData[]>;
-        getWithdrawalPayloads(params: IWithdrawapOperationParams): Promise<IWithdrawalPayload[]>;
+        getWithdrawalPayloads(params: IWithdrawapOperationParams, tailCalls?: IPaymasterWithdrawParams["tailCalls"]): Promise<IWithdrawalPayload[]>;
         dumpState(): Record<StoreStorageKey, Omit<RootState, "userSecrets">>;
     }>;
     onError: (handler: (err: Error) => void) => Worker;

package/dist/worker-loader.node.js

@@ -2,16 +2,11 @@
 import { wrap } from "comlink";
 import nodeEndpoint from "comlink/dist/umd/node-adapter.js";
 import { Worker } from "worker_threads";
-import { fileURLToPath } from "url";
-import { dirname, resolve } from "path";
 function loadStateManagerWorker(workerUrl) {
   if (workerUrl !== void 0) {
     console.warn("[worker-loader.node] workerUrl is ignored in Node.js \u2014 the worker file is always loaded from the local filesystem.");
   }
-  const thisFile = fileURLToPath(import.meta.url);
-  const thisDir = dirname(thisFile);
-  const workerPath = resolve(thisDir, `./state-manager.worker.node.cjs`);
-  const worker = new Worker(workerPath);
+  const worker = new Worker(new URL("./state-manager.worker.node.js", import.meta.url));
   return {
     remote: wrap(nodeEndpoint(worker)),
     onError: (handler) => worker.on("error", handler)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kohaku-eth/tornado-cash",
-  "version": "0.0.2-alpha.11",
+  "version": "0.0.2-alpha.13",
   "description": "Tornado Cash Shielded Pool Kohaku Plugin",
   "type": "module",
   "private": false,
@@ -20,6 +20,11 @@
     },
     "#circuit-loader": {
       "default": "./dist/circuit-loader.js"
+    },
+    "#merkle-tree": {
+      "node": "./dist/merkle-tree.node.js",
+      "browser": "./dist/merkle-tree.browser.js",
+      "default": "./dist/merkle-tree.browser.js"
     }
   },
   "exports": {
@@ -36,7 +41,6 @@
     },
     "./worker-loader.browser": "./dist/worker-loader.browser.js",
     "./worker-loader.node": "./dist/worker-loader.node.js",
-    "./circuits/*": "./circuits/*",
     "./package.json": "./package.json"
   },
   "engines": {
@@ -64,20 +68,15 @@
   "dependencies": {
     "@noble/curves": "^2.2.0",
     "@noble/hashes": "^2.2.0",
-    "@privacy-paymasters/sdk": "0.0.2",
+    "@privacy-paymasters/sdk": "0.0.4",
     "@reduxjs/toolkit": "^2.11.2",
-    "buffer": "^6.0.3",
-    "circomlibjs": "0.1.2",
     "comlink": "^4.4.2",
-    "fixed-merkle-tree": "^0.7.3",
-    "maci-crypto": "2.5.0",
-    "micro-zk-proofs": "0.3.0",
+    "micro-zk-proofs": "0.3.1",
     "ox": "^0.12.0",
-    "snarkjs": "git+https://github.com/tornadocash/snarkjs.git#869181cfaf7526fe8972073d31655493a04326d5",
     "viem": "^2.51.3",
-    "websnark": "git+https://github.com/tornadocash/websnark.git#4c0af6a8b65aabea3c09f377f63c44e7a58afa6d",
     "@kohaku-eth/provider": "0.1.0-alpha.8",
-    "@kohaku-eth/plugins": "0.0.1-alpha.9"
+    "mimc-tree": "0.1.0",
+    "@kohaku-eth/plugins": "0.0.1-alpha.11"
   },
   "devDependencies": {
     "@types/node": "^24.12.2",