instances ceremony

langs/en.json

@@ -3,7 +3,7 @@
   "yourWallet": "Your Wallet",
   "pleaseSelectYourWeb3Wallet": "Please select your Web3 compatible wallet:",
   "otherWallet": "Other Wallet",
-  "currentNetworkIsNotSupported": "Current network is not supported. Try Kovan or Mainnet",
+  "currentNetworkIsNotSupported": "Current network is not supported. Try Goerli or Mainnet",
   "logout": "Logout",
   "connect": "Connect",
   "close": "Close",
@@ -17,7 +17,7 @@
   "deployedBy": "Deployed by: {link}",
   "startNow": "Start now",
   "completedTasks": "Completed Tasks: {progress}",
-  "pageSubtitle": "Follow these simple steps to become part of deployment of Tornado.Cash Governance protocol.",
+  "pageSubtitle": "Follow these simple steps to become part of deployment of Tornado.Cash new instances.",
   "alreadyDeployed": "Already deployed",
   "contractDeployed": "Contract successfully deployed",
   "transactionFailed": "Transaction was failed",
@@ -26,5 +26,5 @@
   "viewOnEtherscan": "View on Etherscan",
   "pleaseConnectWallet": "Please connect your wallet first",
   "dependsOnEns": "This action depends on {ens}",
-  "thankYou": "The governance has been initiated. All contracts are deployed. Thank you for your participation."
+  "thankYou": "All contracts are deployed. Thank you for your participation."
 }

pages/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <h1 class="title has-text-centered">
-      Tornado.cash <span>Governance</span> Initiation
+      <span>Tornado.cash Instance</span> deployment
     </h1>
     <h2 v-if="!deployedCount.isCompleted" class="subtitle has-text-centered">
       {{ $t('pageSubtitle') }}

store/deploy.js

@@ -8,14 +8,9 @@ const state = () => {
 }
 
 const getters = {
-  deployerContract: (state, getters, rootState, rootGetters) => (isProxy) => {
+  deployerContract: (state, getters, rootState, rootGetters) => () => {
     const web3 = rootGetters['provider/currentRpc']
-    return new web3.eth.Contract(
-      deployerABI,
-      isProxy
-        ? deploymentActions.deployer
-        : deploymentActions.actions[0].expectedAddress
-    )
+    return new web3.eth.Contract(deployerABI, deploymentActions.deployer)
   },
 }
 
@@ -51,7 +46,7 @@ const actions = {
       const gasPrice = rootGetters['gasPrice/fastGasPrice']
 
       const data = getters
-        .deployerContract(isProxy)
+        .deployerContract()
         .methods.deploy(action.bytecode, deploymentActions.salt)
         .encodeABI()
       const callParamsEstimate = {
@@ -59,7 +54,7 @@ const actions = {
         params: [
           {
             from: ethAccount,
-            to: getters.deployerContract(isProxy)._address,
+            to: getters.deployerContract()._address,
             // gas: numberToHex(6e6),
             gasPrice,
             value: `0x0`,
@@ -80,7 +75,7 @@ const actions = {
         params: [
           {
             from: ethAccount,
-            to: getters.deployerContract(isProxy)._address,
+            to: getters.deployerContract()._address,
             gas: numberToHex(gasWithBuffer),
             gasPrice,
             value: 0,

store/steps.js

@@ -42,7 +42,7 @@ const mutations = {
 
 const actions = {
   async fetchDeploymentStatus({ state, dispatch, commit, rootGetters }) {
-    const deployContract = rootGetters['deploy/deployerContract'](false)
+    const deployContract = rootGetters['deploy/deployerContract']()
     const events = await deployContract.getPastEvents('Deployed', {
       fromBlock: 0,
       toBlock: 'latest',