goerli instances

.env.example

@@ -6,14 +6,14 @@ SALT=0x0000000000000000000000000000000000000000000000000000000047941987
 COMP_ADDRESS=0xc00e94Cb662C3520282E6f5717214004A7f26888
 
 # Goerli
-DEPLOYER=0xCEe71753C9820f063b38FDbE4cFDAf1d3D928A80
-HASHER=0xf425b830943d086390b1C6CcB34033F2601a5341
-VERIFIER=0xe65A2C40f2a8975D4A238a2EaD06137b560aF387
-SALT=0x0000000000000000000000000000000000000000000000000000000047941987
-
+# DEPLOYER=0xCEe71753C9820f063b38FDbE4cFDAf1d3D928A80
+# HASHER=0xf425b830943d086390b1C6CcB34033F2601a5341
+# VERIFIER=0xe65A2C40f2a8975D4A238a2EaD06137b560aF387
+# SALT=0x0000000000000000000000000000000000000000000000000000000047941987
+# COMP_ADDRESS=0xe16C7165C8FeA64069802aE4c4c9C320783f2b6e
 
 
 PRIVATE_KEY=0x
 RPC_URL=
-NET_ID=42
+NET_ID=1
 GAS_PRICE_IN_WEI=123000000000

instancesGoerli.js

@@ -13,6 +13,14 @@ module.exports = [
     symbol: 'DAI',
     decimals: 18,
   },
+  {
+    isCToken: true,
+    tokenAddress: '0x822397d9a55d0fefd20F5c4bCaB33C5F65bd28Eb',
+    denomination: '500000000000',
+    domain: 'cdai-5000.tornadocash.eth',
+    symbol: 'cDAI',
+    decimals: 8,
+  },
   {
     isCToken: true,
     tokenAddress: '0x822397d9a55d0fefd20F5c4bCaB33C5F65bd28Eb',
@@ -37,6 +45,34 @@ module.exports = [
     symbol: 'cDAI',
     decimals: 8,
   },
+  {
+    tokenAddress: '0xD87Ba7A50B2E7E660f678A895E4B72E7CB4CCd9C',
+    denomination: '100000000',
+    domain: 'usdc-100.tornadocash.eth',
+    symbol: 'USDC',
+    decimals: 6,
+  },
+  {
+    tokenAddress: '0xD87Ba7A50B2E7E660f678A895E4B72E7CB4CCd9C',
+    denomination: '1000000000',
+    domain: 'usdc-1000.tornadocash.eth',
+    symbol: 'USDC',
+    decimals: 6,
+  },
+  {
+    tokenAddress: '0xb7FC2023D96AEa94Ba0254AA5Aeb93141e4aad66',
+    denomination: '100000000',
+    domain: 'usdt-100.tornadocash.eth',
+    symbol: 'USDT',
+    decimals: 6,
+  },
+  {
+    tokenAddress: '0xb7FC2023D96AEa94Ba0254AA5Aeb93141e4aad66',
+    denomination: '1000000000',
+    domain: 'usdt-1000.tornadocash.eth',
+    symbol: 'USDT',
+    decimals: 6,
+  },
   {
     tokenAddress: '0xC04B0d3107736C32e19F1c62b2aF67BE61d63a05',
     denomination: '10000000',

src/ens.js

@@ -1,7 +1,7 @@
 require('dotenv').config()
 const ethers = require('ethers')
 const { namehash } = ethers.utils
-const { actions } = require('../actions.json')
+let { actions } = require('../actions.json')
 const abi = require('../abi/ens.abi.json')
 
 const prefix = {
@@ -23,10 +23,18 @@ async function main() {
       : new ethers.Contract('0x8595bFb0D940DfEDC98943FA8a907091203f25EE', abi, wallet) // our kovan mock
 
   const data = []
-  for (let { domain, expectedAddress, contract } of actions) {
-    if (!domain && contract === 'Airdrop.sol') {
-      continue
-    }
+  if (process.env.NET_ID === '5') {
+    actions = actions.concat([
+      { domain: 'eth-01.tornado.cash.eth', expectedAddress: '0x6Bf694a291DF3FeC1f7e69701E3ab6c592435Ae7' },
+      { domain: 'eth-1.tornado.cash.eth', expectedAddress: '0x3aac1cC67c2ec5Db4eA850957b967Ba153aD6279' },
+      { domain: 'eth-10.tornado.cash.eth', expectedAddress: '0x723B78e67497E85279CB204544566F4dC5d2acA0' },
+      { domain: 'eth-100.tornado.cash.eth', expectedAddress: '0x0E3A09dDA6B20aFbB34aC7cD4A6881493f3E7bf7' },
+      { domain: 'dai-100.tornadocash.eth', expectedAddress: '0x76D85B4C0Fc497EeCc38902397aC608000A06607' },
+      { domain: 'dai-1000.tornadocash.eth', expectedAddress: '0xCC84179FFD19A1627E79F8648d09e095252Bc418' },
+      // { domain: 'dai-10000.tornadocash.eth', expectedAddress: '0x435aEa5B50CBE34CaC0b42d195da587b923200C3' },
+    ])
+  }
+  for (let { domain, expectedAddress } of actions) {
     const hash = namehash(domain)
     console.log(`Setting ${expectedAddress} address for ${hash} - ${domain}`)
     const calldata = resolver.interface.encodeFunctionData('setAddr(bytes32,address)', [

src/generate.js

@@ -7,7 +7,7 @@ const { deploy, getContractData } = require('./utils')
 const { DEPLOYER, SALT, HASHER, VERIFIER, COMP_ADDRESS, NET_ID } = process.env
 
 const instancesFile = NET_ID == 1 ? 'instancesMainnet' : 'instancesGoerli'
-const instances = require(instancesFile)
+const instances = require(`../${instancesFile}`)
 // const deployer = getContractData('../deployer/build/contracts/Deployer.json')
 // const verifier = getContractData('../tornado-core/build/contracts/Verifier.json')
 // const hasher = getContractData('../tornado-core/build/contracts/Hasher.json')

src/utils.js

@@ -30,7 +30,7 @@ function deploy({
   description = '',
   dependsOn = [], //[config.deployer.address],
 }) {
-  console.log('Generating deploy for', contract.name)
+  console.log('Generating deploy for', domain)
   let bytecode = contract.bytecode
   let constructorArgs
   if (args) {

tornado-core

@@ -1 +1 @@
-Subproject commit 54a7bdcb04aa9d29b3726cf1f177aa5e955ec626
+Subproject commit 3603b1c9e1b2760a6acd9302595e2ec689ec6d5b