Merge branch 'dev'

edenia · Sep 29, 2022 · 715cbf2 · 715cbf2
2 parents 33c3ccd + f1de21a
commit 715cbf2
Show file tree

Hide file tree

Showing 35 changed files with 350 additions and 315 deletions.
diff --git a/.env.jungle b/.env.jungle
@@ -36,7 +36,7 @@ HAPI_HASURA_ADMIN_SECRET=myadminsecretkey
 HAPI_SERVER_PORT=9090
 HAPI_SERVER_ADDRESS=hapi
 HAPI_DATABASE_URL=postgres://eoscr:password@postgres:5432/localdb
-HAPI_SYNC_PRODUCERS_INTERVAL=86400
+HAPI_SYNC_PRODUCERS_INTERVAL=14400
 HAPI_SYNC_PRODUCER_INFO_INTERVAL=1
 HAPI_SYNC_PRODUCER_CPU_INTERVAL=6
 HAPI_SYNC_EXCHANGE_RATE=86400

diff --git a/.env.lacchain b/.env.lacchain
@@ -38,7 +38,7 @@ HAPI_HASURA_ADMIN_SECRET=myadminsecretkey
 HAPI_SERVER_PORT=9090
 HAPI_SERVER_ADDRESS=hapi
 HAPI_DATABASE_URL=postgres://eoscr:password@postgres:5432/localdb
-HAPI_SYNC_PRODUCERS_INTERVAL=86400
+HAPI_SYNC_PRODUCERS_INTERVAL=14400
 HAPI_SYNC_PRODUCER_INFO_INTERVAL=1
 HAPI_SYNC_PRODUCER_CPU_INTERVAL=6
 HAPI_SYNC_STATS_INTERVAL=60

diff --git a/.env.libre b/.env.libre
@@ -36,7 +36,7 @@ HAPI_HASURA_ADMIN_SECRET=myadminsecretkey
 HAPI_SERVER_PORT=9090
 HAPI_SERVER_ADDRESS=hapi
 HAPI_DATABASE_URL=postgres://eoscr:password@postgres:5432/localdb
-HAPI_SYNC_PRODUCERS_INTERVAL=86400
+HAPI_SYNC_PRODUCERS_INTERVAL=14400
 HAPI_SYNC_PRODUCER_INFO_INTERVAL=1
 HAPI_SYNC_PRODUCER_CPU_INTERVAL=6
 HAPI_SYNC_EXCHANGE_RATE=86400

diff --git a/.env.libretestnet b/.env.libretestnet
@@ -36,7 +36,7 @@ HAPI_HASURA_ADMIN_SECRET=myadminsecretkey
 HAPI_SERVER_PORT=9090
 HAPI_SERVER_ADDRESS=hapi
 HAPI_DATABASE_URL=postgres://eoscr:password@postgres:5432/localdb
-HAPI_SYNC_PRODUCERS_INTERVAL=86400
+HAPI_SYNC_PRODUCERS_INTERVAL=14400
 HAPI_SYNC_PRODUCER_INFO_INTERVAL=1
 HAPI_SYNC_PRODUCER_CPU_INTERVAL=6
 HAPI_SYNC_EXCHANGE_RATE=86400

diff --git a/.env.local b/.env.local
@@ -36,7 +36,7 @@ HAPI_HASURA_URL=http://hasura:8080/v1/graphql
 HAPI_HASURA_ADMIN_SECRET=myadminsecretkey
 HAPI_SERVER_PORT=9090
 HAPI_SERVER_ADDRESS=hapi
-HAPI_SYNC_PRODUCERS_INTERVAL=86400
+HAPI_SYNC_PRODUCERS_INTERVAL=14400
 HAPI_SYNC_PRODUCER_INFO_INTERVAL=1
 HAPI_SYNC_PRODUCER_CPU_INTERVAL=6
 HAPI_EOS_EXCHANGE_RATE_API=

diff --git a/.env.mainnet b/.env.mainnet
@@ -36,7 +36,7 @@ HAPI_HASURA_ADMIN_SECRET=myadminsecretkey
 HAPI_SERVER_PORT=9090
 HAPI_SERVER_ADDRESS=hapi
 HAPI_DATABASE_URL=postgres://eoscr:password@postgres:5432/localdb
