Merge pull request #1411 from edenia/dev

Production Release
edenia · Jul 3, 2024 · 6f37815 · 6f37815
2 parents bb28bc4 + 274ede2
commit 6f37815
Show file tree

Hide file tree

Showing 30 changed files with 327 additions and 117 deletions.
diff --git a/.env.local b/.env.local
@@ -64,7 +64,7 @@ HAPI_EVM_HASURA_URL=http://hasura:8080/v1/graphql
 HAPI_EVM_HASURA_ADMIN_SECRET=myadminsecretkey
 HAPI_EVM_DATABASE_URL=postgres://eoscr:password@postgres:5432/localdb
 HAPI_EVM_ENDPOINT=https://api.evm.eosnetwork.com
-HAPI_EVM_API_ENDPOINTS=["https://eos.edenia.cloud","https://api.main.alohaeos.com","https://eos.api.eosnation.io","https://eos.greymass.com","https://eos.eosphere.io","https://api.eosrio.io"]
+HAPI_EVM_API_ENDPOINTS=["https://eos.eosusa.io","https://api.main.alohaeos.com","https://eos.api.eosnation.io","https://eos.greymass.com","https://eos.eosphere.io","https://api.eosrio.io"]
 HAPI_EVM_NETWORK=EOSIO# EOSIO, TELOS
 HAPI_EVM_NETWORK_CHAIN_ID=aca376f206b8fc25a6ed44dbdc66547c36c6c33e3a119ffbeaef943642f0e906
 HAPI_EVM_EOS_EVM_ACCOUNT=eosio.evm

diff --git a/.env.telostestnet b/.env.telostestnet
@@ -64,7 +64,7 @@ HAPI_EVM_HASURA_URL=http://hasura:8080/v1/graphql
 HAPI_EVM_HASURA_ADMIN_SECRET=myadminsecretkey
 HAPI_EVM_DATABASE_URL=postgres://eoscr:password@postgres:5432/localdb
 HAPI_EVM_ENDPOINT=https://testnet.telos.net/evm
-HAPI_EVM_API_ENDPOINTS=["https://telos-testnet.edenia.cloud","https://telos-testnet.cryptolions.io","https://testnet.telos.eosrio.io","https://test.telos.eosusa.io"]
+HAPI_EVM_API_ENDPOINTS=["https://test.telos.eosusa.io","https://telos-testnet.cryptolions.io","https://testnet.telos.eosrio.io"]
 HAPI_EVM_NETWORK_CHAIN_ID=1eaa0824707c8c16bd25145493bf062aecddfeb56c736f6ba6397f3195f33c9f
 HAPI_EVM_NETWORK=TELOS
 HAPI_EVM_EOS_EVM_ACCOUNT=eosio.evm

diff --git a/.github/workflows/deploy-jungle-testnet.yaml b/.github/workflows/deploy-jungle-testnet.yaml
@@ -41,7 +41,7 @@ jobs:
           REACT_APP_EOS_API_NETWORK_NAME: jungle
           REACT_APP_EOS_API_NETWORK_LABEL: Jungle4 Testnet
           REACT_APP_EOS_API_NETWORK_LOGO: https://antelope.tools/images/jungle.jpg
-          REACT_APP_EOS_API_HOSTS: '[\"jungle.edenia.cloud\",\"jungle4.eosphere.io\",\"jungle4.api.eosnation.io\",\"jungle4.eossweden.org\"]'
+          REACT_APP_EOS_API_HOSTS: '[\"jungle.eosusa.io\",\"jungle4.eosphere.io\",\"jungle4.api.eosnation.io\",\"jungle4.eossweden.org\"]'
           REACT_APP_EOS_API_PORT: 443
           REACT_APP_EOS_API_PROTOCOL: https
           REACT_APP_EOS_CHAIN_ID: 73e4385a2708e6d7048834fbc1079f2fabb17b3c125b146af438971e90716c4d
@@ -80,7 +80,7 @@ jobs:
           POSTGRES_DB: ${{ secrets.POSTGRES_DB }}
           POSTGRES_DATA: ${{ secrets.POSTGRES_DATA }}
           # hapi
-          HAPI_EOS_API_ENDPOINTS: '["https://jungle.edenia.cloud","https://jungle4.eosphere.io","https://jungle4.api.eosnation.io","https://jungle4.eossweden.org"]'
+          HAPI_EOS_API_ENDPOINTS: '["https://jungle.eosusa.io","https://jungle4.eosphere.io","https://jungle4.api.eosnation.io","https://jungle4.eossweden.org"]'
           HAPI_EOS_API_CHAIN_ID: 73e4385a2708e6d7048834fbc1079f2fabb17b3c125b146af438971e90716c4d
           GOOGLE_CREDENTIALS_JSON: ${{ secrets.GOOGLE_CREDENTIALS_JSON }}
           HAPI_EOS_BASE_ACCOUNT: ${{ secrets.HAPI_EOS_BASE_ACCOUNT }}
