This commit is contained in:
Alexey 2021-06-02 19:43:12 +03:00
parent 530a0f5ff9
commit 2689dbd414
2 changed files with 38 additions and 30 deletions

View File

@ -1,30 +1,30 @@
module.exports = [ module.exports = [
{ {
isETH: true, isETH: true,
denomination: "100000000000000000", denomination: '100000000000000000',
domain: "eth-01.tornadocash.eth", domain: 'eth-01.tornadocash.eth',
symbol: "ETH", symbol: 'BNB',
decimals: 18 decimals: 18,
}, },
{ {
isETH: true, isETH: true,
denomination: "1000000000000000000", denomination: '1000000000000000000',
domain: "eth-1.tornadocash.eth", domain: 'eth-1.tornadocash.eth',
symbol: "ETH", symbol: 'BNB',
decimals: 18 decimals: 18,
}, },
{ {
isETH: true, isETH: true,
denomination: "10000000000000000000", denomination: '10000000000000000000',
domain: "eth-10.tornadocash.eth", domain: 'eth-10.tornadocash.eth',
symbol: "ETH", symbol: 'BNB',
decimals: 18 decimals: 18,
}, },
{ {
isETH: true, isETH: true,
denomination: "100000000000000000000", denomination: '100000000000000000000',
domain: "eth-100.tornadocash.eth", domain: 'eth-100.tornadocash.eth',
symbol: "ETH", symbol: 'BNB',
decimals: 18 decimals: 18,
}, },
] ]

View File

@ -4,7 +4,7 @@ const ethers = require('ethers')
const { formatUnits, commify } = ethers.utils const { formatUnits, commify } = ethers.utils
const { deploy, getContractData, expectedAddress } = require('./utils') const { deploy, getContractData, expectedAddress } = require('./utils')
const { DEPLOYER, SALT, COMP_ADDRESS } = process.env const { SALT, COMP_ADDRESS } = process.env
const instances = require('../instances') const instances = require('../instances')
const deployer = getContractData('../deployer/build/contracts/Deployer.json') const deployer = getContractData('../deployer/build/contracts/Deployer.json')
@ -39,17 +39,17 @@ const eipDeployer = {
// Actions needed for new blockchains // Actions needed for new blockchains
// Assumes that EIP-2470 deployer is already present on the chain // Assumes that EIP-2470 deployer is already present on the chain
// actions.push( actions.push(
// deploy({ deploy({
// domain: 'deployer.contract.tornadocash.eth', domain: 'deployer.contract.tornadocash.eth',
// contract: deployer, contract: deployer,
// args: ['0x0000000000000000000000000000000000000000'], args: ['0x0000000000000000000000000000000000000000'],
// dependsOn: [], dependsOn: [],
// title: 'Deployment proxy', title: 'Deployment proxy',
// description: description:
// 'This a required contract to initialize all other contracts. It is simple wrapper around EIP-2470 Singleton Factory that emits an event of contract deployment. The wrapper also validates if the deployment was successful.', 'This a required contract to initialize all other contracts. It is simple wrapper around EIP-2470 Singleton Factory that emits an event of contract deployment. The wrapper also validates if the deployment was successful.',
// }), }),
// ) )
// Deploy Hasher // Deploy Hasher
actions.push( actions.push(
@ -58,7 +58,7 @@ actions.push(
contract: hasher, contract: hasher,
title: 'Hasher', title: 'Hasher',
description: 'MiMC hasher contract', description: 'MiMC hasher contract',
dependsOn: [], dependsOn: ['deployer.contract.tornadocash.eth'],
}), }),
) )
@ -69,6 +69,7 @@ actions.push(
contract: verifier, contract: verifier,
title: 'Verifier', title: 'Verifier',
description: 'zkSNARK verifier contract for withdrawals', description: 'zkSNARK verifier contract for withdrawals',
dependsOn: ['deployer.contract.tornadocash.eth'],
}), }),
) )
@ -79,6 +80,7 @@ actions.push(
contract: proxyLight, contract: proxyLight,
title: 'ProxyLight', title: 'ProxyLight',
description: 'Tornado proxy light for L2', description: 'Tornado proxy light for L2',
dependsOn: ['deployer.contract.tornadocash.eth'],
}), }),
) )
@ -89,6 +91,7 @@ actions.push(
contract: echoer, contract: echoer,
title: 'Echoer', title: 'Echoer',
description: 'Utility contract that stores encrypted Note Accounts', description: 'Utility contract that stores encrypted Note Accounts',
dependsOn: ['deployer.contract.tornadocash.eth'],
}), }),
) )
@ -119,6 +122,11 @@ for (const instance of instances) {
).replace(/\.0$/, '')} of ${instance.symbol}${ ).replace(/\.0$/, '')} of ${instance.symbol}${
instance.isETH ? '' : ` at address ${instance.tokenAddress}` instance.isETH ? '' : ` at address ${instance.tokenAddress}`
}`, }`,
dependsOn: [
'deployer.contract.tornadocash.eth',
'hasher.contract.tornadocash.eth',
'verifier.contract.tornadocash.eth',
],
}), }),
) )
} }
@ -126,7 +134,7 @@ for (const instance of instances) {
// Write output // Write output
const result = { const result = {
eipDeployer, eipDeployer,
deployer: DEPLOYER, deployer: eipDeployer.expectedAddress,
salt: SALT, salt: SALT,
actions: actions, actions: actions,
} }