From 30f2b64af0286ef43067272f9ee813b8a2843524 Mon Sep 17 00:00:00 2001
From: Danil Kovtonyuk <danx.kov@gmail.com>
Date: Mon, 28 Jun 2021 23:14:45 +0300
Subject: [PATCH] fix: polygon contracts

---
 mustache/templates/echoer/contracts.js   |   4 +-
 mustache/templates/instance/contracts.js |  30 ++-
 mustache/templates/proxy/contracts.js    |   4 +-
 src/contractsToInstances.ts              | 224 ++++++++++-------------
 subgraphs/tornado-subgraph-matic.yaml    |  83 ++++++++-
 5 files changed, 202 insertions(+), 143 deletions(-)

diff --git a/mustache/templates/echoer/contracts.js b/mustache/templates/echoer/contracts.js
index 621c082..0f14d68 100644
--- a/mustache/templates/echoer/contracts.js
+++ b/mustache/templates/echoer/contracts.js
@@ -6,10 +6,10 @@ const contracts = [
     address: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4',
   },
   {
-    prod: 15586935,
+    prod: 16257996,
     network: 'matic',
     name: 'Echoer',
-    address: '0x88Fb545DC03438b9FFb958361b7F3CfA6ce1B9c5',
+    address: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4',
   },
   {
     prod: 11842486,
diff --git a/mustache/templates/instance/contracts.js b/mustache/templates/instance/contracts.js
index abea3ef..c1cde7f 100644
--- a/mustache/templates/instance/contracts.js
+++ b/mustache/templates/instance/contracts.js
@@ -1,7 +1,7 @@
 const deployedBlocks = {
   goerli: 3781595,
   mainnet: 9116966,
-  matic: 15586940,
+  matic: 16257962,
   bsc: 8159290,
 };
 
@@ -40,11 +40,35 @@ const contracts = [
   },
   {
     prod: deployedBlocks.matic,
-    amount: '0.1',
+    amount: '100',
     network: 'matic',
     currency: 'matic',
     name: 'Instance',
-    address: '0x992A81FA34aa6ecD9520F39f858abc51fee6994a',
+    address: '0x1E34A77868E19A6647b1f2F47B51ed72dEDE95DD',
+  },
+  {
+    prod: deployedBlocks.matic,
+    amount: '1000',
+    network: 'matic',
+    currency: 'matic',
+    name: 'Instance',
+    address: '0xdf231d99Ff8b6c6CBF4E9B9a945CBAcEF9339178',
+  },
+  {
+    prod: deployedBlocks.matic,
+    amount: '10000',
+    network: 'matic',
+    currency: 'matic',
+    name: 'Instance',
+    address: '0xaf4c0B70B2Ea9FB7487C7CbB37aDa259579fe040',
+  },
+  {
+    prod: deployedBlocks.matic,
+    amount: '100000',
+    network: 'matic',
+    currency: 'matic',
+    name: 'Instance',
+    address: '0xa5C2254e4253490C54cef0a4347fddb8f75A4998',
   },
   {
     prod: deployedBlocks.mainnet,
diff --git a/mustache/templates/proxy/contracts.js b/mustache/templates/proxy/contracts.js
index 7cbac13..f692376 100644
--- a/mustache/templates/proxy/contracts.js
+++ b/mustache/templates/proxy/contracts.js
@@ -6,10 +6,10 @@ const contracts = [
     address: '0x0D5550d52428E7e3175bfc9550207e4ad3859b17',
   },
   {
-    prod: 15586930,
+    prod: 16257989,
     name: 'Proxy',
     network: 'matic',
-    address: '0xDC16d16341A62c60E7C9889F9d1FcE4cde57a90F',
+    address: '0x0D5550d52428E7e3175bfc9550207e4ad3859b17',
   },
   {
     prod: 11474713,
diff --git a/src/contractsToInstances.ts b/src/contractsToInstances.ts
index 9395f53..f3024a3 100644
--- a/src/contractsToInstances.ts
+++ b/src/contractsToInstances.ts
@@ -1,175 +1,141 @@
 // 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("0x84443cfd09a48af6ef360c6976c5392ac5023a1f", // Instance-bnb-0.1
+  "bnb-0.1"
 );
-contractsToInstances.set(
-  '0xd47438c816c9e7f2e2888e060936a499af9582b3', // Instance-bnb-1
-  'bnb-1',
+contractsToInstances.set("0xd47438c816c9e7f2e2888e060936a499af9582b3", // Instance-bnb-1
+  "bnb-1"
 );
-contractsToInstances.set(
-  '0x330bdfade01ee9bf63c209ee33102dd334618e0a', // Instance-bnb-10
-  'bnb-10',
+contractsToInstances.set("0x330bdfade01ee9bf63c209ee33102dd334618e0a", // Instance-bnb-10
+  "bnb-10"
 );
-contractsToInstances.set(
-  '0x1e34a77868e19a6647b1f2f47b51ed72dede95dd', // Instance-bnb-100
-  'bnb-100',
+contractsToInstances.set("0x1e34a77868e19a6647b1f2f47b51ed72dede95dd", // Instance-bnb-100
+  "bnb-100"
 );
-contractsToInstances.set(
-  '0x992a81fa34aa6ecd9520f39f858abc51fee6994a', // Instance-matic-0.1
-  'matic-0.1',
+contractsToInstances.set("0x1e34a77868e19a6647b1f2f47b51ed72dede95dd", // Instance-matic-100
+  "matic-100"
 );
-contractsToInstances.set(
-  '0x12d66f87a04a9e220743712ce6d9bb1b5616b8fc', // Instance-eth-0.1
-  'eth-0.1',
+contractsToInstances.set("0xdf231d99ff8b6c6cbf4e9b9a945cbacef9339178", // Instance-matic-1000
+  "matic-1000"
 );
-contractsToInstances.set(
-  '0x47ce0c6ed5b0ce3d3a51fdb1c52dc66a7c3c2936', // Instance-eth-1
-  'eth-1',
+contractsToInstances.set("0xaf4c0b70b2ea9fb7487c7cbb37ada259579fe040", // Instance-matic-10000
+  "matic-10000"
 );
-contractsToInstances.set(
-  '0x910cbd523d972eb0a6f4cae4618ad62622b39dbf', // Instance-eth-10
-  'eth-10',
+contractsToInstances.set("0xa5c2254e4253490c54cef0a4347fddb8f75a4998", // Instance-matic-100000
+  "matic-100000"
 );
-contractsToInstances.set(
-  '0xa160cdab225685da1d56aa342ad8841c3b53f291', // Instance-eth-100
-  'eth-100',
+contractsToInstances.set("0x12d66f87a04a9e220743712ce6d9bb1b5616b8fc", // Instance-eth-0.1
+  "eth-0.1"
 );
-contractsToInstances.set(
-  '0x76d85b4c0fc497eecc38902397ac608000a06607', // Instance-dai-100
-  'dai-100',
+contractsToInstances.set("0x47ce0c6ed5b0ce3d3a51fdb1c52dc66a7c3c2936", // Instance-eth-1
+  "eth-1"
 );
-contractsToInstances.set(
-  '0xd4b88df4d29f5cedd6857912842cff3b20c8cfa3', // Instance-dai-100
-  'dai-100',
+contractsToInstances.set("0x910cbd523d972eb0a6f4cae4618ad62622b39dbf", // Instance-eth-10
+  "eth-10"
 );
-contractsToInstances.set(
-  '0xfd8610d20aa15b7b2e3be39b396a1bc3516c7144', // Instance-dai-1000
-  'dai-1000',
+contractsToInstances.set("0xa160cdab225685da1d56aa342ad8841c3b53f291", // Instance-eth-100
+  "eth-100"
 );
-contractsToInstances.set(
-  '0x07687e702b410fa43f4cb4af7fa097918ffd2730', // Instance-dai-10000
-  'dai-10000',
+contractsToInstances.set("0x76d85b4c0fc497eecc38902397ac608000a06607", // Instance-dai-100
+  "dai-100"
 );
-contractsToInstances.set(
-  '0x23773e65ed146a459791799d01336db287f25334', // Instance-dai-100000
-  'dai-100000',
+contractsToInstances.set("0xd4b88df4d29f5cedd6857912842cff3b20c8cfa3", // Instance-dai-100
+  "dai-100"
 );
-contractsToInstances.set(
-  '0x22aaa7720ddd5388a3c0a3333430953c68f1849b', // Instance-cdai-5000
-  'cdai-5000',
+contractsToInstances.set("0xfd8610d20aa15b7b2e3be39b396a1bc3516c7144", // Instance-dai-1000
+  "dai-1000"
 );
-contractsToInstances.set(
-  '0x03893a7c7463ae47d46bc7f091665f1893656003', // Instance-cdai-50000
-  'cdai-50000',
+contractsToInstances.set("0x07687e702b410fa43f4cb4af7fa097918ffd2730", // Instance-dai-10000
+  "dai-10000"
 );
-contractsToInstances.set(
-  '0x2717c5e28cf931547b621a5dddb772ab6a35b701', // Instance-cdai-500000
-  'cdai-500000',
+contractsToInstances.set("0x23773e65ed146a459791799d01336db287f25334", // Instance-dai-100000
+  "dai-100000"
 );
-contractsToInstances.set(
-  '0xd21be7248e0197ee08e0c20d4a96debdac3d20af', // Instance-cdai-5000000
-  'cdai-5000000',
+contractsToInstances.set("0x22aaa7720ddd5388a3c0a3333430953c68f1849b", // Instance-cdai-5000
+  "cdai-5000"
 );
-contractsToInstances.set(
-  '0xd96f2b1c14db8458374d9aca76e26c3d18364307', // Instance-usdc-100
-  'usdc-100',
+contractsToInstances.set("0x03893a7c7463ae47d46bc7f091665f1893656003", // Instance-cdai-50000
+  "cdai-50000"
 );
-contractsToInstances.set(
-  '0x4736dcf1b7a3d580672cce6e7c65cd5cc9cfba9d', // Instance-usdc-1000
-  'usdc-1000',
+contractsToInstances.set("0x2717c5e28cf931547b621a5dddb772ab6a35b701", // Instance-cdai-500000
+  "cdai-500000"
 );
-contractsToInstances.set(
-  '0x169ad27a470d064dede56a2d3ff727986b15d52b', // Instance-usdt-100
-  'usdt-100',
+contractsToInstances.set("0xd21be7248e0197ee08e0c20d4a96debdac3d20af", // Instance-cdai-5000000
+  "cdai-5000000"
 );
-contractsToInstances.set(
-  '0x0836222f2b2b24a3f36f98668ed8f0b38d1a872f', // Instance-usdt-1000
-  'usdt-1000',
+contractsToInstances.set("0xd96f2b1c14db8458374d9aca76e26c3d18364307", // Instance-usdc-100
+  "usdc-100"
 );
-contractsToInstances.set(
-  '0x178169b423a011fff22b9e3f3abea13414ddd0f1', // Instance-wbtc-0.1
-  'wbtc-0.1',
+contractsToInstances.set("0x4736dcf1b7a3d580672cce6e7c65cd5cc9cfba9d", // Instance-usdc-1000
+  "usdc-1000"
 );
-contractsToInstances.set(
-  '0x610b717796ad172b316836ac95a2ffad065ceab4', // Instance-wbtc-1
-  'wbtc-1',
+contractsToInstances.set("0x169ad27a470d064dede56a2d3ff727986b15d52b", // Instance-usdt-100
+  "usdt-100"
 );
-contractsToInstances.set(
-  '0xbb93e510bbcd0b7beb5a853875f9ec60275cf498', // Instance-wbtc-10
-  'wbtc-10',
+contractsToInstances.set("0x0836222f2b2b24a3f36f98668ed8f0b38d1a872f", // Instance-usdt-1000
+  "usdt-1000"
 );
-contractsToInstances.set(
-  '0xcc84179ffd19a1627e79f8648d09e095252bc418', // Instance-dai-1000
-  'dai-1000',
+contractsToInstances.set("0x178169b423a011fff22b9e3f3abea13414ddd0f1", // Instance-wbtc-0.1
+  "wbtc-0.1"
 );
-contractsToInstances.set(
-  '0xd5d6f8d9e784d0e26222ad3834500801a68d027d', // Instance-dai-10000
-  'dai-10000',
+contractsToInstances.set("0x610b717796ad172b316836ac95a2ffad065ceab4", // Instance-wbtc-1
+  "wbtc-1"
 );
-contractsToInstances.set(
-  '0x407cceeaa7c95d2fe2250bf9f2c105aa7aafb512', // Instance-dai-100000
-  'dai-100000',
+contractsToInstances.set("0xbb93e510bbcd0b7beb5a853875f9ec60275cf498", // Instance-wbtc-10
+  "wbtc-10"
 );
-contractsToInstances.set(
-  '0x833481186f16cece3f1eeea1a694c42034c3a0db', // Instance-cdai-5000
-  'cdai-5000',
+contractsToInstances.set("0xcc84179ffd19a1627e79f8648d09e095252bc418", // Instance-dai-1000
+  "dai-1000"
 );
-contractsToInstances.set(
-  '0xd8d7de3349ccaa0fde6298fe6d7b7d0d34586193', // Instance-cdai-50000
-  'cdai-50000',
+contractsToInstances.set("0xd5d6f8d9e784d0e26222ad3834500801a68d027d", // Instance-dai-10000
+  "dai-10000"
 );
-contractsToInstances.set(
-  '0x8281aa6795ade17c8973e1aedca380258bc124f9', // Instance-cdai-500000
-  'cdai-500000',
+contractsToInstances.set("0x407cceeaa7c95d2fe2250bf9f2c105aa7aafb512", // Instance-dai-100000
+  "dai-100000"
 );
-contractsToInstances.set(
-  '0x57b2b8c82f065de8ef5573f9730fc1449b403c9f', // Instance-cdai-5000000
-  'cdai-5000000',
+contractsToInstances.set("0x833481186f16cece3f1eeea1a694c42034c3a0db", // Instance-cdai-5000
+  "cdai-5000"
 );
-contractsToInstances.set(
-  '0x05e0b5b40b7b66098c2161a5ee11c5740a3a7c45', // Instance-usdc-100
-  'usdc-100',
+contractsToInstances.set("0xd8d7de3349ccaa0fde6298fe6d7b7d0d34586193", // Instance-cdai-50000
+  "cdai-50000"
 );
-contractsToInstances.set(
-  '0x23173fe8b96a4ad8d2e17fb83ea5dcccdca1ae52', // Instance-usdc-1000
-  'usdc-1000',
+contractsToInstances.set("0x8281aa6795ade17c8973e1aedca380258bc124f9", // Instance-cdai-500000
+  "cdai-500000"
 );
-contractsToInstances.set(
-  '0x538ab61e8a9fc1b2f93b3dd9011d662d89be6fe6', // Instance-usdt-100
-  'usdt-100',
+contractsToInstances.set("0x57b2b8c82f065de8ef5573f9730fc1449b403c9f", // Instance-cdai-5000000
+  "cdai-5000000"
 );
-contractsToInstances.set(
-  '0x94be88213a387e992dd87de56950a9aef34b9448', // Instance-usdt-1000
-  'usdt-1000',
+contractsToInstances.set("0x05e0b5b40b7b66098c2161a5ee11c5740a3a7c45", // Instance-usdc-100
+  "usdc-100"
 );
-contractsToInstances.set(
-  '0x242654336ca2205714071898f67e254eb49acdce', // Instance-wbtc-0.1
-  'wbtc-0.1',
+contractsToInstances.set("0x23173fe8b96a4ad8d2e17fb83ea5dcccdca1ae52", // Instance-usdc-1000
+  "usdc-1000"
 );
-contractsToInstances.set(
-  '0x776198ccf446dfa168347089d7338879273172cf', // Instance-wbtc-1
-  'wbtc-1',
+contractsToInstances.set("0x538ab61e8a9fc1b2f93b3dd9011d662d89be6fe6", // Instance-usdt-100
+  "usdt-100"
 );
-contractsToInstances.set(
-  '0xedc5d01286f99a066559f60a585406f3878a033e', // Instance-wbtc-10
-  'wbtc-10',
+contractsToInstances.set("0x94be88213a387e992dd87de56950a9aef34b9448", // Instance-usdt-1000
+  "usdt-1000"
 );
-contractsToInstances.set(
-  '0x6bf694a291df3fec1f7e69701e3ab6c592435ae7', // Instance-eth-0.1
-  'eth-0.1',
+contractsToInstances.set("0x242654336ca2205714071898f67e254eb49acdce", // Instance-wbtc-0.1
+  "wbtc-0.1"
 );
-contractsToInstances.set(
-  '0x3aac1cc67c2ec5db4ea850957b967ba153ad6279', // Instance-eth-1
-  'eth-1',
+contractsToInstances.set("0x776198ccf446dfa168347089d7338879273172cf", // Instance-wbtc-1
+  "wbtc-1"
 );
-contractsToInstances.set(
-  '0x723b78e67497e85279cb204544566f4dc5d2aca0', // Instance-eth-10
-  'eth-10',
+contractsToInstances.set("0xedc5d01286f99a066559f60a585406f3878a033e", // Instance-wbtc-10
+  "wbtc-10"
 );
-contractsToInstances.set(
-  '0x0e3a09dda6b20afbb34ac7cd4a6881493f3e7bf7', // Instance-eth-100
-  'eth-100',
+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.
diff --git a/subgraphs/tornado-subgraph-matic.yaml b/subgraphs/tornado-subgraph-matic.yaml
index 65615f7..fda29f4 100644
--- a/subgraphs/tornado-subgraph-matic.yaml
+++ b/subgraphs/tornado-subgraph-matic.yaml
@@ -8,9 +8,9 @@
     name: Echoer
     network: matic
     source:
-      address: "0x88Fb545DC03438b9FFb958361b7F3CfA6ce1B9c5"
+      address: "0xa75BF2815618872f155b7C4B0C81bF990f5245E4"
       abi: Echoer
-      startBlock: 15586935
+      startBlock: 16257996
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.4
@@ -25,12 +25,81 @@
         - event: Echo(indexed address,bytes)
           handler: handleEcho
   - kind: ethereum/contract
-    name: Instance-0.1-matic
+    name: Instance-100-matic
     network: matic
     source:
-      address: "0x992A81FA34aa6ecD9520F39f858abc51fee6994a"
+      address: "0x1E34A77868E19A6647b1f2F47B51ed72dEDE95DD"
       abi: Instance
-      startBlock: 15586940
+      startBlock: 16257962
+    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-matic
+    network: matic
+    source:
+      address: "0xdf231d99Ff8b6c6CBF4E9B9a945CBAcEF9339178"
+      abi: Instance
+      startBlock: 16257962
+    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-matic
+    network: matic
+    source:
+      address: "0xaf4c0B70B2Ea9FB7487C7CbB37aDa259579fe040"
+      abi: Instance
+      startBlock: 16257962
+    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-matic
+    network: matic
+    source:
+      address: "0xa5C2254e4253490C54cef0a4347fddb8f75A4998"
+      abi: Instance
+      startBlock: 16257962
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.4
@@ -51,9 +120,9 @@
     name: Proxy
     network: matic
     source:
-      address: "0xDC16d16341A62c60E7C9889F9d1FcE4cde57a90F"
+      address: "0x0D5550d52428E7e3175bfc9550207e4ad3859b17"
       abi: Proxy
-      startBlock: 15586930
+      startBlock: 16257989
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.4