@@ -116,7 +116,7 @@ jobs:
           HAPI_EVM_HASURA_ADMIN_SECRET: ${{ secrets.HAPI_EVM_HASURA_ADMIN_SECRET }}
           HAPI_EVM_DATABASE_URL: ${{ secrets.HAPI_EVM_DATABASE_URL }}
           HAPI_EVM_ENDPOINT: 'https://api.testnet.evm.eosnetwork.com'
-          HAPI_EVM_API_ENDPOINTS: '["https://jungle.edenia.cloud","https://jungle4.eosphere.io","https://jungle4.api.eosnation.io","https://jungle4.eossweden.org"]'
+          HAPI_EVM_API_ENDPOINTS: '["https://jungle.eosusa.io","https://jungle4.eosphere.io","https://jungle4.api.eosnation.io","https://jungle4.eossweden.org"]'
           HAPI_EVM_NETWORK: EOSIO
           HAPI_EVM_NETWORK_CHAIN_ID: 73e4385a2708e6d7048834fbc1079f2fabb17b3c125b146af438971e90716c4d
           HAPI_EVM_EOS_EVM_ACCOUNT: eosio.evm

diff --git a/.github/workflows/deploy-mainnet.yaml b/.github/workflows/deploy-mainnet.yaml
@@ -39,7 +39,7 @@ jobs:
           REACT_APP_USE_REWARDS: 'true'
           REACT_APP_USE_VOTES: 'true'
           REACT_APP_HASURA_URL: 'https://graphql-eos.antelope.tools/v1/graphql'
-          REACT_APP_EOS_API_HOSTS: '[\"api.main.alohaeos.com\",\"eos.edenia.cloud\",\"eos.api.eosnation.io\",\"eos.greymass.com\",\"eos.eosphere.io\",\"api.eosrio.io\"]'
+          REACT_APP_EOS_API_HOSTS: '[\"api.main.alohaeos.com\",\"eos.eosusa.io\",\"eos.api.eosnation.io\",\"eos.greymass.com\",\"eos.eosphere.io\",\"api.eosrio.io\"]'
           REACT_APP_EOS_API_PORT: '443'
           REACT_APP_EOS_API_PROTOCOL: 'https'
           REACT_APP_EOS_CHAIN_ID: 'aca376f206b8fc25a6ed44dbdc66547c36c6c33e3a119ffbeaef943642f0e906'
@@ -81,7 +81,7 @@ jobs:
           POSTGRES_DB: ${{ secrets.POSTGRES_DB }}
           POSTGRES_DATA: ${{ secrets.POSTGRES_DATA }}
           # hapi
-          HAPI_EOS_API_ENDPOINTS: '["https://eos.edenia.cloud","https://api.main.alohaeos.com","https://eos.api.eosnation.io","https://eos.greymass.com","https://eos.eosphere.io","https://api.eosrio.io"]'
+          HAPI_EOS_API_ENDPOINTS: '["https://eos.eosusa.io","https://api.main.alohaeos.com","https://eos.api.eosnation.io","https://eos.greymass.com","https://eos.eosphere.io","https://api.eosrio.io"]'
           HAPI_EOS_API_CHAIN_ID: 'aca376f206b8fc25a6ed44dbdc66547c36c6c33e3a119ffbeaef943642f0e906'
           HAPI_EOS_BASE_ACCOUNT: ${{ secrets.HAPI_EOS_BASE_ACCOUNT }}
           HAPI_EOS_BASE_ACCOUNT_PASSWORD: ${{ secrets.HAPI_EOS_BASE_ACCOUNT_PASSWORD }}
@@ -114,7 +114,7 @@ jobs:
           HAPI_EVM_HASURA_ADMIN_SECRET: ${{ secrets.HAPI_EVM_HASURA_ADMIN_SECRET }}
           HAPI_EVM_DATABASE_URL: ${{ secrets.HAPI_EVM_DATABASE_URL }}
           HAPI_EVM_ENDPOINT: 'https://api.evm.eosnetwork.com'
-          HAPI_EVM_API_ENDPOINTS: '["https://eos.edenia.cloud","https://api.main.alohaeos.com","https://eos.api.eosnation.io","https://eos.greymass.com","https://eos.eosphere.io","https://api.eosrio.io"]'
+          HAPI_EVM_API_ENDPOINTS: '["https://eos.eosusa.io","https://api.main.alohaeos.com","https://eos.api.eosnation.io","https://eos.greymass.com","https://eos.eosphere.io","https://api.eosrio.io"]'
           HAPI_EVM_NETWORK: EOSIO
           HAPI_EVM_NETWORK_CHAIN_ID: aca376f206b8fc25a6ed44dbdc66547c36c6c33e3a119ffbeaef943642f0e906
           HAPI_EVM_EOS_EVM_ACCOUNT: eosio.evm

