From a346957d51da62a6994a731ab2828814d3c6e9b4 Mon Sep 17 00:00:00 2001 From: Danil Kovtonyuk Date: Fri, 17 Sep 2021 15:01:36 +1000 Subject: [PATCH] fix: Avalanche contracts --- mustache/templates/echoer/contracts.js | 4 +-- mustache/templates/instance/contracts.js | 44 ++++++++++------------- mustache/templates/proxy/contracts.js | 4 +-- src/contractsToInstances.ts | 11 +++--- subgraphs/tornado-subgraph-avalanche.yaml | 43 ++++++++++++++++------ 5 files changed, 62 insertions(+), 44 deletions(-) diff --git a/mustache/templates/echoer/contracts.js b/mustache/templates/echoer/contracts.js index 0adcd8a..54e20ae 100644 --- a/mustache/templates/echoer/contracts.js +++ b/mustache/templates/echoer/contracts.js @@ -30,10 +30,10 @@ const contracts = [ address: '0x37e6859804b6499d1e4a86d70a5fdd5de6a0ac65', }, { - prod: 4285638, + prod: 4429813, network: 'avalanche', name: 'Echoer', - address: '0xEd2B6bf192cFAb45810FC06c5E44e4Df48Eef47d', + address: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4', }, ]; diff --git a/mustache/templates/instance/contracts.js b/mustache/templates/instance/contracts.js index 4002b54..23201c0 100644 --- a/mustache/templates/instance/contracts.js +++ b/mustache/templates/instance/contracts.js @@ -4,7 +4,7 @@ const deployedBlocks = { matic: 16257962, goerli: 3781595, mainnet: 9116966, - avalanche: 4285638, + avalanche: 4429818, }; const contracts = [ @@ -408,38 +408,30 @@ const contracts = [ name: 'Instance', address: '0x0E3A09dDA6B20aFbB34aC7cD4A6881493f3E7bf7', }, - { - prod: deployedBlocks.avalanche, - amount: '0.1', - network: 'avalanche', - currency: 'avax', - name: 'Instance', - address: '0x25b5aD99DE3a1d713d3E5578413002ff6F89744d', - }, { prod: deployedBlocks.avalanche, amount: '10', network: 'avalanche', currency: 'avax', name: 'Instance', - address: '0x44139ab9F929CC10cdCEBddca8008e07ac52954E', + 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.avalanche, - // amount: '100', - // network: 'avalanche', - // currency: 'avax', - // name: 'Instance', - // address: '', - // }, - // { - // prod: deployedBlocks.avalanche, - // amount: '500', - // network: 'avalanche', - // currency: 'avax', - // name: 'Instance', - // address: '', - // }, ]; module.exports = contracts; diff --git a/mustache/templates/proxy/contracts.js b/mustache/templates/proxy/contracts.js index 5674caa..0174019 100644 --- a/mustache/templates/proxy/contracts.js +++ b/mustache/templates/proxy/contracts.js @@ -30,10 +30,10 @@ const contracts = [ address: '0x454d870a72e29d5e5697f635128d18077bd04c60', }, { - prod: 4285638, + prod: 4429818, name: 'Proxy', network: 'avalanche', - address: '0xa77350E1a72bE5bC7634d359C5011b4E359f4320', + address: '0x0D5550d52428E7e3175bfc9550207e4ad3859b17', }, ]; diff --git a/src/contractsToInstances.ts b/src/contractsToInstances.ts index bc7c076..9e1d21f 100644 --- a/src/contractsToInstances.ts +++ b/src/contractsToInstances.ts @@ -150,10 +150,13 @@ contractsToInstances.set("0x723b78e67497e85279cb204544566f4dc5d2aca0", // Inst contractsToInstances.set("0x0e3a09dda6b20afbb34ac7cd4a6881493f3e7bf7", // Instance-eth-100   "eth-100" ); -contractsToInstances.set("0x25b5ad99de3a1d713d3e5578413002ff6f89744d", // Instance-avax-0.1 -  "avax-0.1" -); -contractsToInstances.set("0x44139ab9f929cc10cdcebddca8008e07ac52954e", // Instance-avax-10 +contractsToInstances.set("0x330bdfade01ee9bf63c209ee33102dd334618e0a", // Instance-avax-10   "avax-10" ); +contractsToInstances.set("0x1e34a77868e19a6647b1f2f47b51ed72dede95dd", // Instance-avax-100 +  "avax-100" +); +contractsToInstances.set("0xaf8d1839c3c67cf571aa74b5c12398d4901147b3", // Instance-avax-500 +  "avax-500" +); // this is a read only file generated by manual inputs to file mustache/templates/rates/contracts.js. diff --git a/subgraphs/tornado-subgraph-avalanche.yaml b/subgraphs/tornado-subgraph-avalanche.yaml index bc245d3..760e6f8 100644 --- a/subgraphs/tornado-subgraph-avalanche.yaml +++ b/subgraphs/tornado-subgraph-avalanche.yaml @@ -8,9 +8,9 @@ name: Echoer network: avalanche source: - address: "0xEd2B6bf192cFAb45810FC06c5E44e4Df48Eef47d" + address: "0xa75BF2815618872f155b7C4B0C81bF990f5245E4" abi: Echoer - startBlock: 4285638 + startBlock: 4429813 mapping: kind: ethereum/events apiVersion: 0.0.4 @@ -25,12 +25,12 @@ - event: Echo(indexed address,bytes) handler: handleEcho - kind: ethereum/contract - name: Instance-0.1-avax + name: Instance-10-avax network: avalanche source: - address: "0x25b5aD99DE3a1d713d3E5578413002ff6F89744d" + address: "0x330bdFADE01eE9bF63C209Ee33102DD334618e0a" abi: Instance - startBlock: 4285638 + startBlock: 4429818 mapping: kind: ethereum/events apiVersion: 0.0.4 @@ -48,12 +48,35 @@ - event: Withdrawal(address,bytes32,indexed address,uint256) handler: handleWithdrawal - kind: ethereum/contract - name: Instance-10-avax + name: Instance-100-avax network: avalanche source: - address: "0x44139ab9F929CC10cdCEBddca8008e07ac52954E" + address: "0x1E34A77868E19A6647b1f2F47B51ed72dEDE95DD" abi: Instance - startBlock: 4285638 + 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 @@ -74,9 +97,9 @@ name: Proxy network: avalanche source: - address: "0xa77350E1a72bE5bC7634d359C5011b4E359f4320" + address: "0x0D5550d52428E7e3175bfc9550207e4ad3859b17" abi: Proxy - startBlock: 4285638 + startBlock: 4429818 mapping: kind: ethereum/events apiVersion: 0.0.4