From 530a0f5ff9e0401f08ad3b6b3c8d612200c5087d Mon Sep 17 00:00:00 2001
From: Alexey <peretsmobil@gmail.com>
Date: Wed, 2 Jun 2021 11:00:11 +0300
Subject: [PATCH] remove deployer

---
 src/execute.js  |  5 +++--
 src/generate.js | 22 +++++++++++-----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/execute.js b/src/execute.js
index 825c138..cf3dc6b 100644
--- a/src/execute.js
+++ b/src/execute.js
@@ -16,6 +16,7 @@ async function main() {
   const provider = new ethers.providers.JsonRpcProvider(process.env.RPC_URL)
   const wallet = new ethers.Wallet(privateKey, provider)
   let deployer = new ethers.Contract(actions.deployer, abi, wallet)
+  console.log('actions.deployer', actions.deployer)
 
   let code = await provider.getCode(actions.eipDeployer.expectedAddress)
   if (!code || code === '0x') {
@@ -46,7 +47,7 @@ async function main() {
       continue
     }
     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}`)
     try {
       await tx.wait()
@@ -58,7 +59,7 @@ async function main() {
       console.error(`Failed to deploy ${action.contract}, sending debug tx`)
       // const trace = await provider.send('debug_traceTransaction', [ tx.hash ])
       // 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}`)
       await tx2.wait()
       console.log('Mined, check revert reason on etherscan')
diff --git a/src/generate.js b/src/generate.js
index 14a23ad..ed6b46f 100644
--- a/src/generate.js
+++ b/src/generate.js
@@ -39,17 +39,17 @@ const eipDeployer = {
 
 // Actions needed for new blockchains
 // Assumes that EIP-2470 deployer is already present on the chain
-actions.push(
-  deploy({
-    domain: 'deployer.contract.tornadocash.eth',
-    contract: deployer,
-    args: ['0x0000000000000000000000000000000000000000'],
-    dependsOn: [],
-    title: 'Deployment proxy',
-    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.',
-  }),
-)
+// actions.push(
+//   deploy({
+//     domain: 'deployer.contract.tornadocash.eth',
+//     contract: deployer,
+//     args: ['0x0000000000000000000000000000000000000000'],
+//     dependsOn: [],
+//     title: 'Deployment proxy',
+//     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.',
+//   }),
+// )
 
 // Deploy Hasher
 actions.push(