-HAPI_SYNC_PRODUCERS_INTERVAL=86400
+HAPI_SYNC_PRODUCERS_INTERVAL=14400
 HAPI_SYNC_PRODUCER_INFO_INTERVAL=1
 HAPI_SYNC_PRODUCER_CPU_INTERVAL=0
 HAPI_SYNC_EXCHANGE_RATE=86400

diff --git a/.env.proton b/.env.proton
@@ -36,7 +36,7 @@ HAPI_HASURA_ADMIN_SECRET=myadminsecretkey
 HAPI_SERVER_PORT=9090
 HAPI_SERVER_ADDRESS=hapi
 HAPI_DATABASE_URL=postgres://eoscr:password@postgres:5432/localdb
-HAPI_SYNC_PRODUCERS_INTERVAL=86400
+HAPI_SYNC_PRODUCERS_INTERVAL=14400
 HAPI_SYNC_PRODUCER_INFO_INTERVAL=1
 HAPI_SYNC_PRODUCER_CPU_INTERVAL=6
 HAPI_SYNC_EXCHANGE_RATE=86400

diff --git a/.env.protontestnet b/.env.protontestnet
@@ -36,7 +36,7 @@ HAPI_HASURA_ADMIN_SECRET=myadminsecretkey
 HAPI_SERVER_PORT=9090
 HAPI_SERVER_ADDRESS=hapi
 HAPI_DATABASE_URL=postgres://eoscr:password@postgres:5432/localdb
-HAPI_SYNC_PRODUCERS_INTERVAL=86400
+HAPI_SYNC_PRODUCERS_INTERVAL=14400
 HAPI_SYNC_PRODUCER_INFO_INTERVAL=1
 HAPI_SYNC_PRODUCER_CPU_INTERVAL=6
 HAPI_SYNC_EXCHANGE_RATE=86400

diff --git a/.env.telos b/.env.telos
@@ -36,7 +36,7 @@ HAPI_HASURA_ADMIN_SECRET=myadminsecretkey
 HAPI_SERVER_PORT=9090
 HAPI_SERVER_ADDRESS=hapi
 HAPI_DATABASE_URL=postgres://eoscr:password@postgres:5432/localdb
-HAPI_SYNC_PRODUCERS_INTERVAL=86400
+HAPI_SYNC_PRODUCERS_INTERVAL=14400
 HAPI_SYNC_PRODUCER_INFO_INTERVAL=1
 HAPI_SYNC_PRODUCER_CPU_INTERVAL=6
 HAPI_EOS_EXCHANGE_RATE_API=https://api.coingecko.com/api/v3/simple/price?ids=telos&vs_currencies=usd

diff --git a/.env.telostestnet b/.env.telostestnet
@@ -20,7 +20,7 @@ HASURA_GRAPHQL_ACTION_BASE_URL=http://hapi:9090
 
 # hapi
 HAPI_EOS_API_NETWORK_NAME=telos
-HAPI_EOS_API_ENDPOINT=testnet.telos.caleos.io:9879
+HAPI_EOS_API_ENDPOINT=testnet.telos.caleos.io
 HAPI_EOS_API_CHAIN_ID=1eaa0824707c8c16bd25145493bf062aecddfeb56c736f6ba6397f3195f33c9f
 HAPI_EOS_BASE_ACCOUNT=eosmechatero
 HAPI_EOS_BASE_ACCOUNT_PASSWORD=PW...
@@ -71,7 +71,7 @@ REACT_APP_HASURA_URL=http://localhost:8080/v1/graphql
 REACT_APP_EOS_API_NETWORK_NAME=telos-testnet
 REACT_APP_EOS_API_NETWORK_LABEL=Telos Testnet
 REACT_APP_EOS_API_NETWORK_LOGO=https://eosio.online/images/telos.jpg