diff --git a/.github/workflows/deploy-telos-testnet.yaml b/.github/workflows/deploy-telos-testnet.yaml
@@ -115,7 +115,7 @@ jobs:
           HAPI_EVM_HASURA_ADMIN_SECRET: ${{ secrets.HAPI_EVM_HASURA_ADMIN_SECRET }}
           HAPI_EVM_DATABASE_URL: ${{ secrets.HAPI_EVM_DATABASE_URL }}
           HAPI_EVM_ENDPOINT: 'https://testnet.telos.net/evm'
-          HAPI_EVM_API_ENDPOINTS: '["https://telos-testnet.edenia.cloud","https://telos-testnet.cryptolions.io","https://testnet.telos.eosrio.io","https://test.telos.eosusa.io"]'
+          HAPI_EVM_API_ENDPOINTS: '["https://test.telos.eosusa.io","https://telos-testnet.cryptolions.io","https://testnet.telos.eosrio.io"]'
           HAPI_EVM_NETWORK: TELOS
           HAPI_EVM_NETWORK_CHAIN_ID: 1eaa0824707c8c16bd25145493bf062aecddfeb56c736f6ba6397f3195f33c9f
           HAPI_EVM_EOS_EVM_ACCOUNT: eosio.evm

diff --git a/.github/workflows/deploy-wax.yaml b/.github/workflows/deploy-wax.yaml
@@ -45,7 +45,7 @@ jobs:
           REACT_APP_EOS_API_NETWORK_NAME: 'wax'
           REACT_APP_EOS_API_NETWORK_LABEL: 'WAX Mainnet'
           REACT_APP_EOS_API_NETWORK_LOGO: 'https://antelope.tools/images/wax.jpg'
-          REACT_APP_EOS_API_HOSTS: '[\"wax.api.eosnation.io\",\"wax.edenia.cloud\",\"wax.api.eosnation.io\",\"wax.greymass.com\"]'
+          REACT_APP_EOS_API_HOSTS: '[\"wax.api.eosnation.io\",\"wax.eosusa.io\",\"wax.api.eosnation.io\",\"wax.greymass.com\"]'
           REACT_APP_EOS_API_PORT: '443'
           REACT_APP_EOS_API_PROTOCOL: 'https'
           REACT_APP_EOS_CHAIN_ID: '1064487b3cd1a897ce03ae5b6a865651747e2e152090f99c1d19d44e01aea5a4'
@@ -81,7 +81,7 @@ jobs:
           POSTGRES_DATA: ${{ secrets.POSTGRES_DATA }}
           # hapi
           HAPI_EOS_API_NETWORK_NAME: wax
-          HAPI_EOS_API_ENDPOINTS: '["https://wax.api.eosnation.io","https://wax.edenia.cloud","https://wax.api.eosnation.io","https://wax.greymass.com"]'
+          HAPI_EOS_API_ENDPOINTS: '["https://wax.api.eosnation.io","https://wax.eosusa.io","https://wax.api.eosnation.io","https://wax.greymass.com"]'
           HAPI_EOS_API_CHAIN_ID: 1064487b3cd1a897ce03ae5b6a865651747e2e152090f99c1d19d44e01aea5a4
           HAPI_EOS_BASE_ACCOUNT: ${{ secrets.HAPI_EOS_BASE_ACCOUNT }}
           HAPI_EOS_BASE_ACCOUNT_PASSWORD: ${{ secrets.HAPI_EOS_BASE_ACCOUNT_PASSWORD }}

diff --git a/README.md b/README.md
@@ -166,7 +166,7 @@ HASURA_GRAPHQL_ADMIN_SECRET=myadminsecretkey
 HASURA_GRAPHQL_UNAUTHORIZED_ROLE=guest
 
 # hapi
-HAPI_EOS_API_ENDPOINTS=["https://jungle.edenia.cloud"]
+HAPI_EOS_API_ENDPOINTS=["https://jungle.eosusa.io"]
 HAPI_EOS_API_CHAIN_ID=73e4385a2708e6d7048834fbc1079f2fabb17b3c125b146af438971e90716c4d
 HAPI_EOS_BASE_ACCOUNT=baseaccount
 HAPI_EOS_BASE_ACCOUNT_PASSWORD=PW...
