fix: tornadocash subgraph issues on alt chains

mustache/templates/echoer/contracts.js

@@ -6,10 +6,10 @@ const contracts = [
     address: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4',
   },
   {
-    prod: 17626717,
+    prod: 17754564,
     network: 'xdai',
     name: 'Echoer',
-    address: '0xEd2B6bf192cFAb45810FC06c5E44e4Df48Eef47d',
+    address: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4',
   },
   {
     prod: 16257996,
@@ -29,6 +29,24 @@ const contracts = [
     name: 'Echoer',
     address: '0x37e6859804b6499d1e4a86d70a5fdd5de6a0ac65',
   },
+  {
+    prod: 4429813,
+    network: 'avalanche',
+    name: 'Echoer',
+    address: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4',
+  },
+  {
+    prod: 3430605,
+    network: 'arbitrum-one',
+    name: 'Echoer',
+    address: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4',
+  },
+  {
+    prod: 2243694,
+    network: 'optimism',
+    name: 'Echoer',
+    address: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4',
+  },
 ];
 
 module.exports = contracts;

mustache/templates/instance/contracts.js

@@ -1,9 +1,12 @@
 const deployedBlocks = {
+  bsc: 8159290,
+  xdai: 17754561,
+  matic: 16257962,
   goerli: 3781595,
   mainnet: 9116966,
-  matic: 16257962,
+  optimism: 2243689,
-  xdai: 17626717,
+  arbitrum: 3430648,
-  bsc: 8159290,
+  avalanche: 4429818,
 };
 
 const contracts = [
@@ -45,7 +48,31 @@ const contracts = [
     network: 'xdai',
     currency: 'xdai',
     name: 'Instance',
-    address: '0x980C75f9b2A62d1206C2C146aE4aa1a19E4A21C0',
+    address: '0x1E34A77868E19A6647b1f2F47B51ed72dEDE95DD',
+  },
+  {
+    prod: deployedBlocks.xdai,
+    amount: '1000',
+    network: 'xdai',
+    currency: 'xdai',
+    name: 'Instance',
+    address: '0xdf231d99Ff8b6c6CBF4E9B9a945CBAcEF9339178',
+  },
+  {
+    prod: deployedBlocks.xdai,
+    amount: '10000',
+    network: 'xdai',
+    currency: 'xdai',
+    name: 'Instance',
+    address: '0xaf4c0B70B2Ea9FB7487C7CbB37aDa259579fe040',
+  },
+  {
+    prod: deployedBlocks.xdai,
+    amount: '100000',
+    network: 'xdai',
+    currency: 'xdai',
+    name: 'Instance',
+    address: '0xa5C2254e4253490C54cef0a4347fddb8f75A4998',
   },
   {
     prod: deployedBlocks.matic,
@@ -383,6 +410,94 @@ const contracts = [
     name: 'Instance',
     address: '0x0E3A09dDA6B20aFbB34aC7cD4A6881493f3E7bf7',
   },
+  {
+    prod: deployedBlocks.avalanche,
+    amount: '10',
+    network: 'avalanche',
+    currency: 'avax',
+    name: 'Instance',
+    address: '0x330bdFADE01eE9bF63C209Ee33102DD334618e0a',
+  },
+  {
+    prod: deployedBlocks.avalanche,
+    amount: '100',
+    network: 'avalanche',
+    currency: 'avax',
+    name: 'Instance',
+    address: '0x1E34A77868E19A6647b1f2F47B51ed72dEDE95DD',
+  },
+  {
+    prod: deployedBlocks.avalanche,
+    amount: '500',
+    network: 'avalanche',
+    currency: 'avax',
+    name: 'Instance',
+    address: '0xaf8d1839c3c67cf571aa74B5c12398d4901147B3',
+  },
+  {
+    prod: deployedBlocks.arbitrum,
+    amount: '0.1',
+    network: 'arbitrum-one',
+    currency: 'eth',
+    name: 'Instance',
+    address: '0x84443CFd09A48AF6eF360C6976C5392aC5023a1F',
+  },
+  {
+    prod: deployedBlocks.arbitrum,
+    amount: '1',
+    network: 'arbitrum-one',
+    currency: 'eth',
+    name: 'Instance',
+    address: '0xd47438C816c9E7f2E2888E060936a499Af9582b3',
+  },
+  {
+    prod: deployedBlocks.arbitrum,
+    amount: '10',
+    network: 'arbitrum-one',
+    currency: 'eth',
+    name: 'Instance',
+    address: '0x330bdFADE01eE9bF63C209Ee33102DD334618e0a',
+  },
+  {
+    prod: deployedBlocks.arbitrum,
+    amount: '100',
+    network: 'arbitrum-one',
+    currency: 'eth',
+    name: 'Instance',
+    address: '0x1E34A77868E19A6647b1f2F47B51ed72dEDE95DD',
+  },
+  {
+    prod: deployedBlocks.optimism,
+    amount: '0.1',
+    network: 'optimism',
+    currency: 'eth',
+    name: 'Instance',
+    address: '0x84443CFd09A48AF6eF360C6976C5392aC5023a1F',
+  },
+  {
+    prod: deployedBlocks.optimism,
+    amount: '1',
+    network: 'optimism',
+    currency: 'eth',
+    name: 'Instance',
+    address: '0xd47438C816c9E7f2E2888E060936a499Af9582b3',
+  },
+  {
+    prod: deployedBlocks.optimism,
+    amount: '10',
+    network: 'optimism',
+    currency: 'eth',
+    name: 'Instance',
+    address: '0x330bdFADE01eE9bF63C209Ee33102DD334618e0a',
+  },
+  {
+    prod: deployedBlocks.optimism,
+    amount: '100',
+    network: 'optimism',
+    currency: 'eth',
+    name: 'Instance',
+    address: '0x1E34A77868E19A6647b1f2F47B51ed72dEDE95DD',
+  },
 ];
 
 module.exports = contracts;

mustache/templates/instance/create-yaml.js

@@ -39,7 +39,7 @@ module.exports = {
     let reExportContent = '';
 
     Contracts.forEach(({ address, name, network, amount, currency }) => {
-      if (address != null) {
+      if (network === env && address != null) {
         contractsToInstancesContent += `contractsToInstances.set("${address.toLowerCase()}",${space}//${space}${name}-${currency}-${amount}${newLine}${doubleSpace}"${currency}${'-'}${amount}"${newLine});${newLine}`;
       }
       if (network === env && reExportContent === '') {

mustache/templates/proxy/contracts.js

@@ -6,10 +6,10 @@ const contracts = [
     address: '0x0D5550d52428E7e3175bfc9550207e4ad3859b17',
   },
   {
-    prod: 17626717,
+    prod: 17754561,
     name: 'Proxy',
     network: 'xdai',
-    address: '0xa77350E1a72bE5bC7634d359C5011b4E359f4320',
+    address: '0x0D5550d52428E7e3175bfc9550207e4ad3859b17',
   },
   {
     prod: 16257989,
@@ -18,10 +18,10 @@ const contracts = [
     address: '0x0D5550d52428E7e3175bfc9550207e4ad3859b17',
   },
   {
-    prod: 11474713,
+    prod: 14248730,
     name: 'Proxy',
     network: 'mainnet',
-    address: '0x722122dF12D4e14e13Ac3b6895a86e84145b6967',
+    address: '0xd90e2f925DA726b50C4Ed8D0Fb90Ad053324F31b',
   },
   {
     prod: 3781595,
@@ -29,6 +29,24 @@ const contracts = [
     network: 'goerli',
     address: '0x454d870a72e29d5e5697f635128d18077bd04c60',
   },
+  {
+    prod: 4429818,
+    name: 'Proxy',
+    network: 'avalanche',
+    address: '0x0D5550d52428E7e3175bfc9550207e4ad3859b17',
+  },
+  {
+    prod: 3430648,
+    name: 'Proxy',
+    network: 'arbitrum-one',
+    address: '0x0D5550d52428E7e3175bfc9550207e4ad3859b17',
+  },
+  {
+    prod: 2243689,
+    name: 'Proxy',
+    network: 'optimism',
+    address: '0x0D5550d52428E7e3175bfc9550207e4ad3859b17',
+  },
 ];
 
 module.exports = contracts;

package.json

@@ -8,33 +8,48 @@
     "generate-matic": "yarn codegen:tornado-matic && yarn build:tornado-matic",
     "generate-mainnet": "yarn codegen:tornado-mainnet && yarn build:tornado-mainnet",
     "generate-goerli": "yarn codegen:tornado-goerli && yarn build:tornado-goerli",
+    "generate-avalanche": "yarn codegen:tornado-avalanche && yarn build:tornado-avalanche",
+    "generate-arbitrum": "yarn codegen:tornado-arbitrum && yarn build:tornado-arbitrum",
+    "generate-optimism": "yarn codegen:tornado-optimism && yarn build:tornado-optimism",
     "yaml:tornado-bsc": "node ./create-yaml-file create-yaml -e bsc | mustache - mustache/yaml.mustache > subgraphs/tornado-subgraph-bsc.yaml",
     "yaml:tornado-xdai": "node ./create-yaml-file create-yaml -e xdai | mustache - mustache/yaml.mustache > subgraphs/tornado-subgraph-xdai.yaml",
     "yaml:tornado-matic": "node ./create-yaml-file create-yaml -e matic | mustache - mustache/yaml.mustache > subgraphs/tornado-subgraph-matic.yaml",
     "yaml:tornado-mainnet": "node ./create-yaml-file create-yaml -e mainnet | mustache - mustache/yaml.mustache > subgraphs/tornado-subgraph-mainnet.yaml",
     "yaml:tornado-goerli": "node ./create-yaml-file create-yaml -e goerli | mustache - mustache/yaml.mustache > subgraphs/tornado-subgraph-goerli.yaml",
+    "yaml:tornado-avalanche": "node ./create-yaml-file create-yaml -e avalanche | mustache - mustache/yaml.mustache > subgraphs/tornado-subgraph-avalanche.yaml",
+    "yaml:tornado-arbitrum": "node ./create-yaml-file create-yaml -e arbitrum-one | mustache - mustache/yaml.mustache > subgraphs/tornado-subgraph-arbitrum.yaml",
+    "yaml:tornado-optimism": "node ./create-yaml-file create-yaml -e optimism | mustache - mustache/yaml.mustache > subgraphs/tornado-subgraph-optimism.yaml",
     "codegen": "graph codegen",
     "codegen:tornado-bsc": "yarn yaml:tornado-bsc && yarn codegen -- subgraphs/tornado-subgraph-bsc.yaml",
     "codegen:tornado-xdai": "yarn yaml:tornado-xdai && yarn codegen -- subgraphs/tornado-subgraph-xdai.yaml",
     "codegen:tornado-matic": "yarn yaml:tornado-matic && yarn codegen -- subgraphs/tornado-subgraph-matic.yaml",
     "codegen:tornado-mainnet": "yarn yaml:tornado-mainnet && yarn codegen -- subgraphs/tornado-subgraph-mainnet.yaml",
     "codegen:tornado-goerli": "yarn yaml:tornado-goerli && yarn codegen -- subgraphs/tornado-subgraph-goerli.yaml",
+    "codegen:tornado-avalanche": "yarn yaml:tornado-avalanche && yarn codegen -- subgraphs/tornado-subgraph-avalanche.yaml",
+    "codegen:tornado-arbitrum": "yarn yaml:tornado-arbitrum && yarn codegen -- subgraphs/tornado-subgraph-arbitrum.yaml",
+    "codegen:tornado-optimism": "yarn yaml:tornado-optimism && yarn codegen -- subgraphs/tornado-subgraph-optimism.yaml",
     "build": "graph build",
     "build:tornado-bsc": "graph build subgraphs/tornado-subgraph-bsc.yaml",
     "build:tornado-xdai": "graph build subgraphs/tornado-subgraph-xdai.yaml",
     "build:tornado-matic": "graph build subgraphs/tornado-subgraph-matic.yaml",
     "build:tornado-mainnet": "graph build subgraphs/tornado-subgraph-mainnet.yaml",
     "build:tornado-goerli": "graph build subgraphs/tornado-subgraph-goerli.yaml",
+    "build:tornado-avalanche": "graph build subgraphs/tornado-subgraph-avalanche.yaml",
+    "build:tornado-arbitrum": "graph build subgraphs/tornado-subgraph-arbitrum.yaml",
+    "build:tornado-optimism": "graph build subgraphs/tornado-subgraph-optimism.yaml",
     "deploy": "graph deploy --node https://api.thegraph.com/deploy/ --ipfs https://api.thegraph.com/ipfs/ --access-token $TOKEN",
     "deploy:tornado-bsc": "yarn deploy -- tornadocash/bsc-tornado-subgraph subgraphs/tornado-subgraph-bsc.yaml",
     "deploy:tornado-xdai": "yarn deploy -- tornadocash/xdai-tornado-subgraph subgraphs/tornado-subgraph-xdai.yaml",
     "deploy:tornado-matic": "yarn deploy -- tornadocash/matic-tornado-subgraph subgraphs/tornado-subgraph-matic.yaml",
     "deploy:tornado-mainnet": "yarn deploy -- tornadocash/mainnet-tornado-subgraph subgraphs/tornado-subgraph-mainnet.yaml",
-    "deploy:tornado-goerli": "yarn deploy -- tornadocash/goerli-tornado-subgraph subgraphs/tornado-subgraph-goerli.yaml"
+    "deploy:tornado-goerli": "yarn deploy -- tornadocash/goerli-tornado-subgraph subgraphs/tornado-subgraph-goerli.yaml",
+    "deploy:tornado-avalanche": "yarn deploy -- tornadocash/avalanche-tornado-subgraph subgraphs/tornado-subgraph-avalanche.yaml",
+    "deploy:tornado-arbitrum": "yarn deploy -- tornadocash/arbitrum-tornado-subgraph subgraphs/tornado-subgraph-arbitrum.yaml",
+    "deploy:tornado-optimism": "yarn deploy -- tornadocash/optimism-tornado-subgraph subgraphs/tornado-subgraph-optimism.yaml"
   },
   "dependencies": {
-    "@graphprotocol/graph-cli": "0.20.0",
+    "@graphprotocol/graph-cli": "^0.20.0",
-    "@graphprotocol/graph-ts": "0.20.0"
+    "@graphprotocol/graph-ts": "^0.20.0"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^4.26.1",

schema.graphql

@@ -1,5 +1,6 @@
 type Deposit @entity {
   id: ID!
+  from: Bytes!
   index: BigInt!
   amount: String!
   currency: String!

src/contractsToInstances.ts

@@ -1,32 +1,5 @@
 // this is a read only file generated by manual inputs to file mustache/templates/rates/contracts.js.
 export let contractsToInstances = new Map<string, string>();
-contractsToInstances.set("0x84443cfd09a48af6ef360c6976c5392ac5023a1f", // Instance-bnb-0.1
-  "bnb-0.1"
-);
-contractsToInstances.set("0xd47438c816c9e7f2e2888e060936a499af9582b3", // Instance-bnb-1
-  "bnb-1"
-);
-contractsToInstances.set("0x330bdfade01ee9bf63c209ee33102dd334618e0a", // Instance-bnb-10
-  "bnb-10"
-);
-contractsToInstances.set("0x1e34a77868e19a6647b1f2f47b51ed72dede95dd", // Instance-bnb-100
-  "bnb-100"
-);
-contractsToInstances.set("0x980c75f9b2a62d1206c2c146ae4aa1a19e4a21c0", // Instance-xdai-100
-  "xdai-100"
-);
-contractsToInstances.set("0x1e34a77868e19a6647b1f2f47b51ed72dede95dd", // Instance-matic-100
-  "matic-100"
-);
-contractsToInstances.set("0xdf231d99ff8b6c6cbf4e9b9a945cbacef9339178", // Instance-matic-1000
-  "matic-1000"
-);
-contractsToInstances.set("0xaf4c0b70b2ea9fb7487c7cbb37ada259579fe040", // Instance-matic-10000
-  "matic-10000"
-);
-contractsToInstances.set("0xa5c2254e4253490c54cef0a4347fddb8f75a4998", // Instance-matic-100000
-  "matic-100000"
-);
 contractsToInstances.set("0x12d66f87a04a9e220743712ce6d9bb1b5616b8fc", // Instance-eth-0.1
   "eth-0.1"
 );
@@ -39,9 +12,6 @@ contractsToInstances.set("0x910cbd523d972eb0a6f4cae4618ad62622b39dbf", // Inst
 contractsToInstances.set("0xa160cdab225685da1d56aa342ad8841c3b53f291", // Instance-eth-100
   "eth-100"
 );
-contractsToInstances.set("0x76d85b4c0fc497eecc38902397ac608000a06607", // Instance-dai-100
-  "dai-100"
-);
 contractsToInstances.set("0xd4b88df4d29f5cedd6857912842cff3b20c8cfa3", // Instance-dai-100
   "dai-100"
 );
@@ -87,58 +57,4 @@ contractsToInstances.set("0x610b717796ad172b316836ac95a2ffad065ceab4", // Inst
 contractsToInstances.set("0xbb93e510bbcd0b7beb5a853875f9ec60275cf498", // Instance-wbtc-10
   "wbtc-10"
 );
-contractsToInstances.set("0xcc84179ffd19a1627e79f8648d09e095252bc418", // Instance-dai-1000
-  "dai-1000"
-);
-contractsToInstances.set("0xd5d6f8d9e784d0e26222ad3834500801a68d027d", // Instance-dai-10000
-  "dai-10000"
-);
-contractsToInstances.set("0x407cceeaa7c95d2fe2250bf9f2c105aa7aafb512", // Instance-dai-100000
-  "dai-100000"
-);
-contractsToInstances.set("0x833481186f16cece3f1eeea1a694c42034c3a0db", // Instance-cdai-5000
-  "cdai-5000"
-);
-contractsToInstances.set("0xd8d7de3349ccaa0fde6298fe6d7b7d0d34586193", // Instance-cdai-50000
-  "cdai-50000"
-);
-contractsToInstances.set("0x8281aa6795ade17c8973e1aedca380258bc124f9", // Instance-cdai-500000
-  "cdai-500000"
-);
-contractsToInstances.set("0x57b2b8c82f065de8ef5573f9730fc1449b403c9f", // Instance-cdai-5000000
-  "cdai-5000000"
-);
-contractsToInstances.set("0x05e0b5b40b7b66098c2161a5ee11c5740a3a7c45", // Instance-usdc-100
-  "usdc-100"
-);
-contractsToInstances.set("0x23173fe8b96a4ad8d2e17fb83ea5dcccdca1ae52", // Instance-usdc-1000
-  "usdc-1000"
-);
-contractsToInstances.set("0x538ab61e8a9fc1b2f93b3dd9011d662d89be6fe6", // Instance-usdt-100
-  "usdt-100"
-);
-contractsToInstances.set("0x94be88213a387e992dd87de56950a9aef34b9448", // Instance-usdt-1000
-  "usdt-1000"
-);
-contractsToInstances.set("0x242654336ca2205714071898f67e254eb49acdce", // Instance-wbtc-0.1
-  "wbtc-0.1"
-);
-contractsToInstances.set("0x776198ccf446dfa168347089d7338879273172cf", // Instance-wbtc-1
-  "wbtc-1"
-);
-contractsToInstances.set("0xedc5d01286f99a066559f60a585406f3878a033e", // Instance-wbtc-10
-  "wbtc-10"
-);
-contractsToInstances.set("0x6bf694a291df3fec1f7e69701e3ab6c592435ae7", // Instance-eth-0.1
-  "eth-0.1"
-);
-contractsToInstances.set("0x3aac1cc67c2ec5db4ea850957b967ba153ad6279", // Instance-eth-1
-  "eth-1"
-);
-contractsToInstances.set("0x723b78e67497e85279cb204544566f4dc5d2aca0", // Instance-eth-10
-  "eth-10"
-);
-contractsToInstances.set("0x0e3a09dda6b20afbb34ac7cd4a6881493f3e7bf7", // Instance-eth-100
-  "eth-100"
-);
 // this is a read only file generated by manual inputs to file mustache/templates/rates/contracts.js.

src/mapping-instance.ts

@@ -30,6 +30,7 @@ export function handleDeposit(event: Deposit): void {
   entity.amount = result[1];
   entity.currency = result[0];
 
+  entity.from = event.transaction.from;
   entity.index = event.params.leafIndex;
   entity.blockNumber = event.block.number;
   entity.timestamp = event.block.timestamp;

subgraphs/tornado-subgraph-arbitrum.yaml

@@ -0,0 +1,138 @@
+  specVersion: 0.0.2
+  description: Proxy
+  repository: https://github.com/tornadocash/tornado-subgraph
+  schema:
+    file: ../schema.graphql
+  dataSources:
+  - kind: ethereum/contract
+    name: Echoer
+    network: arbitrum-one
+    source:
+      address: "0xa75BF2815618872f155b7C4B0C81bF990f5245E4"
+      abi: Echoer
+      startBlock: 3430605
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-echo-account.ts
+      entities:
+        - NoteAccount
+      abis:
+        - name: Echoer
+          file: ../abis/Echoer.json
+      eventHandlers:
+        - event: Echo(indexed address,bytes)
+          handler: handleEcho
+  - kind: ethereum/contract
+    name: Instance-0.1-eth
+    network: arbitrum-one
+    source:
+      address: "0x84443CFd09A48AF6eF360C6976C5392aC5023a1F"
+      abi: Instance
+      startBlock: 3430648
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-1-eth
+    network: arbitrum-one
+    source:
+      address: "0xd47438C816c9E7f2E2888E060936a499Af9582b3"
+      abi: Instance
+      startBlock: 3430648
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-10-eth
+    network: arbitrum-one
+    source:
+      address: "0x330bdFADE01eE9bF63C209Ee33102DD334618e0a"
+      abi: Instance
+      startBlock: 3430648
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-100-eth
+    network: arbitrum-one
+    source:
+      address: "0x1E34A77868E19A6647b1f2F47B51ed72dEDE95DD"
+      abi: Instance
+      startBlock: 3430648
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Proxy
+    network: arbitrum-one
+    source:
+      address: "0x0D5550d52428E7e3175bfc9550207e4ad3859b17"
+      abi: Proxy
+      startBlock: 3430648
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-encrypted-note.ts
+      entities:
+        - EncryptedNote
+      abis:
+        - name: Proxy
+          file: ../abis/Proxy.json
+      eventHandlers:
+        - event: EncryptedNote(indexed address,bytes)
+          handler: handleEncryptedNote

subgraphs/tornado-subgraph-avalanche.yaml

@@ -0,0 +1,115 @@
+  specVersion: 0.0.2
+  description: Proxy
+  repository: https://github.com/tornadocash/tornado-subgraph
+  schema:
+    file: ../schema.graphql
+  dataSources:
+  - kind: ethereum/contract
+    name: Echoer
+    network: avalanche
+    source:
+      address: "0xa75BF2815618872f155b7C4B0C81bF990f5245E4"
+      abi: Echoer
+      startBlock: 4429813
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-echo-account.ts
+      entities:
+        - NoteAccount
+      abis:
+        - name: Echoer
+          file: ../abis/Echoer.json
+      eventHandlers:
+        - event: Echo(indexed address,bytes)
+          handler: handleEcho
+  - kind: ethereum/contract
+    name: Instance-10-avax
+    network: avalanche
+    source:
+      address: "0x330bdFADE01eE9bF63C209Ee33102DD334618e0a"
+      abi: Instance
+      startBlock: 4429818
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-100-avax
+    network: avalanche
+    source:
+      address: "0x1E34A77868E19A6647b1f2F47B51ed72dEDE95DD"
+      abi: Instance
+      startBlock: 4429818
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-500-avax
+    network: avalanche
+    source:
+      address: "0xaf8d1839c3c67cf571aa74B5c12398d4901147B3"
+      abi: Instance
+      startBlock: 4429818
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Proxy
+    network: avalanche
+    source:
+      address: "0x0D5550d52428E7e3175bfc9550207e4ad3859b17"
+      abi: Proxy
+      startBlock: 4429818
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-encrypted-note.ts
+      entities:
+        - EncryptedNote
+      abis:
+        - name: Proxy
+          file: ../abis/Proxy.json
+      eventHandlers:
+        - event: EncryptedNote(indexed address,bytes)
+          handler: handleEncryptedNote

subgraphs/tornado-subgraph-mainnet.yaml

@@ -465,9 +465,9 @@
     name: Proxy
     network: mainnet
     source:
-      address: "0x722122dF12D4e14e13Ac3b6895a86e84145b6967"
+      address: "0xd90e2f925DA726b50C4Ed8D0Fb90Ad053324F31b"
       abi: Proxy
-      startBlock: 11474713
+      startBlock: 14248730
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.4

subgraphs/tornado-subgraph-optimism.yaml

@@ -0,0 +1,138 @@
+  specVersion: 0.0.2
+  description: Proxy
+  repository: https://github.com/tornadocash/tornado-subgraph
+  schema:
+    file: ../schema.graphql
+  dataSources:
+  - kind: ethereum/contract
+    name: Echoer
+    network: optimism
+    source:
+      address: "0xa75BF2815618872f155b7C4B0C81bF990f5245E4"
+      abi: Echoer
+      startBlock: 2243694
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-echo-account.ts
+      entities:
+        - NoteAccount
+      abis:
+        - name: Echoer
+          file: ../abis/Echoer.json
+      eventHandlers:
+        - event: Echo(indexed address,bytes)
+          handler: handleEcho
+  - kind: ethereum/contract
+    name: Instance-0.1-eth
+    network: optimism
+    source:
+      address: "0x84443CFd09A48AF6eF360C6976C5392aC5023a1F"
+      abi: Instance
+      startBlock: 2243689
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-1-eth
+    network: optimism
+    source:
+      address: "0xd47438C816c9E7f2E2888E060936a499Af9582b3"
+      abi: Instance
+      startBlock: 2243689
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-10-eth
+    network: optimism
+    source:
+      address: "0x330bdFADE01eE9bF63C209Ee33102DD334618e0a"
+      abi: Instance
+      startBlock: 2243689
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-100-eth
+    network: optimism
+    source:
+      address: "0x1E34A77868E19A6647b1f2F47B51ed72dEDE95DD"
+      abi: Instance
+      startBlock: 2243689
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Proxy
+    network: optimism
+    source:
+      address: "0x0D5550d52428E7e3175bfc9550207e4ad3859b17"
+      abi: Proxy
+      startBlock: 2243689
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-encrypted-note.ts
+      entities:
+        - EncryptedNote
+      abis:
+        - name: Proxy
+          file: ../abis/Proxy.json
+      eventHandlers:
+        - event: EncryptedNote(indexed address,bytes)
+          handler: handleEncryptedNote

subgraphs/tornado-subgraph-xdai.yaml

@@ -8,9 +8,9 @@
     name: Echoer
     network: xdai
     source:
-      address: "0xEd2B6bf192cFAb45810FC06c5E44e4Df48Eef47d"
+      address: "0xa75BF2815618872f155b7C4B0C81bF990f5245E4"
       abi: Echoer
-      startBlock: 17626717
+      startBlock: 17754564
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.4
@@ -28,9 +28,78 @@
     name: Instance-100-xdai
     network: xdai
     source:
-      address: "0x980C75f9b2A62d1206C2C146aE4aa1a19E4A21C0"
+      address: "0x1E34A77868E19A6647b1f2F47B51ed72dEDE95DD"
       abi: Instance
-      startBlock: 17626717
+      startBlock: 17754561
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-1000-xdai
+    network: xdai
+    source:
+      address: "0xdf231d99Ff8b6c6CBF4E9B9a945CBAcEF9339178"
+      abi: Instance
+      startBlock: 17754561
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-10000-xdai
+    network: xdai
+    source:
+      address: "0xaf4c0B70B2Ea9FB7487C7CbB37aDa259579fe040"
+      abi: Instance
+      startBlock: 17754561
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      file: ../src/mapping-instance.ts
+      entities:
+        - Deposit
+        - Withdrawal
+      abis:
+        - name: Instance
+          file: ../abis/Instance.json
+      eventHandlers:
+        - event: Deposit(indexed bytes32,uint32,uint256)
+          handler: handleDeposit
+        - event: Withdrawal(address,bytes32,indexed address,uint256)
+          handler: handleWithdrawal
+  - kind: ethereum/contract
+    name: Instance-100000-xdai
+    network: xdai
+    source:
+      address: "0xa5C2254e4253490C54cef0a4347fddb8f75A4998"
+      abi: Instance
+      startBlock: 17754561
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.4
@@ -51,9 +120,9 @@
     name: Proxy
     network: xdai
     source:
-      address: "0xa77350E1a72bE5bC7634d359C5011b4E359f4320"
+      address: "0x0D5550d52428E7e3175bfc9550207e4ad3859b17"
       abi: Proxy
-      startBlock: 17626717
+      startBlock: 17754561
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.4