optimism

components/Navbar.vue

@@ -5,16 +5,6 @@
         <Logo />
       </b-navbar-item>
     </template>
-    <template slot="start">
-      <b-navbar-item
-        href="https://medium.com/@tornado-cash/tornado-cash-deployment-proposal-on-arbitrum-fb02e508fe74"
-        target="_blank"
-        class="decorate"
-        rel="noreferrer"
-      >
-        {{ $t('info') }}
-      </b-navbar-item>
-    </template>
     <template slot="end">
       <b-navbar-item tag="div">
         <div class="buttons">

langs/en.json

@@ -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 protocol on Aribtrum One.",
+  "pageSubtitle": "Follow these simple steps to become part of deployment of Tornado.Cash protocol on Optimism.",
   "alreadyDeployed": "Already deployed",
   "contractDeployed": "Contract successfully deployed",
   "transactionFailed": "Transaction was failed",
@@ -26,6 +26,6 @@
   "viewOnEtherscan": "View on Etherscan",
   "pleaseConnectWallet": "Please connect your wallet first",
   "dependsOnEns": "This action depends on {ens}",
-  "arbitrumOnly": "Please switch your wallet to Arbitrum One",
+  "optimismOnly": "Please switch your wallet to Optimism",
-  "switchNetwork": "Switch to Arbitrum"
+  "switchNetwork": "Switch to Optimism"
 }

networkConfig.js

@@ -1,5 +1,5 @@
 const networkConfig = {
-  netId42161: {
+  netId10: {
     rpcCallRetryAttempt: 15,
     gasPrices: {
       instant: 4,
@@ -9,15 +9,15 @@ const networkConfig = {
     },
     currencyName: 'ETH',
     explorerUrl: {
-      tx: 'https://arbiscan.io/tx/',
+      tx: 'https://optimistic.etherscan.io/tx/',
-      address: 'https://arbiscan.io/address/',
+      address: 'https://optimistic.etherscan.io/address/',
     },
-    networkName: 'arbitrum',
+    networkName: 'optimism',
     rpcUrls: {
       Infura: {
-        name: 'Arbitrum Public RPC',
+        name: 'Optimism RPC',
         url:
-          'https://arb-mainnet.g.alchemy.com/v2/_82R9fXSpgWH9iv_oKdwKww7qMyJ6OpR',
+          'https://opt-mainnet.g.alchemy.com/v2/6gdxilsHZ0gV2da6mV7grCHRrZAa0jms',
       },
     },
     pollInterval: 15,

pages/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <h1 class="title has-text-centered">
-      Tornado.cash <span>Arbitrum</span> Deployment
+      Tornado.cash <span>Optimism</span> Deployment
     </h1>
     <h2 class="subtitle has-text-centered">{{ $t('pageSubtitle') }}</h2>
 

store/deploy.js

@@ -55,23 +55,23 @@ const actions = {
         .deployerContract(isProxy)
         .methods.deploy(action.bytecode, deploymentActions.salt)
         .encodeABI()
-      const callParamsEstimate = {
+
-        method: 'eth_estimateGas',
+      const params = {
-        params: [
-          {
         from: ethAccount,
         to: getters.deployerContract(isProxy)._address,
-            // gas: numberToHex(6e6),
+        value: '0x0',
-            gasPrice,
-            value: `0x0`,
         data,
-          },
-        ],
-        from: ethAccount,
       }
-      const gasEstimate = await dispatch(
+
+      const gasEstimate = isProxy
+        ? numberToHex(363636)
+        : await dispatch(
             'provider/sendRequest',
-        callParamsEstimate,
+            {
+              method: 'eth_estimateGas',
+              params: [params],
+              from: ethAccount,
+            },
             {
               root: true,
             }
@@ -81,12 +81,9 @@ const actions = {
         method: 'eth_sendTransaction',
         params: [
           {
-            from: ethAccount,
+            ...params,
-            to: getters.deployerContract(isProxy)._address,
             gas: numberToHex(gasWithBuffer),
             gasPrice,
-            value: 0,
-            data,
           },
         ],
         from: ethAccount,

store/gasPrice.js

@@ -3,7 +3,7 @@ import { GasPriceOracle } from 'gas-price-oracle'
 import networkConfig from '@/networkConfig'
 const { toHex, toWei } = require('web3-utils')
 
-const GAS_PRICES = networkConfig.netId42161.gasPrices
+const GAS_PRICES = networkConfig.netId10.gasPrices
 
 export const state = () => {
   return {
@@ -17,7 +17,7 @@ export const getters = {
     const currentRpc = rootGetters['provider/getNetwork'].rpcUrls.Infura.url
     console.log('currentRpc', currentRpc)
     return new GasPriceOracle({
-      chainId: 42161,
+      chainId: 10,
       defaultRpc: currentRpc,
       defaultFallbackGasPrices: GAS_PRICES,
     })

store/provider/actions.js

@@ -14,20 +14,20 @@ export default {
   async initProvider({ commit, state, getters, dispatch }, { name, network }) {
     try {
       const account = await this.$provider.initProvider(getters.getProvider, {})
-      if (window.ethereum.chainId !== '0xa4b1') {
+      if (window.ethereum.chainId !== '0xa') {
         await dispatch(
           'notice/addNotice',
           {
             notice: {
-              title: 'arbitrumOnly',
+              title: 'optimismOnly',
               type: 'danger',
-              callback: () => dispatch('switchNetwork', { netId: 42161 }),
+              callback: () => dispatch('switchNetwork', { netId: 10 }),
               message: 'switchNetwork',
             },
           },
           { root: true }
         )
-        throw new Error('Connect to Arbitrum')
+        throw new Error('Connect to Optimism')
       }
 
       commit(SET_PROVIDER_NAME, name)
@@ -119,16 +119,16 @@ export default {
   },
   async addNetwork(_, { netId }) {
     const METAMASK_LIST = {
-      42161: {
+      10: {
-        chainId: '0xA4B1',
+        chainId: '0xa',
-        chainName: 'Arbitrum One',
+        chainName: 'Optimistic Ethereum',
-        rpcUrls: ['https://arb1.arbitrum.io/rpc'],
+        rpcUrls: ['https://mainnet.optimism.io/'],
         nativeCurrency: {
           name: 'Ether',
-          symbol: 'AETH',
+          symbol: 'OETH',
           decimals: 18,
         },
-        blockExplorerUrls: ['https://arbiscan.io'],
+        blockExplorerUrls: ['https://optimistic.etherscan.io'],
       },
     }
 

store/provider/state.js

@@ -1,8 +1,8 @@
 export default () => ({
   account: null,
   network: {
-    name: 'arbitrum',
+    name: 'optimism',
-    id: 42161,
+    id: 10,
   },
   provider: {
     name: '',