Merge pull request #1293 from edenia/dev

Production Release
edenia · Sep 8, 2023 · d0d3cb5 · d0d3cb5
2 parents f439b4a + 3e1b7e5
commit d0d3cb5
Show file tree

Hide file tree

Showing 41 changed files with 643 additions and 351 deletions.
diff --git a/.github/workflows/deploy-proton-testnet.yaml b/.github/workflows/deploy-proton-testnet.yaml
@@ -56,7 +56,7 @@ jobs:
           REACT_APP_SYNC_TOLERANCE_INTERVAL: 180000
           REACT_APP_TOKEN_SYMBOL: 'XPR'
           REACT_APP_NETWORK_URL:  '[{"label":"EOS","value":"https://eos.antelope.tools","mainnet":true,"pair":"eos","icon":"eos","order":5},{"label":"Proton","value":"https://proton.antelope.tools","mainnet":true,"pair":"proton","icon":"proton","order":3},{"label":"WAX","value":"https://wax.antelope.tools","mainnet":true,"pair":"wax","icon":"wax","order":4},{"label":"Telos","value":"https://telos.antelope.tools","mainnet":true,"pair":"telos","icon":"telos","order":1},{"label":"Libre","value":"https://libre.antelope.tools","mainnet":true,"pair":"libre","icon":"libre","order":2},{"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":5},{"label":"Proton Testnet","value":"https://proton-testnet.antelope.tools","mainnet":false,"pair":"proton","icon":"proton","order":3},{"label":"WAX Testnet","value":"https://wax-testnet.antelope.tools","mainnet":false,"pair":"wax","icon":"wax","order":4},{"label":"Telos Testnet","value":"https://telos-testnet.antelope.tools","mainnet":false,"pair":"telos","icon":"telos","order":1},{"label":"Libre Testnet","value":"https://libre-testnet.antelope.tools","mainnet":false,"pair":"libre","icon":"libre","order":2},{"label":"Ultra Testnet","value":"https://ultra-testnet.antelope.tools","mainnet":false,"pair":"ultra","icon":"ultra","order":6}]'
-          REACT_APP_DISABLED_MENU_ITEMS: '["/missed-blocks","/block-distribution","/cpu-benchmark","/stress-test","/evm","/evm-rpc-endpoints"]'
+          REACT_APP_DISABLED_MENU_ITEMS: '["/missed-blocks","/block-distribution","/stress-test","/evm","/evm-rpc-endpoints"]'
           REACT_APP_BLOCK_EXPLORER_URL: 'https://testnet.protonscan.io/transaction/(transaction)'
           REACT_APP_STATE_HISTORY_ENABLED: 'false'
           REACT_APP_GOOGLE_ANALITIC_PAGE_ID: 'G-E6Y0EC9FT8'
@@ -86,6 +86,7 @@ jobs:
           HAPI_EOS_BASE_ACCOUNT_PASSWORD: ${{ secrets.HAPI_EOS_BASE_ACCOUNT_PASSWORD }}
           HAPI_EOS_MECHANICS_ACCOUNT: ${{ secrets.HAPI_EOS_MECHANICS_ACCOUNT }}
           HAPI_EOS_MECHANICS_PASSWORD: ${{ secrets.HAPI_EOS_MECHANICS_PASSWORD }}
+          HAPI_EOS_MECHANICS_CUSTOM_PERMISSION: 'benchmark'
           HAPI_EOS_WALLET_URL: http://dashboard-wallet:8888
           HAPI_EOS_BP_JSON_ON_CHAIN: 'false'
           HAPI_EOS_BP_JSON_ON_CHAIN_CONTRACT: producerjson

diff --git a/.github/workflows/deploy-proton.yaml b/.github/workflows/deploy-proton.yaml
@@ -56,7 +56,7 @@ jobs:
           REACT_APP_SYNC_TOLERANCE_INTERVAL: 180000
           REACT_APP_TOKEN_SYMBOL: 'XPR'
           REACT_APP_NETWORK_URL:  '[{"label":"EOS","value":"https://eos.antelope.tools","mainnet":true,"pair":"eos","icon":"eos","order":5},{"label":"Proton","value":"https://proton.antelope.tools","mainnet":true,"pair":"proton","icon":"proton","order":3},{"label":"WAX","value":"https://wax.antelope.tools","mainnet":true,"pair":"wax","icon":"wax","order":4},{"label":"Telos","value":"https://telos.antelope.tools","mainnet":true,"pair":"telos","icon":"telos","order":1},{"label":"Libre","value":"https://libre.antelope.tools","mainnet":true,"pair":"libre","icon":"libre","order":2},{"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":5},{"label":"Proton Testnet","value":"https://proton-testnet.antelope.tools","mainnet":false,"pair":"proton","icon":"proton","order":3},{"label":"WAX Testnet","value":"https://wax-testnet.antelope.tools","mainnet":false,"pair":"wax","icon":"wax","order":4},{"label":"Telos Testnet","value":"https://telos-testnet.antelope.tools","mainnet":false,"pair":"telos","icon":"telos","order":1},{"label":"Libre Testnet","value":"https://libre-testnet.antelope.tools","mainnet":false,"pair":"libre","icon":"libre","order":2},{"label":"Ultra Testnet","value":"https://ultra-testnet.antelope.tools","mainnet":false,"pair":"ultra","icon":"ultra","order":6}]'