-REACT_APP_EOS_API_HOST=testnet.telos.caleos.io:9879
+REACT_APP_EOS_API_HOST=testnet.telos.caleos.io
 REACT_APP_EOS_API_PORT=443
 REACT_APP_EOS_API_PROTOCOL=https
 REACT_APP_EOS_CHAIN_ID=1eaa0824707c8c16bd25145493bf062aecddfeb56c736f6ba6397f3195f33c9f

diff --git a/.env.ultratestnet b/.env.ultratestnet
@@ -40,7 +40,7 @@ HAPI_HASURA_ADMIN_SECRET=myadminsecretkey
 HAPI_SERVER_PORT=9090
 HAPI_SERVER_ADDRESS=hapi
 HAPI_DATABASE_URL=postgres://eoscr:password@postgres:5432/localdb
-HAPI_SYNC_PRODUCERS_INTERVAL=86400
+HAPI_SYNC_PRODUCERS_INTERVAL=14400
 HAPI_SYNC_PRODUCER_INFO_INTERVAL=1
 HAPI_SYNC_PRODUCER_CPU_INTERVAL=6
 HAPI_SYNC_EXCHANGE_RATE=86400

diff --git a/.env.waxtestnet b/.env.waxtestnet
@@ -36,7 +36,7 @@ HAPI_HASURA_ADMIN_SECRET=myadminsecretkey
 HAPI_SERVER_PORT=9090
 HAPI_SERVER_ADDRESS=hapi
 HAPI_DATABASE_URL=postgres://eoscr:password@postgres:5432/localdb
-HAPI_SYNC_PRODUCERS_INTERVAL=86400
+HAPI_SYNC_PRODUCERS_INTERVAL=14400
 HAPI_SYNC_PRODUCER_INFO_INTERVAL=1
 HAPI_SYNC_PRODUCER_CPU_INTERVAL=6
 HAPI_SYNC_EXCHANGE_RATE=86400

diff --git a/.github/workflows/deploy-jungle-testnet.yaml b/.github/workflows/deploy-jungle-testnet.yaml
@@ -96,7 +96,7 @@ jobs:
           HAPI_SERVER_PORT: 9090
           HAPI_SERVER_ADDRESS: '0.0.0.0'
           HAPI_DATABASE_URL: ${{ secrets.HAPI_DATABASE_URL }}
-          HAPI_SYNC_PRODUCERS_INTERVAL: 86400
+          HAPI_SYNC_PRODUCERS_INTERVAL: '14400'
           HAPI_SYNC_PRODUCER_INFO_INTERVAL: 1
           HAPI_SYNC_PRODUCER_CPU_INTERVAL: 6
           HAPI_SYNC_EXCHANGE_RATE: 86400

diff --git a/.github/workflows/deploy-lacchain.yaml b/.github/workflows/deploy-lacchain.yaml
@@ -102,7 +102,7 @@ jobs:
           HAPI_SERVER_ADDRESS: '0.0.0.0'
           HAPI_SERVER_PORT: '9090'
           HAPI_DATABASE_URL: ${{ secrets.HAPI_DATABASE_URL }}
-          HAPI_SYNC_PRODUCERS_INTERVAL: '86400'
+          HAPI_SYNC_PRODUCERS_INTERVAL: '14400'
           HAPI_SYNC_PRODUCER_CPU_INTERVAL: '6'
           HAPI_SYNC_PRODUCER_INFO_INTERVAL: '1'
           HAPI_SYNC_SCHEDULE_HISTORY_INTERVAL: 86400

diff --git a/.github/workflows/deploy-libre-testnet.yaml b/.github/workflows/deploy-libre-testnet.yaml
@@ -105,7 +105,7 @@ jobs:
           HAPI_SERVER_PORT: '9090'
           HAPI_SERVER_ADDRESS: '0.0.0.0'
           HAPI_DATABASE_URL: ${{ secrets.HAPI_DATABASE_URL }}
-          HAPI_SYNC_PRODUCERS_INTERVAL: '86400'
+          HAPI_SYNC_PRODUCERS_INTERVAL: '14400'
           HAPI_SYNC_PRODUCER_CPU_INTERVAL: '6'
           HAPI_SYNC_PRODUCER_INFO_INTERVAL: '1'
           HAPI_SYNC_SCHEDULE_HISTORY_INTERVAL: 86400

