From 23c41868ec36ce193d37eeafe5f62515d386f7d0 Mon Sep 17 00:00:00 2001 From: Xavier Fernandez Date: Wed, 3 Jul 2024 10:59:04 -0600 Subject: [PATCH 1/3] feat(webapp): Update app name --- hapi/package.json | 2 +- webapp/package.json | 2 +- webapp/src/config/general.js | 2 +- webapp/src/config/ual.config.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hapi/package.json b/hapi/package.json index 0775b3531..18aaccb0e 100644 --- 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/webapp/package.json b/webapp/package.json index f7dbf8a94..99783e4ba 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,5 +1,5 @@ { - "name": "eosiodashboard", + "name": "antelopetools", "version": "v0.1.11", "description": "Antelope Tools WebApp", "repository": "https://github.com/edenia/antelope-tools.git", diff --git a/webapp/src/config/general.js b/webapp/src/config/general.js index ad7168a29..d81b876f7 100644 --- a/webapp/src/config/general.js +++ b/webapp/src/config/general.js @@ -15,7 +15,7 @@ export const disabledMenuItems = JSON.parse( ) export const appVersion = process.env.REACT_APP_VERSION.split('/').pop() || 'v1.0' -export const appName = process.env.REACT_APP_NAME || 'eosiodashboard' +export const appName = process.env.REACT_APP_NAME || 'antelopetools' export const networkLinks = process.env.REACT_APP_NETWORK_URL ? JSON.parse(process.env.REACT_APP_NETWORK_URL) : [] diff --git a/webapp/src/config/ual.config.js b/webapp/src/config/ual.config.js index f9814f9d8..8f7641dae 100644 --- a/webapp/src/config/ual.config.js +++ b/webapp/src/config/ual.config.js @@ -1,6 +1,6 @@ import { Anchor } from 'ual-anchor' -const appName = process.env.REACT_APP_EOS_APP_NAME || 'eosiodashboard' +const appName = process.env.REACT_APP_EOS_APP_NAME || 'antelopetools' const network = { chainId: process.env.REACT_APP_EOS_CHAIN_ID || From 280f47f534f4a043aca7a5bb748f9d6082a1abc1 Mon Sep 17 00:00:00 2001 From: Xavier Fernandez Date: Wed, 3 Jul 2024 11:11:48 -0600 Subject: [PATCH 2/3] feat(webapp): Remove edenia.cloud inactive nodes --- .env.local | 2 +- .env.telostestnet | 2 +- .github/workflows/deploy-jungle-testnet.yaml | 6 +++--- .github/workflows/deploy-mainnet.yaml | 6 +++--- .github/workflows/deploy-telos-testnet.yaml | 2 +- .github/workflows/deploy-wax.yaml | 4 ++-- README.md | 4 ++-- docs/producers-API-documentation.md | 6 +++--- docs/wallet-config.md | 6 +++--- webapp/src/config/ual.config.js | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.env.local b/.env.local index 5d07ee755..6326eecc1 100644 --- 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 index c91565537..a77bdf180 100644 --- 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","https://test.telos.eosusa.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 index 854d42932..eca0696c8 100644 --- 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 index 21a965d7b..3dcbc8057 100644 --- 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 index d446f367e..b42fca354 100644 --- 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","https://test.telos.eosusa.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 index 837537a4c..bee506341 100644 --- 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 index 521a30724..fc4b36dc8 100644 --- 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 index e05e3348f..e10384126 100644 --- 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 index 5057cb160..aed5cedc9 100644 --- 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/webapp/src/config/ual.config.js b/webapp/src/config/ual.config.js index 8f7641dae..b2dedabb9 100644 --- a/webapp/src/config/ual.config.js +++ b/webapp/src/config/ual.config.js @@ -11,7 +11,7 @@ const network = { protocol: process.env.REACT_APP_EOS_API_PROTOCOL || 'https', host: JSON.parse(process.env.REACT_APP_EOS_API_HOSTS)[0] || - 'jungle.edenia.cloud', + 'jungle.eosusa.io', port: parseInt(process.env.REACT_APP_EOS_API_PORT || '443'), }, ], From ce1b78528712cbed9b93fc43172a5339580d8c35 Mon Sep 17 00:00:00 2001 From: Xavier Fernandez Date: Wed, 3 Jul 2024 11:17:05 -0600 Subject: [PATCH 3/3] feat(webapp): Remove duplicate endpoints --- .env.telostestnet | 2 +- .github/workflows/deploy-telos-testnet.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.telostestnet b/.env.telostestnet index a77bdf180..7f96f6b50 100644 --- 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://test.telos.eosusa.io","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-telos-testnet.yaml b/.github/workflows/deploy-telos-testnet.yaml index b42fca354..631982306 100644 --- 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://test.telos.eosusa.io","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