-          REACT_APP_DISABLED_MENU_ITEMS: '["/missed-blocks","/block-distribution","/cpu-benchmark","/stress-test","/evm","/evm-rpc-endpoints"]'
+          REACT_APP_DISABLED_MENU_ITEMS: '["/missed-blocks","/block-distribution","/stress-test","/evm","/evm-rpc-endpoints"]'
           REACT_APP_BLOCK_EXPLORER_URL: 'https://www.protonscan.io/transaction/(transaction)'
           REACT_APP_STATE_HISTORY_ENABLED: 'false'
           REACT_APP_GOOGLE_ANALITIC_PAGE_ID: 'G-E6Y0EC9FT8'
@@ -86,6 +86,7 @@ jobs:
           HAPI_EOS_BASE_ACCOUNT_PASSWORD: ${{ secrets.HAPI_EOS_BASE_ACCOUNT_PASSWORD }}
           HAPI_EOS_MECHANICS_ACCOUNT: ${{ secrets.HAPI_EOS_MECHANICS_ACCOUNT }}
           HAPI_EOS_MECHANICS_PASSWORD: ${{ secrets.HAPI_EOS_MECHANICS_PASSWORD }}
+          HAPI_EOS_MECHANICS_CUSTOM_PERMISSION: 'benchmark'
           HAPI_EOS_WALLET_URL: http://dashboard-wallet:8888
           HAPI_EOS_BP_JSON_ON_CHAIN: 'false'
           HAPI_EOS_BP_JSON_ON_CHAIN_CONTRACT: producerjson

diff --git a/hapi/src/services/stats.service.js b/hapi/src/services/stats.service.js
@@ -69,8 +69,20 @@ const getNodesSummary = async () => {
       type
   `)
 
-  rows.forEach((row) => {
-    payload[row.node_type || 'unknown'] = row.nodes_count
+  rows.forEach(row => {
+    let nodeType = row.node_type || 'unknown'
+
+    if (Array.isArray(nodeType)) {
+      nodeType = nodeType.map(type => (type === 'p2p' ? 'seed' : type))
+      nodeType.sort()
+    }
+
+    if (payload[nodeType]) {
+      payload[nodeType] += row.nodes_count
+    } else {
+      payload[nodeType] = row.nodes_count
+    }
+
     total += row.nodes_count
   })
 

diff --git a/webapp/public/sitemap.airwire-testnet.xml b/webapp/public/sitemap.airwire-testnet.xml
@@ -2,46 +2,46 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
    <url>
       <loc>https://dashboard.airwire-testnet.io/</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://dashboard.airwire-testnet.io/block-producers</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://dashboard.airwire-testnet.io/nodes</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://dashboard.airwire-testnet.io/endpoints</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://dashboard.airwire-testnet.io/nodes-distribution</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://dashboard.airwire-testnet.io/rewards-distribution</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://dashboard.airwire-testnet.io/ricardian-contract</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://dashboard.airwire-testnet.io/accounts</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://dashboard.airwire-testnet.io/bpjson</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://dashboard.airwire-testnet.io/about</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://dashboard.airwire-testnet.io/help</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
 </urlset>
diff --git a/webapp/public/sitemap.airwire.xml b/webapp/public/sitemap.airwire.xml
@@ -2,46 +2,46 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
    <url>
       <loc>https://dashboard.airwire.io/</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://dashboard.airwire.io/block-producers</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://dashboard.airwire.io/nodes</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://dashboard.airwire.io/endpoints</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://dashboard.airwire.io/nodes-distribution</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://dashboard.airwire.io/rewards-distribution</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://dashboard.airwire.io/ricardian-contract</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://dashboard.airwire.io/accounts</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://dashboard.airwire.io/bpjson</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://dashboard.airwire.io/about</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://dashboard.airwire.io/help</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
 </urlset>
diff --git a/webapp/public/sitemap.jungle.xml b/webapp/public/sitemap.jungle.xml
@@ -1,54 +1,54 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
    <url>
       <loc>https://jungle.antelope.tools/</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://jungle.antelope.tools/block-producers</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://jungle.antelope.tools/nodes</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://jungle.antelope.tools/endpoints</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://jungle.antelope.tools/nodes-distribution</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://jungle.antelope.tools/rewards-distribution</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://jungle.antelope.tools/endpoints-stats</loc>
-      <lastmod>2023-04-25</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://jungle.antelope.tools/undiscoverable-bps</loc>
-      <lastmod>2023-01-19</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://jungle.antelope.tools/ricardian-contract</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://jungle.antelope.tools/accounts</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://jungle.antelope.tools/bpjson</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://jungle.antelope.tools/about</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://jungle.antelope.tools/help</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
 </urlset>
diff --git a/webapp/public/sitemap.lacchain.xml b/webapp/public/sitemap.lacchain.xml
@@ -1,66 +1,66 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
    <url>
       <loc>https://lacchain.antelope.tools/</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://lacchain.antelope.tools/entities</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://lacchain.antelope.tools/nodes</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://lacchain.antelope.tools/endpoints</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://lacchain.antelope.tools/endpoints-stats</loc>
       <lastmod>2023-04-25</lastmod>
    </url>
    <url>
       <loc>https://lacchain.antelope.tools/lacchain/network</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://lacchain.antelope.tools/nodes-distribution</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://lacchain.antelope.tools/block-distribution</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://lacchain.antelope.tools/missed-blocks</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://lacchain.antelope.tools/cpu-benchmark</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://lacchain.antelope.tools/ricardian-contract</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://lacchain.antelope.tools/accounts</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://lacchain.antelope.tools/management</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://lacchain.antelope.tools/node-config</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://lacchain.antelope.tools/about</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
    <url>
       <loc>https://lacchain.antelope.tools/help</loc>
-      <lastmod>2022-10-20</lastmod>
+      <lastmod>2023-09-07</lastmod>
    </url>
 </urlset>