Merge pull request 'master' (#30) from master into development

Reviewed-on: #30

components/settings/SettingsModalBox.vue

@@ -4,7 +4,10 @@
       <div class="box-modal-title">{{ $t('withdrawalSettings') }}</div>
       <button type="button" class="delete" @click="$parent.cancel('escape')" />
     </header>
-    <b-tabs v-model="withdrawType" :animated="false" class="is-modal">
+    <b-tabs v-if="isRelayersAvailable" v-model="withdrawType" :animated="false" class="is-modal">
+      <RelayerTab />
+    </b-tabs>
+    <b-tabs v-else v-model="withdrawType" :animated="false" class="is-modal">
       <RelayerTab />
       <WalletTab />
     </b-tabs>
@@ -46,7 +49,11 @@ export default {
   computed: {
     ...mapState('application', {
       defaultWithdrawType: 'withdrawType'
-    })
+    }),
+    ...mapState('relayer', ['isLoadingRelayers', 'validRelayers']),
+    isRelayersAvailable() {
+      return !this.isLoadingRelayers && this.validRelayers.length > 0;
+    }
   },
   created() {
     this.withdrawType = this.defaultWithdrawType

components/withdraw/Withdraw.vue

@@ -200,7 +200,7 @@ export default {
       return false
     },
     shouldSettingsShow() {
-      return !this.hasErrorNote && !this.error.message
+      return !this.isLoading && !this.error.type && !this.hasErrorNote
     },
     hasErrorNote() {
       const note = this.withdrawNote.split('-')[4]

networkConfig.js

@@ -29,9 +29,9 @@ export default {
         name: 'MevblockerRPC',
         url: 'https://rpc.mevblocker.io'
       },
-      llamaRPC: {
+      oneRPC: {
-        name: 'llamarpc',
+        name: '1RPC',
-        url: 'https://eth.llamarpc.com'
+        url: 'https://1rpc.io/eth'
       }
     },
     multicall: '0xeefba1e63905ef1d7acba5a8513c70307c1ce441',
@@ -401,17 +401,17 @@ export default {
     multicall: '0xe86e3989c74293Acc962156cd3F525c07b6a1B6e',
     echoContractAccount: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4',
     rpcUrls: {
-      publicRpc1: {
+      publicRpc: {
         name: 'Avalanche RPC',
-        url: 'https://endpoints.omniatech.io/v1/avax/mainnet/public'
+        url: 'https://api.avax.network/ext/bc/C/rpc'
       },
       meowRPC: {
         name: 'Meow RPC',
         url: 'https://avax.meowrpc.com'
       },
-      communityRPC: {
+      oneRPC: {
-        name: 'Tornado RPC',
+        name: 'OneRPC',
-        url: 'https://avalanche-rpc.tornado.ws/ext/bc/C/rpc'
+        url: 'https://1rpc.io/avax/c'
       }
     },
     tokens: {
@@ -459,6 +459,10 @@ export default {
       chainnodes: {
         name: 'Tornado RPC',
         url: 'https://goerli.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607'
+      },
+      gatewayRPC: {
+        name: 'Gateway RPC',
+        url: 'https://rpc.goerli.eth.gateway.fm'
       }
     },
     tokens: {

scripts/updateZip.js

@@ -17,13 +17,13 @@ function updateEncrypted(netId) {
 async function updateCommon(netId) {
   const { nativeCurrency, tokens } = networkConfig[`netId${netId}`]
 
-  console.log(Object.keys(tokens[nativeCurrency].instanceAddress))
+  for (const type of EVENTS) {
-
+    for (const [tokenName, tokenInfo] of Object.entries(tokens)) {
-  for await (const type of EVENTS) {
+      console.log(`${tokenInfo.symbol}: ${Object.keys(tokenInfo.instanceAddress)}`)
-    for await (const instance of Object.keys(tokens[nativeCurrency].instanceAddress)) {
+      for (const instance of Object.keys(tokenInfo.instanceAddress)) {
         console.warn('instance', instance)
 
-      const filename = `${type.toLowerCase()}s_${netId}_${nativeCurrency}_${instance}.json`
+        const filename = `${type.toLowerCase()}s_${netId}_${tokenName}_${instance}.json`
 
         const isSaved = save(`${EVENTS_PATH}${filename}`)
 
@@ -36,6 +36,7 @@ async function updateCommon(netId) {
         }
       }
     }
+  }
 }
 
 function testCommon(netId, type, filename) {