Merge branch 'dev'

edenia · Aug 29, 2023 · 9cba53e · 9cba53e
2 parents 8be7ca6 + 55cae9e
commit 9cba53e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/deploy-telos-testnet.yaml b/.github/workflows/deploy-telos-testnet.yaml
@@ -63,7 +63,7 @@ jobs:
           REACT_APP_PUBLIC_RE_CAPTCHA_KEY: ${{ secrets.REACT_APP_PUBLIC_RE_CAPTCHA_KEY }}
           REACT_APP_EVM_ENDPOINT: 'https://testnet.telos.net/evm'
           REACT_APP_EVM_BLOCK_EXPLORER_URL: 'https://testnet.teloscan.io/block/(block)'
-          REACT_APP_EVM_ENDPOINTS: '[\"https://testnet.telos.net/evm\"]'
+          REACT_APP_EVM_ENDPOINTS: '["https://testnet.telos.net/evm"]'
 
       - name: Build and deploy kubernetes files
         id: build_kubernetes_files

diff --git a/.github/workflows/deploy-telos.yaml b/.github/workflows/deploy-telos.yaml
@@ -63,7 +63,7 @@ jobs:
           REACT_APP_PUBLIC_RE_CAPTCHA_KEY: ${{ secrets.REACT_APP_PUBLIC_RE_CAPTCHA_KEY }}
           REACT_APP_EVM_ENDPOINT: 'https://mainnet.telos.net/evm'
           REACT_APP_EVM_BLOCK_EXPLORER_URL: 'https://www.teloscan.io/block/(block)'
-          REACT_APP_EVM_ENDPOINTS: '[\"https://rpc1.eu.telos.net/evm\",\"https://api.kainosbp.com/evm\",\"https://mainnet.telos.net/evm\",\"https://rpc1.us.telos.net/evm\",\"https://rpc2.eu.telos.net/evm\",\"https://rpc2.us.telos.net/evm\",\"https://evm.teloskorea.com/evm\",\"https://rpc2.teloskorea.com/evm\",\"https://rpc01.us.telosunlimited.io/evm\"]'
+          REACT_APP_EVM_ENDPOINTS: '["https://rpc1.eu.telos.net/evm","https://api.kainosbp.com/evm","https://mainnet.telos.net/evm","https://rpc1.us.telos.net/evm","https://rpc2.eu.telos.net/evm","https://rpc2.us.telos.net/evm","https://evm.teloskorea.com/evm","https://rpc2.teloskorea.com/evm","https://rpc01.us.telosunlimited.io/evm"]'
 
       - name: Build and deploy kubernetes files
         id: build_kubernetes_files

diff --git a/webapp/src/config/evm.config.js b/webapp/src/config/evm.config.js
@@ -1,6 +1,7 @@
 import { eosConfig } from 'config'
 
 let _avgBlockTime = 'N/A'
+let _endpoints
 
 switch (eosConfig.networkName) {
   case 'telos-testnet':
@@ -15,9 +16,16 @@ switch (eosConfig.networkName) {
     break
 }
 
+try {
+  _endpoints = JSON.parse(process.env.REACT_APP_EVM_ENDPOINTS || '[]') || []
+} catch (error) {
+  console.error(error)
+  _endpoints = []
+}
+
 export const avgBlockTime = _avgBlockTime
 export const maxTPSDataSize = 30 / _avgBlockTime || 0
 export const account = 'eosio.evm'
 export const endpoint = process.env.REACT_APP_EVM_ENDPOINT
 export const blockExplorerUrl = process.env.REACT_APP_EVM_BLOCK_EXPLORER_URL
-export const endpoints = JSON.parse(process.env.REACT_APP_EVM_ENDPOINTS || '[]') || []
+export const endpoints = _endpoints