diff --git a/.github/workflows/deploy-phoenix-testnet.yaml b/.github/workflows/deploy-libre-testnet.yaml similarity index 77% rename from .github/workflows/deploy-phoenix-testnet.yaml rename to .github/workflows/deploy-libre-testnet.yaml index 3c597acb..928c5c1b 100644 --- a/.github/workflows/deploy-phoenix-testnet.yaml +++ b/.github/workflows/deploy-libre-testnet.yaml @@ -1,14 +1,14 @@ -name: Build images for phoenix testnet environment +name: Build images for libre testnet environment on: push: tags: - - phoenix-testnet-v* + - libre-testnet-v* jobs: - create-phoenix-testnet-image: + create-libre-testnet-image: runs-on: ubuntu-latest - environment: phoenix-testnet + environment: libre-testnet steps: - name: Checkout Repo uses: actions/checkout@v2.4.0 @@ -36,20 +36,20 @@ jobs: DOCKER_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }} # webapp PORT: '80' - REACT_APP_TITLE: 'Phoenix Testnet Network Dashboard' + REACT_APP_TITLE: 'Libre Testnet Network Dashboard' REACT_APP_TAG: ${{github.ref}} - REACT_APP_DEFAULT_PRODUCER_LOGO: 'https://phoenix-testnet.eosio.online/phoenix.png' - REACT_APP_FOOTER_LINKS: '[{ "text": "Phoenix Website", "src": "https://phoenix.org/" },{ "text": "Phoenix Block Explorer", "src": "https://phoenix-explorer.edenia.cloud/" },{"text": "Support","src": "#"},{"text": "Phoenix Network Monitor","src": "https://phoenix-testnet.eosio.online"}]' + REACT_APP_DEFAULT_PRODUCER_LOGO: 'https://eosio.online/images/libre.png' + REACT_APP_FOOTER_LINKS: '[{ "text": "Bitcoin Libre Website", "src": "https://libre.org/" },{ "text": "Libre Block Explorer", "src": "https://libre-testnet-explorer.edenia.cloud/" },{"text": "Support","src": "#"},{"text": "Libre Network Monitor","src": "https://libre-testnet.eosio.online"}]' REACT_APP_EOS_RATE_LINK: '' REACT_APP_USE_REWARDS: 'false' REACT_APP_USE_VOTES: 'false' REACT_APP_USE_CPU_BENCHMARK: 'false' REACT_APP_USE_BLOCK_PRODUCER_AGREEMENT_CONTRACT: 'true' - REACT_APP_HASURA_URL: 'https://graphql-phoenix-testnet.eosio.online/v1/graphql' - REACT_APP_EOS_API_NETWORK_NAME: 'phoenix-testnet' - REACT_APP_EOS_API_NETWORK_LABEL: 'Phoenix Testnet' - REACT_APP_EOS_API_NETWORK_LOGO: 'https://phoenix-testnet.eosio.online/phoenix.png' - REACT_APP_EOS_API_HOST: 'phoenix-testnet.edenia.cloud' + REACT_APP_HASURA_URL: 'https://graphql-libre-testnet.eosio.online/v1/graphql' + REACT_APP_EOS_API_NETWORK_NAME: 'libre-testnet' + REACT_APP_EOS_API_NETWORK_LABEL: 'Libre Testnet' + REACT_APP_EOS_API_NETWORK_LOGO: 'https://eosio.online/images/libre.png' + REACT_APP_EOS_API_HOST: 'libre-testnet.edenia.cloud' REACT_APP_EOS_API_PORT: '443' REACT_APP_EOS_API_PROTOCOL: 'https' REACT_APP_EOS_CHAIN_ID: '5a8d542cf84fa3125e9a40f66b6dcba803d20666f1aae1c593e0f608abefd087' @@ -62,7 +62,7 @@ jobs: REACT_APP_TOKEN_SYMBOL: ${{ secrets.REACT_APP_TOKEN_SYMBOL }} REACT_APP_NETWORK_URL: ${{ secrets.REACT_APP_NETWORK_URL }} REACT_APP_DISABLED_MENU_ITEMS: '["/missed-blocks", "/cpu-benchmark","/block-distribution"]' - REACT_APP_BLOCK_EXPLORER_URL: 'https://phoenix-explorer.edenia.cloud/transaction/(transaction)' + REACT_APP_BLOCK_EXPLORER_URL: 'https://libre-testnet-explorer.edenia.cloud/transaction/(transaction)' REACT_APP_STATE_HISTORY_ENABLED=: 'false' REACT_APP_GOOGLE_ANALITIC_PAGE_ID: 'G-E6Y0EC9FT8' REACT_APP_PUBLIC_RE_CAPTCHA_KEY: ${{ secrets.REACT_APP_PUBLIC_RE_CAPTCHA_KEY }} @@ -74,19 +74,19 @@ jobs: build-kubernetes env: # general - NAMESPACE: phoenix-testnet-dashboard - INGRESS_HOST: phoenix-testnet.eosio.online - INGRESS_GRAPHQL_HOST: graphql-phoenix-testnet.eosio.online + NAMESPACE: libre-testnet-dashboard + INGRESS_HOST: libre-testnet.eosio.online + INGRESS_GRAPHQL_HOST: graphql-libre-testnet.eosio.online # webapp - REACT_APP_EOS_API_NETWORK_NAME: phoenix-testnet + REACT_APP_EOS_API_NETWORK_NAME: libre-testnet # postgres POSTGRES_USER: ${{ secrets.POSTGRES_USER }} POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }} POSTGRES_DB: ${{ secrets.POSTGRES_DB }} POSTGRES_DATA: ${{ secrets.POSTGRES_DATA }} # hapi - HAPI_EOS_API_NETWORK_NAME: phoenix-testnet - HAPI_EOS_API_ENDPOINT: https://phoenix-testnet.edenia.cloud + HAPI_EOS_API_NETWORK_NAME: libre-testnet + HAPI_EOS_API_ENDPOINT: https://libre-testnet.edenia.cloud HAPI_EOS_API_CHAIN_ID: 5a8d542cf84fa3125e9a40f66b6dcba803d20666f1aae1c593e0f608abefd087 HAPI_EOS_BASE_ACCOUNT: ${{ secrets.HAPI_EOS_BASE_ACCOUNT }} HAPI_EOS_BASE_ACCOUNT_PASSWORD: ${{ secrets.HAPI_EOS_BASE_ACCOUNT_PASSWORD }} @@ -128,7 +128,7 @@ jobs: uses: steebchen/kubectl@v1.1.0 env: KUBE_CONFIG_DATA: ${{ secrets.KUBE_CONFIG_DATA }} - NAMESPACE: phoenix-testnet-dashboard + NAMESPACE: libre-testnet-dashboard K8S_BUILD_DIR: build_k8s with: args: version && make deploy-kubernetes diff --git a/docs/images/libre.png b/docs/images/libre.png new file mode 100644 index 00000000..683d2efe Binary files /dev/null and b/docs/images/libre.png differ diff --git a/makefile b/makefile index a899a9c1..74de7e6a 100644 --- a/makefile +++ b/makefile @@ -73,8 +73,8 @@ ultratestnet: make stop make start -phoenixtestnet: - @cat ".env.phoenixtestnet" | sed -e 's/REACT_APP_TAG=dev/REACT_APP_TAG=$(shell git describe --tags `git rev-list --tags --max-count=1`)/g' > ".env" +libretestnet: + @cat ".env.libretestnet" | sed -e 's/REACT_APP_TAG=dev/REACT_APP_TAG=$(shell git describe --tags `git rev-list --tags --max-count=1`)/g' > ".env" make stop make start diff --git a/webapp/src/language/en.phoenix-testnet.json b/webapp/src/language/en.phoenix-testnet.json index 40fb017f..71c22b0b 100644 --- a/webapp/src/language/en.phoenix-testnet.json +++ b/webapp/src/language/en.phoenix-testnet.json @@ -1,19 +1,19 @@ { "routes": { - "/>title": "Phoenix Testnet Network Dashboard and Infrastructure Monitor", - "/cpu-benchmark>title": "CPU Benchmarks - Phoenix Testnet Network Dashboard", - "/block-producers>title": "Block Producers - Phoenix Testnet Network Dashboard", - "/rewards-distribution>title": "Rewards Distribution - Phoenix Testnet Network Dashboard", - "/nodes>title": "Phoenix Testnet Nodes Status Monitor", - "/nodes-distribution>title": "Geographic Distribution of Nodes - Phoenix Testnet Network Dashboard", - "/accounts>title": "Accounts and Contracts - Phoenix Testnet Network Dashboard", - "/bpjson>title": "BP JSON - Phoenix Testnet Network Dashboard", - "/ricardian-contract>title": "BP Agreement - Phoenix Testnet Network Dashboard", - "/block-distribution>title": "Block Production Distribution - Phoenix Testnet Network Dashboard", - "/missed-blocks>title": "Missed Blocks - Phoenix Testnet Network Dashboard", - "/endpoints>title": "API Endpoints - Phoenix Testnet Network Dashboard", - "/about>title": "About - Phoenix Testnet Network Dashboard", - "/help>title": "Help - Phoenix Testnet Network Dashboard", + "/>title": "Libre Testnet Network Dashboard and Infrastructure Monitor", + "/cpu-benchmark>title": "CPU Benchmarks - Libre Testnet Network Dashboard", + "/block-producers>title": "Block Producers - Libre Testnet Network Dashboard", + "/rewards-distribution>title": "Rewards Distribution - Libre Testnet Network Dashboard", + "/nodes>title": "Libre Testnet Nodes Status Monitor", + "/nodes-distribution>title": "Geographic Distribution of Nodes - Libre Testnet Network Dashboard", + "/accounts>title": "Accounts and Contracts - Libre Testnet Network Dashboard", + "/bpjson>title": "BP JSON - Libre Testnet Network Dashboard", + "/ricardian-contract>title": "BP Agreement - Libre Testnet Network Dashboard", + "/block-distribution>title": "Block Production Distribution - Libre Testnet Network Dashboard", + "/missed-blocks>title": "Missed Blocks - Libre Testnet Network Dashboard", + "/endpoints>title": "API Endpoints - Libre Testnet Network Dashboard", + "/about>title": "About - Libre Testnet Network Dashboard", + "/help>title": "Help - Libre Testnet Network Dashboard", "/rewards-distribution>moreDescription": "BP daily rewards distribution by geographic location of paid block producers.", "/bpjson>moreDescription": "A visual representation of the network’s current nodes.", "/faucet>moreDescription": "This tool allows you to create an account and get LIBRE testnet tokens.", diff --git a/webapp/src/language/es.phoenix-testnet.json b/webapp/src/language/es.phoenix-testnet.json index 8fee1524..7fe0b8a7 100644 --- a/webapp/src/language/es.phoenix-testnet.json +++ b/webapp/src/language/es.phoenix-testnet.json @@ -1,6 +1,6 @@ { "routes": { - "/>title": "Monitor de infraestructura y panel de control de red Phoenix Testnet", + "/>title": "Monitor de infraestructura y panel de control de red Libre Testnet", "/cpu-benchmark>title": "Benchmark de CPU - Panel", "/block-producers>title": "Productores de Bloques - Panel", "/rewards-distribution>title": "Distribución de recompensas - Panel", @@ -8,9 +8,9 @@ "/nodes-distribution>title": "Distribución Geográfica de Nodos", "/accounts>title": "Cuentas y Contratos - Panel", "/bpjson>title": "BP JSON - Panel", - "/ricardian-contract>title": "Acuerdo de Productor de Bloques - Phoenix Testnet", - "/block-distribution>title": "Distribución de bloques - Phoenix Testnet", - "/endpoints>title": "URL's - Phoenix Testnet", + "/ricardian-contract>title": "Acuerdo de Productor de Bloques - Libre Testnet", + "/block-distribution>title": "Distribución de bloques - Libre Testnet", + "/endpoints>title": "URL's - Libre Testnet", "/about>title": "Acerca de - Panel", "/help>title": "Ayuda - Panel", "/rewards-distribution>moreDescription": "Distribución diaria de recompensas de BP por ubicación geográfica de los productores de bloques pagados.", diff --git a/webapp/src/language/index.js b/webapp/src/language/index.js index c7c7ce86..6568718b 100644 --- a/webapp/src/language/index.js +++ b/webapp/src/language/index.js @@ -7,8 +7,8 @@ import enLacchain from './en.lacchain.json' import esLacchain from './es.lacchain.json' import enTelosTestnet from './en.telos-testnet.json' import esTelosTestnet from './es.telos-testnet.json' -import enPhoenixTestnet from './en.phoenix-testnet.json' -import esPhoenixTestnet from './es.phoenix-testnet.json' +import enLibreTestnet from './en.libre-testnet.json' +import esLibreTestnet from './es.libre-testnet.json' import enTelos from './en.telos.json' import esTelos from './es.telos.json' import enJungle from './en.jungle.json' @@ -47,8 +47,8 @@ const languajes = { 'en.mainnet': enMainnet, 'es.telos-testnet': esTelosTestnet, 'en.telos-testnet': enTelosTestnet, - 'es.phoenix-testnet': esPhoenixTestnet, - 'en.phoenix-testnet': enPhoenixTestnet, + 'es.libre-testnet': esLibreTestnet, + 'en.libre-testnet': enLibreTestnet, 'es.proton-testnet': esProtonTestnet, 'en.proton-testnet': enProtonTestnet, 'es.wax-testnet': esWaxTestnet, diff --git a/webapp/src/routes/Faucet.js b/webapp/src/routes/Faucet.js index deb6594e..3db01e88 100644 --- a/webapp/src/routes/Faucet.js +++ b/webapp/src/routes/Faucet.js @@ -38,7 +38,7 @@ const Faucet = () => { const createAccount = async () => { const reCaptchaToken = await executeRecaptcha?.('submit') - if (eosConfig.networkName === 'phoenix-testnet') { + if (eosConfig.networkName === 'libre-testnet') { if ( !reCaptchaToken || (!createAccountValues.publicKey && !createAccountValues.accountName) @@ -149,7 +149,7 @@ const Faucet = () => { } /> - {eosConfig.networkName === 'phoenix-testnet' && ( + {eosConfig.networkName === 'libre-testnet' && (