remove deployer

This commit is contained in:
Alexey 2021-06-02 11:00:11 +03:00
parent 9593914bca
commit 530a0f5ff9
2 changed files with 14 additions and 13 deletions

View File

@ -16,6 +16,7 @@ async function main() {
const provider = new ethers.providers.JsonRpcProvider(process.env.RPC_URL) const provider = new ethers.providers.JsonRpcProvider(process.env.RPC_URL)
const wallet = new ethers.Wallet(privateKey, provider) const wallet = new ethers.Wallet(privateKey, provider)
let deployer = new ethers.Contract(actions.deployer, abi, wallet) let deployer = new ethers.Contract(actions.deployer, abi, wallet)
console.log('actions.deployer', actions.deployer)
let code = await provider.getCode(actions.eipDeployer.expectedAddress) let code = await provider.getCode(actions.eipDeployer.expectedAddress)
if (!code || code === '0x') { if (!code || code === '0x') {
@ -46,7 +47,7 @@ async function main() {
continue continue
} }
console.log(`Deploying ${action.contract} to ${action.domain} (${action.expectedAddress})`) console.log(`Deploying ${action.contract} to ${action.domain} (${action.expectedAddress})`)
const tx = await deployer.deploy(action.bytecode, actions.salt, { gasLimit: 7e7, gasPrice: 1e9 }) const tx = await deployer.deploy(action.bytecode, actions.salt, { gasLimit: 70e6, gasPrice: 1e9 })
console.log(`TX hash ${explorer}/tx/${tx.hash}`) console.log(`TX hash ${explorer}/tx/${tx.hash}`)
try { try {
await tx.wait() await tx.wait()
@ -58,7 +59,7 @@ async function main() {
console.error(`Failed to deploy ${action.contract}, sending debug tx`) console.error(`Failed to deploy ${action.contract}, sending debug tx`)
// const trace = await provider.send('debug_traceTransaction', [ tx.hash ]) // const trace = await provider.send('debug_traceTransaction', [ tx.hash ])
// console.log(trace) // console.log(trace)
const tx2 = await wallet.sendTransaction({ gasLimit: 8e6, gasPrice: 1e9, data: action.bytecode }) const tx2 = await wallet.sendTransaction({ gasLimit: 70e6, gasPrice: 1e9, data: action.bytecode })
console.log(`TX hash ${explorer}/tx/${tx2.hash}`) console.log(`TX hash ${explorer}/tx/${tx2.hash}`)
await tx2.wait() await tx2.wait()
console.log('Mined, check revert reason on etherscan') console.log('Mined, check revert reason on etherscan')

View File

@ -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(