diff --git a/.github/workflows/deploy-libre.yaml b/.github/workflows/deploy-libre.yaml
@@ -104,7 +104,7 @@ jobs:
           HAPI_SERVER_PORT: '9090'
           HAPI_SERVER_ADDRESS: '0.0.0.0'
           HAPI_DATABASE_URL: ${{ secrets.HAPI_DATABASE_URL }}
-          HAPI_SYNC_PRODUCERS_INTERVAL: '86400'
+          HAPI_SYNC_PRODUCERS_INTERVAL: '14400'
           HAPI_SYNC_PRODUCER_CPU_INTERVAL: '6'
           HAPI_SYNC_PRODUCER_INFO_INTERVAL: '1'
           HAPI_SYNC_SCHEDULE_HISTORY_INTERVAL: 86400

diff --git a/.github/workflows/deploy-mainnet.yaml b/.github/workflows/deploy-mainnet.yaml
@@ -95,7 +95,7 @@ jobs:
           HAPI_SERVER_PORT: '9090'
           HAPI_SERVER_ADDRESS: '0.0.0.0'
           HAPI_DATABASE_URL: ${{ secrets.HAPI_DATABASE_URL }}
-          HAPI_SYNC_PRODUCERS_INTERVAL: '86400'
+          HAPI_SYNC_PRODUCERS_INTERVAL: '14400'
           HAPI_SYNC_PRODUCER_INFO_INTERVAL: '1'
           HAPI_SYNC_PRODUCER_CPU_INTERVAL: '6'
           HAPI_SYNC_SCHEDULE_HISTORY_INTERVAL: 86400

diff --git a/.github/workflows/deploy-proton-testnet.yaml b/.github/workflows/deploy-proton-testnet.yaml
@@ -101,7 +101,7 @@ jobs:
           HAPI_SERVER_PORT: '9090'
           HAPI_SERVER_ADDRESS: '0.0.0.0'
           HAPI_DATABASE_URL: ${{ secrets.HAPI_DATABASE_URL }}
-          HAPI_SYNC_PRODUCERS_INTERVAL: '86400'
+          HAPI_SYNC_PRODUCERS_INTERVAL: '14400'
           HAPI_SYNC_PRODUCER_CPU_INTERVAL: '6'
           HAPI_SYNC_PRODUCER_INFO_INTERVAL: '1'
           HAPI_SYNC_SCHEDULE_HISTORY_INTERVAL: 86400

diff --git a/.github/workflows/deploy-proton.yaml b/.github/workflows/deploy-proton.yaml
@@ -101,7 +101,7 @@ jobs:
           HAPI_SERVER_PORT: '9090'
           HAPI_SERVER_ADDRESS: '0.0.0.0'
           HAPI_DATABASE_URL: ${{ secrets.HAPI_DATABASE_URL }}
-          HAPI_SYNC_PRODUCERS_INTERVAL: '86400'
+          HAPI_SYNC_PRODUCERS_INTERVAL: '14400'
           HAPI_SYNC_PRODUCER_CPU_INTERVAL: '6'
           HAPI_SYNC_PRODUCER_INFO_INTERVAL: '1'
           HAPI_SYNC_SCHEDULE_HISTORY_INTERVAL: 86400

diff --git a/.github/workflows/deploy-telos-testnet.yaml b/.github/workflows/deploy-telos-testnet.yaml
@@ -49,7 +49,7 @@ jobs:
           REACT_APP_EOS_API_NETWORK_NAME: 'telos-testnet'
           REACT_APP_EOS_API_NETWORK_LABEL: 'Telos Testnet'
           REACT_APP_EOS_API_NETWORK_LOGO: 'https://eosio.online/images/telos.jpg'
-          REACT_APP_EOS_API_HOST: 'testnet.telos.caleos.io:9879'
+          REACT_APP_EOS_API_HOST: 'testnet.telos.caleos.io'
           REACT_APP_EOS_API_PORT: '443'
           REACT_APP_EOS_API_PROTOCOL: 'https'
           REACT_APP_EOS_CHAIN_ID: '1eaa0824707c8c16bd25145493bf062aecddfeb56c736f6ba6397f3195f33c9f'
