Merge pull request #1219 from edenia/dev

Production release
edenia · Jun 20, 2023 · 6c22565 · 6c22565
2 parents 3d0663f + 2aa8403
commit 6c22565
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/deploy-libre-testnet.yaml b/.github/workflows/deploy-libre-testnet.yaml
@@ -58,7 +58,7 @@ jobs:
           REACT_APP_NETWORK_URL:  '[{"label":"EOS","value":"https://eos.antelope.tools","mainnet":true,"pair":"eos","icon":"eos","order":1},{"label":"Proton","value":"https://proton.antelope.tools","mainnet":true,"pair":"proton","icon":"proton","order":2},{"label":"WAX","value":"https://wax.antelope.tools","mainnet":true,"pair":"wax","icon":"wax","order":3},{"label":"Telos","value":"https://telos.antelope.tools","mainnet":true,"pair":"telos","icon":"telos","order":4},{"label":"Libre","value":"https://libre.antelope.tools","mainnet":true,"pair":"libre","icon":"libre","order":5},{"label":"LACChain EOSIO","value":"https://lacchain.antelope.tools","mainnet":true,"pair":null,"icon":"lacchain","order":6},{"label":"Jungle4 Testnet","value":"https://jungle.antelope.tools","mainnet":false,"pair":"eos","icon":"jungle","order":1},{"label":"Proton Testnet","value":"https://proton-testnet.antelope.tools","mainnet":false,"pair":"proton","icon":"proton","order":2},{"label":"WAX Testnet","value":"https://wax-testnet.antelope.tools","mainnet":false,"pair":"wax","icon":"wax","order":3},{"label":"Telos Testnet","value":"https://telos-testnet.antelope.tools","mainnet":false,"pair":"telos","icon":"telos","order":4},{"label":"Libre Testnet","value":"https://libre-testnet.antelope.tools","mainnet":false,"pair":"libre","icon":"libre","order":5},{"label":"Ultra Testnet","value":"https://ultra-testnet.antelope.tools","mainnet":false,"pair":"ultra","icon":"ultra","order":6}]'
           REACT_APP_DISABLED_MENU_ITEMS: '["/missed-blocks"]'
           REACT_APP_BLOCK_EXPLORER_URL: 'https://libre-testnet-explorer.edenia.cloud/transaction/(transaction)'
-          REACT_APP_STATE_HISTORY_ENABLED: 'false'
+          REACT_APP_STATE_HISTORY_ENABLED: 'true'
           REACT_APP_GOOGLE_ANALITIC_PAGE_ID: 'G-E6Y0EC9FT8'
           REACT_APP_PUBLIC_RE_CAPTCHA_KEY: ${{ secrets.REACT_APP_PUBLIC_RE_CAPTCHA_KEY }}
 
@@ -83,6 +83,7 @@ jobs:
           HAPI_EOS_API_NETWORK_NAME: libre
           HAPI_EOS_API_ENDPOINTS: '["https://libre-testnet.edenia.cloud","https://api.testnet.libre.cryptobloks.io","https://libre-testnet.eosphere.io"]'
           HAPI_EOS_STATE_HISTORY_PLUGIN_ENDPOINT: 'ws://api-node.libre-testnet:8080'
+          HAPI_EOS_MISSED_BLOCKS_ENABLED: 'false'
           HAPI_EOS_BLOCK_HISTORY_DAYS: 90
           HAPI_EOS_API_CHAIN_ID: b64646740308df2ee06c6b72f34c0f7fa066d940e831f752db2006fcc2b78dee
           HAPI_EOS_BASE_ACCOUNT: ${{ secrets.HAPI_EOS_BASE_ACCOUNT }}

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -69,6 +69,7 @@ services:
       HAPI_EOSRATE_GET_STATS_USER: '${HAPI_EOSRATE_GET_STATS_USER}'
       HAPI_EOSRATE_GET_STATS_PASSWORD: '${HAPI_EOSRATE_GET_STATS_PASSWORD}'
       HAPI_EOS_BLOCK_HISTORY_DAYS: '${HAPI_EOS_BLOCK_HISTORY_DAYS}'
+      HAPI_EOS_MISSED_BLOCKS_ENABLED: '${HAPI_EOS_MISSED_BLOCKS_ENABLED}'
   hasura:
     container_name: '${STAGE}-${APP_NAME}-hasura'
     image: hasura/graphql-engine:v2.16.0.cli-migrations-v3

diff --git a/hapi/src/config/eos.config.js b/hapi/src/config/eos.config.js
@@ -8,6 +8,8 @@ module.exports = {
     : '',
   stateHistoryPluginEndpoint:
     process.env.HAPI_EOS_STATE_HISTORY_PLUGIN_ENDPOINT,
+  missedBlocksServiceEnabled:
+    Boolean(process.env.HAPI_EOS_MISSED_BLOCKS_ENABLED) || false,
   keepBlockHistoryForDays:
     parseInt(process.env.HAPI_EOS_BLOCK_HISTORY_DAYS) || 0,
   chainId: process.env.HAPI_EOS_API_CHAIN_ID,

diff --git a/hapi/src/workers/producers.worker.js b/hapi/src/workers/producers.worker.js
@@ -68,8 +68,12 @@ const start = async () => {
   if (eosConfig.stateHistoryPluginEndpoint) {
     run('BLOCK HISTORY CLEANUP', stateHistoryPluginService.cleanOldBlocks, 43200)
     run('SYNC BLOCK HISTORY', stateHistoryPluginService.init)
-    run('SYNC MISSED BLOCKS', missedBlocksService.syncMissedBlocks)
-    run('SYNC MISSED BLOCKS PER PRODUCER', statsService.getCurrentMissedBlock)
+
+    if (eosConfig.missedBlocksServiceEnabled) {
+      run('SYNC MISSED BLOCKS', missedBlocksService.syncMissedBlocks)
+      run('SYNC MISSED BLOCKS PER PRODUCER', statsService.getCurrentMissedBlock)
+    }
+
     run('SYNC SCHEDULE HISTORY', demuxService.init)
     run('SYNC TPS', statsService.syncTPSAllTimeHigh)
     run(

diff --git a/kubernetes/configmap-dashboard.yaml b/kubernetes/configmap-dashboard.yaml
@@ -97,6 +97,7 @@ data:
   HAPI_EOSRATE_GET_STATS_USER: '${HAPI_EOSRATE_GET_STATS_USER}'
   HAPI_EOSRATE_GET_STATS_PASSWORD: '${HAPI_EOSRATE_GET_STATS_PASSWORD}'
   HAPI_EOS_BLOCK_HISTORY_DAYS: '${HAPI_EOS_BLOCK_HISTORY_DAYS}'
+  HAPI_EOS_MISSED_BLOCKS_ENABLED: '${HAPI_EOS_MISSED_BLOCKS_ENABLED}'
 ---
 apiVersion: v1
 kind: ConfigMap