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

package/dist/index.d.ts

@@ -305,6 +305,17 @@ interface IPaymasterWithdrawalPayload {
     isERC20: boolean;
     delegation?: SignedDelegation;
 }
+interface IGenericPaymasterWithdrawalPayload {
+    mode: 'paymaster';
+    proof: TornadoProveOutput;
+    poolAddress: Address;
+    isERC20: boolean;
+    paymasterAddress: `0x${string}`;
+    entryPointAddress: `0x${string}`;
+    bundlerUrl: string;
+    accountAddress: `0x${string}`;
+    delegation?: SignedDelegation;
+}
 interface PaymasterBroadcastResult {
     userOpHash: Hash;
 }
@@ -312,6 +323,16 @@ interface IPaymasterBroadcasterClient {
     broadcast(withdrawals: IPaymasterWithdrawalPayload[]): Promise<PaymasterBroadcastResult[]>;
 }
 
+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];
+}
+
 type DelegationConfig = {
     mode: 'deterministic';
     path?: string;
@@ -332,7 +353,7 @@ interface IRelayerWithdrawalPayload {
     poolAddress: Address;
     relayerUrl: string;
 }
-type IWithdrawalPayload = IRelayerWithdrawalPayload | IPaymasterWithdrawalPayload;
+type IWithdrawalPayload = IRelayerWithdrawalPayload | IGenericPaymasterWithdrawalPayload;
 interface TCPrivateOperation<Mode extends IWithdrawalPayload['mode'] = 'relayer' | 'paymaster'> extends PrivateOperation {
     withdrawals: (IWithdrawalPayload & {
         mode: Mode;
@@ -346,7 +367,7 @@ interface ITornadoArtifacts {
     provingKey: ArrayBuffer;
 }
 type TCProtocolConfig = Omit<ProtocolConfigState, 'chainId'>;
-interface PrivacyPoolsV1ProtocolParams {
+interface TCProtocolParams extends Pick<WorkerInitOptions, 'proverVersion'> {
     accountIndex?: number;
     paymasterConfig: IChainsPaymastersConfig;
     secretManagerFactory: (params: SecretManagerParams) => Promise<ISecretManager>;
@@ -355,7 +376,6 @@ interface PrivacyPoolsV1ProtocolParams {
     protocolConfig: TCProtocolConfig;
     relayerConfig?: IRelayerFeeConfig;
     artifactsLoader?: () => Promise<ITornadoArtifacts>;
-    proverFactory?: () => Promise<ITornadoProver>;
     initialState?: () => Promise<Record<string, PublicRootState>>;
     stateManagerWorkerUrl?: string;
 }
@@ -411,12 +431,11 @@ type TCBroadcaster = Broadcaster<TCPrivateOperation, ITornadoWithdrawResponse[]>
 interface TCBaseCredential {
     accountIndex: number;
 }
-interface TCPluginParameters extends TCBroadcasterParameters, TCBaseCredential {
+interface TCPluginParameters extends TCBroadcasterParameters, TCBaseCredential, Pick<TCProtocolParams, 'proverVersion' | 'initialState'> {
     protocolConfig: TCProtocolConfig;
     relayerConfig?: IRelayerFeeConfig;
-    initialState?: PrivacyPoolsV1ProtocolParams['initialState'];
-    artifacts: ITornadoArtifacts;
     stateManagerWorkerUrl?: string;
+    artifactsLoader?: () => Promise<ITornadoArtifacts>;
 }
 type TCAddress = Address$1;
 type TCAssetAmount<Tag extends string | undefined = undefined> = AssetAmount<ERC20AssetId, bigint, Tag>;
@@ -461,7 +480,7 @@ type RequireOnly<T, Keys extends keyof T> = Partial<T> & Pick<T, Keys>;
 declare class TornadoCashProtocol implements TCInstance {
     readonly host: Host;
     private stateManager;
-    constructor(host: Host, { accountIndex, initialState, protocolConfig, artifactsLoader, stateManagerWorkerUrl, relayerConfig, paymasterConfig, relayerClientFactory }: RequireOnly<PrivacyPoolsV1ProtocolParams, 'protocolConfig'>);
+    constructor(host: Host, { accountIndex, initialState, protocolConfig, artifactsLoader, stateManagerWorkerUrl, relayerConfig, paymasterConfig, relayerClientFactory, proverVersion }: RequireOnly<TCProtocolParams, 'protocolConfig'>);
     instanceId: () => Promise<"0x1">;
     /**
      * Only process supported assets or error out?
@@ -490,6 +509,19 @@ interface Nullifier {
 }
 
 declare const E_ADDRESS = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
+declare const TornadoPaymasterConfigs: {
+    readonly 11155111: {
+        readonly bundlerUrl: "https://public.pimlico.io/v2/11155111/rpc";
+        readonly entryPointAddress: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108";
+        readonly paymasterAddress: "0xA0e2667AcdECb9bCDa6Fcf87638a962e2E9dB20D";
+        readonly poolsAccountsMap: {
+            readonly '0x8c4a04d872a6c1be37964a21ba3a138525dff50b': "0x8A70E3dE493B8599447013f08d8b35719C8ED0ec";
+            readonly '0x8cc930096b4df705a007c4a039bdfa1320ed2508': "0x191e3De3cF7f61de7EbEf4Bf45cfBA4f652d1C6e";
+            readonly '0x6921fd1a97441dd603a997ed6ddf388658daf754': "0x060d053A6595630851ab873d6C95401b0C964d26";
+        };
+    };
+    readonly 1: never;
+};
 declare const TornadoCashConfigs: {
     readonly 1: {
         readonly ensSubdomainKey: "mainnet-tornado";
@@ -525,4 +557,4 @@ declare const TornadoCashConfigs: {
     };
 };
 
-export { type Commitment, DepositStrategy, E_ADDRESS, type ISecretManager, type Nullifier, SecretManager, type SecretManagerParams, type TCAddress, type TCAssetAmount, type TCAssetBalance, type TCBroadcaster, type TCBroadcasterParameters, type TCInstance, type TCPaymasterUnshieldOptions, type TCPluginParameters, type TCPrepareShieldOptions, type TCPrepareUnshieldOptions, type TCRelayerUnshieldOptions, TornadoCashConfigs, TornadoCashProtocol, createTCBroadcaster, createTCPlugin };
+export { type Commitment, DepositStrategy, E_ADDRESS, type ISecretManager, type Nullifier, SecretManager, type SecretManagerParams, type TCAddress, type TCAssetAmount, type TCAssetBalance, type TCBroadcaster, type TCBroadcasterParameters, type TCInstance, type TCPaymasterUnshieldOptions, type TCPluginParameters, type TCPrepareShieldOptions, type TCPrepareUnshieldOptions, type TCRelayerUnshieldOptions, TornadoCashConfigs, TornadoCashProtocol, TornadoPaymasterConfigs, createTCBroadcaster, createTCPlugin };

package/dist/index.js

@@ -409,7 +409,7 @@ async function loadCircuitFiles(circuitUrl, provingKeyUrl) {
 
 // src/utils/default-artifacts-loader.ts
 var TC_CIRCUIT_URL = "https://raw.githubusercontent.com/tornadocash/tornado-cli/refs/heads/master/build/circuits/tornado.json";
-var TC_PROVING_KEY_URL = "https://github.com/tornadocash/tornado-cli/raw/refs/heads/master/build/circuits/tornadoProvingKey.bin";
+var TC_PROVING_KEY_URL = "https://raw.githubusercontent.com/tornadocash/tornado-cli/refs/heads/master/build/circuits/tornadoProvingKey.bin";
 var defaultArtifactsLoader = () => loadCircuitFiles(TC_CIRCUIT_URL, TC_PROVING_KEY_URL);
 
 // src/plugin/base.ts
@@ -422,7 +422,8 @@ var TornadoCashProtocol = class {
     stateManagerWorkerUrl,
     relayerConfig,
     paymasterConfig = TornadoPaymasterConfigs,
-    relayerClientFactory = () => new RelayerClient(host)
+    relayerClientFactory = () => new RelayerClient(host),
+    proverVersion
   }) {
     this.host = host;
     this.stateManager = (async () => {
@@ -441,7 +442,7 @@ var TornadoCashProtocol = class {
           proxy(host.storage),
           proxy(initialState),
           proxy(artifactsLoader),
-          { protocolConfig, accountIndex, relayerConfig, paymasterConfig }
+          { protocolConfig, accountIndex, relayerConfig, paymasterConfig, proverVersion }
         ),
         workerReady
       ]);
@@ -580,10 +581,7 @@ var PaymasterBroadcaster = class _PaymasterBroadcaster {
   async broadcast(withdrawals) {
     const chainId = Number(await this.provider.getChainId());
     const {
-      poolsAccountsMap: rawPoolsAccountsMap,
-      bundlerUrl,
-      paymasterAddress,
-      entryPointAddress
+      poolsAccountsMap: rawPoolsAccountsMap
     } = this.options[chainId];
     const poolAcountsMap = new Map(
       Object.entries(rawPoolsAccountsMap).map(([poolAccount, tornadoAccount]) => [
@@ -594,9 +592,6 @@ var PaymasterBroadcaster = class _PaymasterBroadcaster {
     const results = await Promise.allSettled(
       withdrawals.map((w) => _PaymasterBroadcaster.broadcastOne({
         ...w,
-        bundlerUrl,
-        paymasterAddress,
-        entryPointAddress,
         accountAddress: poolAcountsMap.get(w.poolAddress)
       }, this.provider))
     );
@@ -775,4 +770,4 @@ function tcPath({ accountIndex, secretType, depositIndex }) {
   return `${TORNADO_CASH_PATH}/${accountIndex}'/${_secretType}'/${depositIndex}'`;
 }
 
-export { DepositStrategy, E_ADDRESS, SecretManager, TornadoCashConfigs, TornadoCashProtocol, createTCBroadcaster, createTCPlugin };
+export { DepositStrategy, E_ADDRESS, SecretManager, TornadoCashConfigs, TornadoCashProtocol, TornadoPaymasterConfigs, createTCBroadcaster, createTCPlugin };