@@ -85,7 +85,7 @@ jobs:
           POSTGRES_DB: ${{ secrets.POSTGRES_DB }}
           POSTGRES_DATA: ${{ secrets.POSTGRES_DATA }}
           # hapi
-          HAPI_EOS_API_ENDPOINT: testnet.telos.caleos.io:9879
+          HAPI_EOS_API_ENDPOINT: testnet.telos.caleos.io
           HAPI_EOS_API_CHAIN_ID: 1eaa0824707c8c16bd25145493bf062aecddfeb56c736f6ba6397f3195f33c9f
           HAPI_EOS_BASE_ACCOUNT: ${{ secrets.HAPI_EOS_BASE_ACCOUNT }}
           HAPI_EOS_BASE_ACCOUNT_PASSWORD: ${{ secrets.HAPI_EOS_BASE_ACCOUNT_PASSWORD }}

diff --git a/.github/workflows/deploy-telos.yaml b/.github/workflows/deploy-telos.yaml
@@ -101,7 +101,7 @@ jobs:
           HAPI_SERVER_PORT: '9090'
           HAPI_SERVER_ADDRESS: '0.0.0.0'
           HAPI_DATABASE_URL: ${{ secrets.HAPI_DATABASE_URL }}
-          HAPI_SYNC_PRODUCERS_INTERVAL: '86400'
+          HAPI_SYNC_PRODUCERS_INTERVAL: '14400'
           HAPI_SYNC_PRODUCER_CPU_INTERVAL: '6'
           HAPI_SYNC_PRODUCER_INFO_INTERVAL: '1'
           HAPI_SYNC_SCHEDULE_HISTORY_INTERVAL: 86400

diff --git a/.github/workflows/deploy-ultra-testnet.yaml b/.github/workflows/deploy-ultra-testnet.yaml
@@ -107,7 +107,7 @@ jobs:
           HAPI_SERVER_PORT: '9090'
           HAPI_SERVER_ADDRESS: '0.0.0.0'
           HAPI_DATABASE_URL: ${{ secrets.HAPI_DATABASE_URL }}
-          HAPI_SYNC_PRODUCERS_INTERVAL: '86400'
+          HAPI_SYNC_PRODUCERS_INTERVAL: '14400'
           HAPI_SYNC_PRODUCER_CPU_INTERVAL: '6'
           HAPI_SYNC_PRODUCER_INFO_INTERVAL: '1'
           HAPI_SYNC_SCHEDULE_HISTORY_INTERVAL: 86400

diff --git a/.github/workflows/deploy-wax-testnet.yaml b/.github/workflows/deploy-wax-testnet.yaml
@@ -101,7 +101,7 @@ jobs:
           HAPI_SERVER_PORT: '9090'
           HAPI_SERVER_ADDRESS: '0.0.0.0'
           HAPI_DATABASE_URL: ${{ secrets.HAPI_DATABASE_URL }}
-          HAPI_SYNC_PRODUCERS_INTERVAL: '86400'
+          HAPI_SYNC_PRODUCERS_INTERVAL: '14400'
           HAPI_SYNC_PRODUCER_CPU_INTERVAL: '6'
           HAPI_SYNC_PRODUCER_INFO_INTERVAL: '1'
           HAPI_SYNC_SCHEDULE_HISTORY_INTERVAL: 86400

diff --git a/.github/workflows/deploy-wax.yaml b/.github/workflows/deploy-wax.yaml
@@ -101,7 +101,7 @@ jobs:
           HAPI_SERVER_PORT: '9090'
           HAPI_SERVER_ADDRESS: '0.0.0.0'
           HAPI_DATABASE_URL: ${{ secrets.HAPI_DATABASE_URL }}