@@ -192,7 +192,7 @@ REACT_APP_USE_REWARDS=true
 REACT_APP_USE_VOTES=true
 REACT_APP_USE_CPU_BENCHMARK=true
 REACT_APP_HASURA_URL=http://localhost:8080/v1/graphql
-REACT_APP_EOS_API_HOSTS=["jungle.edenia.cloud"]
+REACT_APP_EOS_API_HOSTS=["jungle.eosusa.io"]
 REACT_APP_EOS_API_PORT=443
 REACT_APP_EOS_API_PROTOCOL=https
 REACT_APP_EOS_CHAIN_ID=73e4385a2708e6d7048834fbc1079f2fabb17b3c125b146af438971e90716c4d

diff --git a/docs/producers-API-documentation.md b/docs/producers-API-documentation.md
@@ -112,13 +112,13 @@ curl -X 'POST' \
                     "owner": "costaricaeos",
                     "endpoints": [
                         {
-                            "link": "eos.edenia.cloud:9876",
+                            "link": "eos.eosusa.io:9876",
                             "response": {},
                             "updated_at": "2022-11-14T17:23:00.174097+00:00",
                             "type": "p2p"
                         },
                         {
-                            "link": "https://eos.edenia.cloud",
+                            "link": "https://eos.eosusa.io",
                             "response": {
                                 "status": 200,
                                 "statusText": "OK"
@@ -239,7 +239,7 @@ curl -X 'POST' \
                     "owner": "costaricaeos",
                     "endpoints": [
                         {
-                            "link": "eos.edenia.cloud:9876",
+                            "link": "eos.eosusa.io:9876",
                             "response": {},
                             "updated_at": "2022-11-14T17:23:00.174097+00:00",
                             "type": "p2p"

diff --git a/docs/wallet-config.md b/docs/wallet-config.md
@@ -30,18 +30,18 @@ HAPI_EOS_MECHANICS_PASSWORD=PW...
 Let's make sure that the wallet was created correctly:
 
 ```bash
-cleos -u https://jungle.edenia.cloud --wallet-url http://localhost:8888 wallet list
+cleos -u https://jungle.eosusa.io --wallet-url http://localhost:8888 wallet list
 ```
 
 If the wallet is present but locked, then execute the following command:
 
 ```bash
-cleos -u https://jungle.edenia.cloud --wallet-url http://localhost:8888 wallet unlock -n eosmechanics
+cleos -u https://jungle.eosusa.io --wallet-url http://localhost:8888 wallet unlock -n eosmechanics
 ```
 
 Finally, we will import an EOSIO key for reading information about statistics of the block
 producers called eosmechanics (Ask the admins about the key):
 
 ```bash
-cleos -u https://jungle.edenia.cloud --wallet-url http://localhost:8888 wallet import -n eosmechanics
+cleos -u https://jungle.eosusa.io --wallet-url http://localhost:8888 wallet import -n eosmechanics
 ```
diff --git a/hapi/package.json b/hapi/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "eosiodashboard",
+  "name": "antelopetools",
   "version": "1.0.0",
   "description": "Antelope Tools BackEnd",
   "repository": "https://github.com/edenia/antelope-tools.git",

diff --git a/hapi/src/config/eos.config.js b/hapi/src/config/eos.config.js
@@ -46,6 +46,7 @@ module.exports = {
     nodeTable: process.env.HAPI_EOS_BP_JSON_ON_CHAIN_TABLE2 || 'node'
   },
   knownNetworks: {
+    fio: 'fio',
     lacchain: 'lacchain',
     libre: 'libre',
     telos: 'telos',

diff --git a/hapi/src/services/cpu.service.js b/hapi/src/services/cpu.service.js
@@ -6,7 +6,7 @@ const {
 } = require('../utils')
 const { eosConfig } = require('../config')
 
-const saveBenchmark = async payload => {
+const saveBenchmark = async (payload) => {
   const mutation = `
     mutation ($account: String!, $usage: Int!) {
       insert_cpu_one (object: {account: $account, usage: $usage}) {
@@ -39,7 +39,11 @@ const cleanOldBenchmarks = async () => {
 }
 
 const worker = async () => {
-  if (!eosConfig.eosmechanics.account || !eosConfig.eosmechanics.password) {
+  if (
+    eosConfig.eosmechanics.account === ' ' ||
+    !eosConfig.eosmechanics.account ||
+    !eosConfig.eosmechanics.password
+  ) {
     return
   }
 
@@ -49,7 +53,7 @@ const worker = async () => {
     await saveBenchmark({
       account: block.producer,
       usage: block?.transactions.find(
-        trx => trx?.trx?.id === transaction.processed.id
+        (trx) => trx?.trx?.id === transaction.processed.id
       ).cpu_usage_us
     })
   } catch (error) {