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

package/dist/index.d.ts

@@ -289,6 +289,15 @@ interface ISyncService {
      * with the same external-then-chain strategy as {@link getPoolEvents}.
      */
     getRelayerRegistryEvents(params: IGetEventsParams): Promise<IGetRelayerRegistryEventsResult>;
+    /**
+     * Resolves a pool's scan-start block. Uses the external provider's first
+     * covered block when available (an O(1) lookup), else falls back to the
+     * on-chain deployment-block binary search.
+     */
+    getPoolDeploymentBlock(params: {
+        chainId: bigint;
+        address: Address;
+    }): Promise<bigint>;
 }
 
 type SpecificAssetBalanceFn<isAsync extends boolean = false> = <const Adresses extends Address | Address[] = Address[], ReturnType = Adresses extends unknown[] ? Map<Address, bigint> : bigint>(assetAddress?: Adresses) => isAsync extends true ? Promise<ReturnType> : ReturnType;
@@ -618,7 +627,28 @@ declare const TornadoPaymasterConfigs: {
             readonly '0x6921fd1a97441dd603a997ed6ddf388658daf754': "0xbF0a7969dacF8337716d0F283df0574dF56b0479";
         };
     };
-    readonly 1: never;
+    readonly 1: {
+        readonly bundlerUrl: "https://public.pimlico.io/v2/1/rpc";
+        readonly entryPointAddress: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108";
+        readonly paymasterAddress: "0xe06CB96C57D2442f8F60F5017354BC08F7e91308";
+        readonly poolsAccountsMap: {
+            readonly '0x12d66f87a04a9e220743712ce6d9bb1b5616b8fc': "0x4a3F73a23563bB467Aa034d0fAB61e7BcDf26161";
+            readonly '0x47ce0c6ed5b0ce3d3a51fdb1c52dc66a7c3c2936': "0xC086b50Dd859Bb15D553327178DEdbC347B5b905";
+            readonly '0x910cbd523d972eb0a6f4cae4618ad62622b39dbf': "0x08d1103bff53CBdC9DB1e81B79475CEad2e35870";
+            readonly '0xa160cdab225685da1d56aa342ad8841c3b53f291': "0x3aF851f9BeEeE6E9fa06022f34Dc4C453D265aE5";
+            readonly '0xd4b88df4d29f5cedd6857912842cff3b20c8cfa3': "0xe6be288aeCa9FAB56D9792686Ec571Fb1AF37F55";
+            readonly '0xfd8610d20aa15b7b2e3be39b396a1bc3516c7144': "0xf6f35246EbDA061bB17b6C7ED7B7049065eD61f3";
+            readonly '0x07687e702b410Fa43f4cB4Af7FA097918ffD2730': "0x36A5b4bCE77700B9C52cFEE53Fc8cA3B58eb7E35";
+            readonly '0x23773e65ed146a459791799d01336db287f25334': "0x83Ff713F0939409E1c6023bc8aaB3E49eD968c8D";
+            readonly '0x4736dcf1b7a3d580672cce6e7c65cd5cc9cfba9d': "0xB1C7e712AF153073979AdC5ef8B1Cc5A7b0cf031";
+            readonly '0xd96f2b1c14db8458374d9aca76e26c3d18364307': "0x44336242f9766b4c751F6958499C5cc18325e25B";
+            readonly '0x169ad27a470d064dede56a2d3ff727986b15d52b': "0xF006862cCa4829D3f3ddD52d93fC49C03D380a5F";
+            readonly '0x0836222F2B2B24A3F36f98668Ed8F0B38D1a872f': "0x5DF524b6c9303eD94A7767c2eD787ee223c9bC54";
+            readonly '0x178169b423a011fff22b9e3f3abea13414ddd0f1': "0x0fdF2f686B600523F9752aEca0abb6AD9603A22C";
+            readonly '0x610b717796ad172b316836ac95a2ffad065ceab4': "0xec3Cca694EEe55808B3f5EFEDd0bC03E52e47834";
+            readonly '0xbb93e510bbcd0b7beb5a853875f9ec60275cf498': "0xC2C427E6ADF66F412921C17958CeDD9C7710F521";
+        };
+    };
 };
 declare const TornadoCashConfigs: {
     readonly 1: {

package/dist/index.js

@@ -356,7 +356,43 @@ var TornadoPaymasterConfigs = {
       "0x6921fd1a97441dd603a997ed6ddf388658daf754": "0xbF0a7969dacF8337716d0F283df0574dF56b0479"
     }
   },
-  1: {}
+  1: {
+    bundlerUrl: "https://public.pimlico.io/v2/1/rpc",
+    entryPointAddress: "0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108",
+    paymasterAddress: "0xe06CB96C57D2442f8F60F5017354BC08F7e91308",
+    poolsAccountsMap: {
+      // ETH 0.1
+      "0x12d66f87a04a9e220743712ce6d9bb1b5616b8fc": "0x4a3F73a23563bB467Aa034d0fAB61e7BcDf26161",
+      // ETH 1
+      "0x47ce0c6ed5b0ce3d3a51fdb1c52dc66a7c3c2936": "0xC086b50Dd859Bb15D553327178DEdbC347B5b905",
+      // ETH 10
+      "0x910cbd523d972eb0a6f4cae4618ad62622b39dbf": "0x08d1103bff53CBdC9DB1e81B79475CEad2e35870",
+      // ETH 100
+      "0xa160cdab225685da1d56aa342ad8841c3b53f291": "0x3aF851f9BeEeE6E9fa06022f34Dc4C453D265aE5",
+      // DAI 100
+      "0xd4b88df4d29f5cedd6857912842cff3b20c8cfa3": "0xe6be288aeCa9FAB56D9792686Ec571Fb1AF37F55",
+      // DAI 1_000
+      "0xfd8610d20aa15b7b2e3be39b396a1bc3516c7144": "0xf6f35246EbDA061bB17b6C7ED7B7049065eD61f3",
+      // DAI 10_000
+      "0x07687e702b410Fa43f4cB4Af7FA097918ffD2730": "0x36A5b4bCE77700B9C52cFEE53Fc8cA3B58eb7E35",
+      // DAI 100_000
+      "0x23773e65ed146a459791799d01336db287f25334": "0x83Ff713F0939409E1c6023bc8aaB3E49eD968c8D",
+      // USDC 100
+      "0x4736dcf1b7a3d580672cce6e7c65cd5cc9cfba9d": "0xB1C7e712AF153073979AdC5ef8B1Cc5A7b0cf031",
+      // USDC 1_000
+      "0xd96f2b1c14db8458374d9aca76e26c3d18364307": "0x44336242f9766b4c751F6958499C5cc18325e25B",
+      // USDT 100
+      "0x169ad27a470d064dede56a2d3ff727986b15d52b": "0xF006862cCa4829D3f3ddD52d93fC49C03D380a5F",
+      // USDT 1_000
+      "0x0836222F2B2B24A3F36f98668Ed8F0B38D1a872f": "0x5DF524b6c9303eD94A7767c2eD787ee223c9bC54",
+      // WBTC 0.1
+      "0x178169b423a011fff22b9e3f3abea13414ddd0f1": "0x0fdF2f686B600523F9752aEca0abb6AD9603A22C",
+      // WBTC 1
+      "0x610b717796ad172b316836ac95a2ffad065ceab4": "0xec3Cca694EEe55808B3f5EFEDd0bC03E52e47834",
+      // WBTC 10
+      "0xbb93e510bbcd0b7beb5a853875f9ec60275cf498": "0xC2C427E6ADF66F412921C17958CeDD9C7710F521"
+    }
+  }
 };
 var TornadoCashConfigs = {
   1: {
@@ -440,6 +476,7 @@ var TornadoCashProtocol = class {
           }
           return events;
         },
+        firstCoveredBlock: (params) => externalSyncProvider.firstCoveredBlock(params),
         lastCoveredBlock: (params) => externalSyncProvider.lastCoveredBlock(params)
       };
       await Promise.race([

package/dist/merkle-tree.browser.js

@@ -1,5 +1,5 @@
 // src/utils/merkle-tree/merkle-tree.util.browser.ts
-import { generateMimcMerkleProof, createMimcMerkleTreeParallel } from "mimc-tree";
+import { generateMimcMerkleProof, createMimcMerkleTreeParallel } from "@kohaku-eth/mimc-tree";
 var buildTree = async (leaves) => {
   return createMimcMerkleTreeParallel(leaves, { workerUrl: "./merkle-tree-worker.browser.js" });
 };

package/dist/merkle-tree.node.js

@@ -1,5 +1,5 @@
 // src/utils/merkle-tree/merkle-tree.util.node.ts
-import { generateMimcMerkleProof, createMimcMerkleTreeNodejsParallel } from "mimc-tree";
+import { generateMimcMerkleProof, createMimcMerkleTreeNodejsParallel } from "@kohaku-eth/mimc-tree";
 var buildTree = async (leaves) => {
   return createMimcMerkleTreeNodejsParallel(leaves);
 };

package/dist/state-manager.worker.js

@@ -18009,6 +18009,24 @@ var SyncService = class {
       toBlock: head
     };
   }
+  async getPoolDeploymentBlock({
+    chainId,
+    address
+  }) {
+    const provider = this.externalSyncProvider;
+    if (provider) {
+      try {
+        return BigInt(
+          await provider.firstCoveredBlock({
+            chainId: toHex(chainId),
+            address: toHex(address, { size: 20 })
+          })
+        );
+      } catch {
+      }
+    }
+    return this.dataService.getContractDeploymentBlock(address);
+  }
   /**
    * Decides whether to use the external provider and, if so, streams its raw
    * events for `[fromBlock, coverage]`. Event-agnostic: callers parse the raw
@@ -18028,11 +18046,12 @@ var SyncService = class {
     }
     const chainId = toHex(rawChainId);
     const hexAddress = toHex(address, { size: 20 });
-    const rawCoverage = await provider.lastCoveredBlock({ chainId, address: hexAddress });
-    if (!rawCoverage) {
+    let coverage;
+    try {
+      coverage = BigInt(await provider.lastCoveredBlock({ chainId, address: hexAddress }));
+    } catch {
       return null;
     }
-    const coverage = BigInt(rawCoverage);
     if (coverage <= fromBlock) {
       return null;
     }
@@ -21290,10 +21309,11 @@ var storeFactory = ({
 var syncPoolsThunk = createAsyncThunk(
   "sync/pools",
   async ({
-    dataService
+    dataService,
+    syncService
   }, { dispatch, getState }) => {
     const state = getState();
-    const { instanceRegistry: { address: instanceRegistryAddress } } = instanceRegistryInfoSelector(state);
+    const { chainId, instanceRegistry: { address: instanceRegistryAddress } } = instanceRegistryInfoSelector(state);
     const existingPools = poolsSelector(state);
     const poolsAddressses = await dataService.getAllPoolsAddresses(instanceRegistryAddress);
     const unsyncedPools = poolsAddressses.filter((address) => !existingPools.has(address));
@@ -21301,7 +21321,7 @@ var syncPoolsThunk = createAsyncThunk(
       unsyncedPools.map(async (poolAddress) => {
         const [config, registeredBlock] = await Promise.all([
           dataService.getPoolConfig(instanceRegistryAddress, poolAddress),
-          dataService.getContractDeploymentBlock(poolAddress)
+          syncService.getPoolDeploymentBlock({ chainId, address: poolAddress })
         ]);
         return { config, registeredBlock };
       })
@@ -22010,7 +22030,8 @@ var syncThunk = createAsyncThunk(
   "sync/syncEverything",
   async ({ dataService, syncService, secretManager, verify = false, ...params }, { dispatch }) => {
     unwrapResult(await dispatch(syncPoolsThunk({
-      dataService
+      dataService,
+      syncService
     })));
     unwrapResult(await dispatch(syncRelayersThunk({ dataService, syncService })));
     const syncEventsResult = await dispatch(syncEventsThunk({ syncService }));

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

@@ -17581,6 +17581,24 @@ var SyncService = class {
       toBlock: head
     };
   }
+  async getPoolDeploymentBlock({
+    chainId,
+    address
+  }) {
+    const provider = this.externalSyncProvider;
+    if (provider) {
+      try {
+        return BigInt(
+          await provider.firstCoveredBlock({
+            chainId: toHex(chainId),
+            address: toHex(address, { size: 20 })
+          })
+        );
+      } catch {
+      }
+    }
+    return this.dataService.getContractDeploymentBlock(address);
+  }
   /**
    * Decides whether to use the external provider and, if so, streams its raw
    * events for `[fromBlock, coverage]`. Event-agnostic: callers parse the raw
@@ -17600,11 +17618,12 @@ var SyncService = class {
     }
     const chainId = toHex(rawChainId);
     const hexAddress = toHex(address, { size: 20 });
-    const rawCoverage = await provider.lastCoveredBlock({ chainId, address: hexAddress });
-    if (!rawCoverage) {
+    let coverage;
+    try {
+      coverage = BigInt(await provider.lastCoveredBlock({ chainId, address: hexAddress }));
+    } catch {
       return null;
     }
-    const coverage = BigInt(rawCoverage);
     if (coverage <= fromBlock) {
       return null;
     }
@@ -20868,10 +20887,11 @@ var storeFactory = ({
 var syncPoolsThunk = createAsyncThunk(
   "sync/pools",
   async ({
-    dataService
+    dataService,
+    syncService
   }, { dispatch, getState }) => {
     const state = getState();
-    const { instanceRegistry: { address: instanceRegistryAddress } } = instanceRegistryInfoSelector(state);
+    const { chainId, instanceRegistry: { address: instanceRegistryAddress } } = instanceRegistryInfoSelector(state);
     const existingPools = poolsSelector(state);
     const poolsAddressses = await dataService.getAllPoolsAddresses(instanceRegistryAddress);
     const unsyncedPools = poolsAddressses.filter((address) => !existingPools.has(address));
@@ -20879,7 +20899,7 @@ var syncPoolsThunk = createAsyncThunk(
       unsyncedPools.map(async (poolAddress) => {
         const [config, registeredBlock] = await Promise.all([
           dataService.getPoolConfig(instanceRegistryAddress, poolAddress),
-          dataService.getContractDeploymentBlock(poolAddress)
+          syncService.getPoolDeploymentBlock({ chainId, address: poolAddress })
         ]);
         return { config, registeredBlock };
       })
@@ -21236,7 +21256,8 @@ var syncThunk = createAsyncThunk(
   "sync/syncEverything",
   async ({ dataService, syncService, secretManager, verify = false, ...params }, { dispatch }) => {
     unwrapResult(await dispatch(syncPoolsThunk({
-      dataService
+      dataService,
+      syncService
     })));
     unwrapResult(await dispatch(syncRelayersThunk({ dataService, syncService })));
     const syncEventsResult = await dispatch(syncEventsThunk({ syncService }));

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

@@ -64,7 +64,10 @@ type ExternalSyncClient = {
         fromBlock: Hex;
         toBlock: Hex;
     }): Promise<ExternalRawEvent[]>;
-    lastCoveredBlock(params: ExternalSyncPoolId): Promise<Hex | null>;
+    /** @throws if the provider has no data for the pool. */
+    firstCoveredBlock(params: ExternalSyncPoolId): Promise<Hex>;
+    /** @throws if the provider has no data for the pool. */
+    lastCoveredBlock(params: ExternalSyncPoolId): Promise<Hex>;
 };
 
 interface IRelayerStatusResponse {

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

@@ -65,7 +65,10 @@ type ExternalSyncClient = {
         fromBlock: Hex;
         toBlock: Hex;
     }): Promise<ExternalRawEvent[]>;
-    lastCoveredBlock(params: ExternalSyncPoolId): Promise<Hex | null>;
+    /** @throws if the provider has no data for the pool. */
+    firstCoveredBlock(params: ExternalSyncPoolId): Promise<Hex>;
+    /** @throws if the provider has no data for the pool. */
+    lastCoveredBlock(params: ExternalSyncPoolId): Promise<Hex>;
 };
 
 interface IRelayerStatusResponse {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kohaku-eth/tornado-cash",
-  "version": "0.0.2-alpha.13",
+  "version": "0.0.2-alpha.15",
   "description": "Tornado Cash Shielded Pool Kohaku Plugin",
   "type": "module",
   "private": false,
@@ -74,8 +74,8 @@
     "micro-zk-proofs": "0.3.1",
     "ox": "^0.12.0",
     "viem": "^2.51.3",
+    "@kohaku-eth/mimc-tree": "0.0.3",
     "@kohaku-eth/provider": "0.1.0-alpha.8",
-    "mimc-tree": "0.1.0",
     "@kohaku-eth/plugins": "0.0.1-alpha.11"
   },
   "devDependencies": {