-          HAPI_SYNC_PRODUCERS_INTERVAL: '86400'
+          HAPI_SYNC_PRODUCERS_INTERVAL: '14400'
           HAPI_SYNC_PRODUCER_CPU_INTERVAL: '6'
           HAPI_SYNC_PRODUCER_INFO_INTERVAL: '1'
           HAPI_SYNC_SCHEDULE_HISTORY_INTERVAL: 86400

diff --git a/hapi/src/config/workers.config.js b/hapi/src/config/workers.config.js
@@ -1,6 +1,6 @@
 module.exports = {
   syncProducersInterval: parseInt(
-    process.env.HAPI_SYNC_PRODUCERS_INTERVAL || 86400
+    process.env.HAPI_SYNC_PRODUCERS_INTERVAL || 14400
   ),
   syncProducerInfoInterval: parseInt(
     process.env.HAPI_SYNC_PRODUCER_INFO_INTERVAL || 1

diff --git a/hapi/src/services/eosio.service.js b/hapi/src/services/eosio.service.js
@@ -42,10 +42,19 @@ const getProducers = async () => {
 
   producers = await Promise.all(
     producers.map(async (producer, index) => {
-      const bpJson = await getBPJson(producer)
+      const producerUrl = getProducerUrl(producer)
+      const chains = await getChains(producerUrl)
+      const chainUrl = chains[eosConfig.chainId] || '/bp.json'
+      const bpJson = await getBPJson(producerUrl, chainUrl)
       const healthStatus = getProducerHealthStatus(bpJson)
-      const nodes = await getNodes(bpJson)
-      const endpoints = producerUtil.getEndpoints(bpJson.nodes)
+
+      let nodes = []
+      let endpoints = { api: [], ssl: [], p2p: [] }
+
+      if (chains[eosConfig.chainId]) {
+        nodes = await getNodes(bpJson)
+        endpoints = producerUtil.getEndpoints(bpJson.nodes)
+      }
 
       return {
         endpoints,
@@ -149,54 +158,46 @@ const getExpectedRewards = async (producers, totalVotes) => {
     )
 }
 
-const getBPJson = async (producer) => {
-  const bpJsonUrl = await getBPJsonUrl(producer)
+const getBPJson = async (producerUrl, chainUrl) => {
+  const bpJsonUrl = `${producerUrl}/${chainUrl}`.replace(
+    /(?<=:\/\/.*)((\/\/))/,
+    '/'
+  )
   let bpJson = {}
 
   try {
     const { data: _bpJson } = await axiosUtil.instance.get(bpJsonUrl)
-    bpJson = _bpJson || bpJson
 
-    if (typeof bpJson !== 'object') {
-      bpJson = {}
-    }
+    bpJson = !!_bpJson && typeof _bpJson === 'object' ? _bpJson : bpJson
   } catch (error) {}
 
   return bpJson
 }
 
-const getBPJsonUrl = async (producer = {}) => {
+const getProducerUrl = (producer) => {
   let producerUrl = producer.url || ''
 
   if (!producerUrl.startsWith('http')) {
     producerUrl = `http://${producerUrl}`
   }
 
-  if (producerUrl === 'http://infinitystones.io') {
-    producerUrl = 'https://infinitystones.io'
-  }
-
-  if (producer.owner === 'eosauthority') {
-    producerUrl =
-      'https://ipfs.edenia.cloud/ipfs/QmVDRzUbnJLLM27nBw4FPWveaZ4ukHXAMZRzkbRiTZGdnH'
-
-    return producerUrl
-  }
+  return producerUrl
+}
 
+const getChains = async (producerUrl) => {
   const chainsUrl = `${producerUrl}/chains.json`.replace(
     /(?<=:\/\/.*)((\/\/))/,
     '/'
   )
-  let chainUrl = '/bp.json'
 
   try {
     const {
       data: { chains }
     } = await axiosUtil.instance.get(chainsUrl)
-    chainUrl = chains[eosConfig.chainId] || chainUrl
-  } catch (error) {}
-
-  return `${producerUrl}/${chainUrl}`.replace(/(?<=:\/\/.*)((\/\/))/, '/')
+    return chains ?? {}
+  } catch (error) {
+    return {}
+  }
 }
 
 const getProducerHealthStatus = (bpJson) => {