From ad95f817cb5d9c87500ccfaa26a8d1ff1c4befb7 Mon Sep 17 00:00:00 2001 From: otherview Date: Wed, 4 Oct 2023 15:01:32 +0100 Subject: [PATCH 1/8] Update new DNS --- .github/workflows/manual-deploy-obscuro-gateway.yml | 12 ++++++------ .github/workflows/manual-deploy-obscuro-scan-2.yml | 10 +++++----- .github/workflows/manual-deploy-obscuroscan.yml | 4 ++-- .github/workflows/manual-deploy-testnet-faucet.yml | 8 ++++---- .../workflows/runner-scripts/wait-node-healthy.sh | 2 +- README.md | 2 +- docs/_docs/testnet/essentials.md | 4 ++-- docs/_docs/wallet-extension/wallet-extension.md | 2 +- integration/manualtests/client_test.go | 2 +- integration/manualtests/tx_test.go | 2 +- integration/networktest/env/network_setup.go | 4 ++-- tools/faucet/cmd/cli.go | 4 ++-- tools/obscuroscan/main/cli.go | 2 +- tools/walletextension/container_run.sh | 2 +- tools/walletextension/main/cli.go | 4 ++-- 15 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/manual-deploy-obscuro-gateway.yml b/.github/workflows/manual-deploy-obscuro-gateway.yml index 94a7f1ec2f..f499801f94 100644 --- a/.github/workflows/manual-deploy-obscuro-gateway.yml +++ b/.github/workflows/manual-deploy-obscuro-gateway.yml @@ -13,7 +13,7 @@ on: type: choice options: - 'dev-testnet' - - 'testnet' + - 'uat-testnet' - 'sepolia-testnet' jobs: @@ -32,12 +32,12 @@ jobs: uses: docker/setup-buildx-action@v1 - name: 'Set Obscuro Gateway variables for testnet' - if: ${{ github.event.inputs.testnet_type == 'testnet' }} + if: ${{ github.event.inputs.testnet_type == 'uat-testnet' }} run: | - echo "OBSCURO_GATEWAY_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/obscuro_gateway_testnet:latest" >> $GITHUB_ENV - echo "OBSCURO_GATEWAY_NODE_HOST=erpc.testnet.obscu.ro" >> $GITHUB_ENV - echo "RESOURCE_STARTING_NAME=testnet" >> $GITHUB_ENV - echo "RESOURCE_TAG_NAME=obscurogatewaytestnetlatest" >> $GITHUB_ENV + echo "OBSCURO_GATEWAY_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/obscuro_gateway_uat_testnet:latest" >> $GITHUB_ENV + echo "OBSCURO_GATEWAY_NODE_HOST=erpc.uat-testnet.obscu.ro" >> $GITHUB_ENV + echo "RESOURCE_STARTING_NAME=uat-testnet" >> $GITHUB_ENV + echo "RESOURCE_TAG_NAME=obscurogatewayuattestnetlatest" >> $GITHUB_ENV - name: 'Set Obscuro Gateway variables for dev-testnet' if: ${{ github.event.inputs.testnet_type == 'dev-testnet' }} diff --git a/.github/workflows/manual-deploy-obscuro-scan-2.yml b/.github/workflows/manual-deploy-obscuro-scan-2.yml index cba7a74b98..15eb8e0a9e 100644 --- a/.github/workflows/manual-deploy-obscuro-scan-2.yml +++ b/.github/workflows/manual-deploy-obscuro-scan-2.yml @@ -13,7 +13,7 @@ on: type: choice options: - 'dev-testnet' - - 'testnet' + - 'uat-testnet' jobs: build-and-deploy: @@ -25,11 +25,11 @@ jobs: uses: docker/setup-buildx-action@v1 - name: 'Set Obscuro Scan variables for testnet' - if: ${{ github.event.inputs.testnet_type == 'testnet' }} + if: ${{ github.event.inputs.testnet_type == 'uat-testnet' }} run: | - echo "OBSCURO_SCAN_FE_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/fe_obscuro_scan_testnet:latest" >> $GITHUB_ENV - echo "OBSCURO_SCAN_API_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/api_obscuro_scan_testnet:latest" >> $GITHUB_ENV - echo "OBSCURO_SCAN_NODE_HOST=erpc.testnet.obscu.ro" >> $GITHUB_ENV + echo "OBSCURO_SCAN_FE_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/fe_obscuro_scan_uat_testnet:latest" >> $GITHUB_ENV + echo "OBSCURO_SCAN_API_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/api_obscuro_scan_uat_testnet:latest" >> $GITHUB_ENV + echo "OBSCURO_SCAN_NODE_HOST=erpc.uat-testnet.obscu.ro" >> $GITHUB_ENV - name: 'Set Obscuro Scan variables for dev-testnet' if: ${{ github.event.inputs.testnet_type == 'dev-testnet' }} diff --git a/.github/workflows/manual-deploy-obscuroscan.yml b/.github/workflows/manual-deploy-obscuroscan.yml index f521a89677..87ad76e5f8 100644 --- a/.github/workflows/manual-deploy-obscuroscan.yml +++ b/.github/workflows/manual-deploy-obscuroscan.yml @@ -37,8 +37,8 @@ jobs: password: ${{ secrets.REGISTRY_PASSWORD }} - name: Docker Build & Push to ACR run: | - DOCKER_BUILDKIT=1 docker build -t testnetobscuronet.azurecr.io/obscuronet/obscuro_testnet_obscuroscan:latest -f tools/obscuroscan/Dockerfile . - docker push testnetobscuronet.azurecr.io/obscuronet/obscuro_testnet_obscuroscan:latest + DOCKER_BUILDKIT=1 docker build -t testnetobscuronet.azurecr.io/obscuronet/obscuro_uat_testnet_obscuroscan:latest -f tools/obscuroscan/Dockerfile . + docker push testnetobscuronet.azurecr.io/obscuronet/obscuro_uat_testnet_obscuroscan:latest - name: 'Deploy to Azure Web App for Container' uses: azure/webapps-deploy@v2 diff --git a/.github/workflows/manual-deploy-testnet-faucet.yml b/.github/workflows/manual-deploy-testnet-faucet.yml index 4e8245a0ff..0cd77f536c 100644 --- a/.github/workflows/manual-deploy-testnet-faucet.yml +++ b/.github/workflows/manual-deploy-testnet-faucet.yml @@ -20,7 +20,7 @@ on: type: choice options: - 'dev-testnet' - - 'testnet' + - 'uat-testnet' - 'sepolia-testnet' workflow_call: @@ -42,10 +42,10 @@ jobs: uses: docker/setup-buildx-action@v1 - name: 'Sets env vars for testnet' - if: ${{ inputs.testnet_type == 'testnet' }} + if: ${{ inputs.testnet_type == 'uat-testnet' }} run: | - echo "FAUCET_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/faucet_testnet:latest" >> $GITHUB_ENV - echo "TESTNET_ADDR=erpc.testnet.obscu.ro" >> $GITHUB_ENV + echo "FAUCET_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/uat_faucet_testnet:latest" >> $GITHUB_ENV + echo "TESTNET_ADDR=erpc.uat-testnet.obscu.ro" >> $GITHUB_ENV echo "DEFAULT_FAUCET_AMOUNT=100" >> $GITHUB_ENV - name: 'Sets env vars for dev-testnet' diff --git a/.github/workflows/runner-scripts/wait-node-healthy.sh b/.github/workflows/runner-scripts/wait-node-healthy.sh index af25dc756f..93eb53897c 100755 --- a/.github/workflows/runner-scripts/wait-node-healthy.sh +++ b/.github/workflows/runner-scripts/wait-node-healthy.sh @@ -9,7 +9,7 @@ help_and_exit() { echo "" echo "Usage: " echo " ex: " - echo " - $(basename "${0}") --host=erpc.testnet.obscu.ro --port=80" + echo " - $(basename "${0}") --host=erpc.uat-testnet.obscu.ro --port=80" echo "" echo " node *Required* Set the host address" echo "" diff --git a/README.md b/README.md index 0c10ed335b..197cc26cdc 100644 --- a/README.md +++ b/README.md @@ -388,7 +388,7 @@ Remix (see[docs/testnet/deploying-a-smart-contract.md](docs/testnet/deploying-a- e.g. using web3.py(see [docs/testnet/deploying-a-smart-contract-programmatically.md](docs/testnet/deploying-a-smart-contract-programmatically.md)). Note that in order to interact with the main cloud hosted testnet, all that needs to be changed is to start the wallet -extension using the default parameters, where the `nodeHost` will default to the testnet host URL `erpc.testnet.obscu.ro` i.e. +extension using the default parameters, where the `nodeHost` will default to the testnet host URL `erpc.sepolia-testnet.obscu.ro` i.e. ``` cd ./tools/walletextension/main/ diff --git a/docs/_docs/testnet/essentials.md b/docs/_docs/testnet/essentials.md index 91fa04c4e7..cbfba40dfc 100644 --- a/docs/_docs/testnet/essentials.md +++ b/docs/_docs/testnet/essentials.md @@ -14,8 +14,8 @@ These are the key limitations to be aware of when developing for the Evan's Cat 1. The "Wallet Extension" is not fully polished yet. You can expect a better UX as Obscuro develops ## Connection to an Obscuro Node -- **RPC http address:** `erpc.testnet.obscu.ro:80` -- **RPC websocket address:** `erpc.testnet.obscu.ro:81` +- **RPC http address:** `erpc.sepolia-testnet.obscu.ro:80` +- **RPC websocket address:** `erpc.sepolia-testnet.obscu.ro:81` ## Rollup Encryption/Decryption Key The symmetric key used to encrypt and decrypt transaction blobs in rollups on the Obscuro Testnet: diff --git a/docs/_docs/wallet-extension/wallet-extension.md b/docs/_docs/wallet-extension/wallet-extension.md index 4bfbde3224..439a018c32 100644 --- a/docs/_docs/wallet-extension/wallet-extension.md +++ b/docs/_docs/wallet-extension/wallet-extension.md @@ -54,7 +54,7 @@ tools. * `port` (default: `3000`): The local port on which to serve the wallet extension. * `portWS` (default: `3001`): The local port on which to handle websocket requests. - * `nodeHost` (default: `erpc.testnet.obscu.ro`): The Obscuro node for the RPC connection. + * `nodeHost` (default: `erpc.sepolia-testnet.obscu.ro`): The Obscuro node for the RPC connection. * `nodePortHTTP` (default: `80`): The Obscuro node's HTTP RPC port. * `nodePortWS` (default: `81`): The Obscuro node's websockets RPC port. * `logPath` (default: `wallet_extension_logs.txt`): The path for the wallet extension's logs. diff --git a/integration/manualtests/client_test.go b/integration/manualtests/client_test.go index 6611cab244..347298db63 100644 --- a/integration/manualtests/client_test.go +++ b/integration/manualtests/client_test.go @@ -16,7 +16,7 @@ func TestClientGetRollup(t *testing.T) { if os.Getenv(_IDEFlag) == "" { t.Skipf("set flag %s to run this test in the IDE", _IDEFlag) } - hostRPCAddress := "http://erpc.testnet.obscu.ro:80" + hostRPCAddress := "http://erpc.sepolia-testnet.obscu.ro:80" client, err := rpc.NewNetworkClient(hostRPCAddress) assert.Nil(t, err) diff --git a/integration/manualtests/tx_test.go b/integration/manualtests/tx_test.go index 1c71ff29c3..3d27831ab9 100644 --- a/integration/manualtests/tx_test.go +++ b/integration/manualtests/tx_test.go @@ -50,7 +50,7 @@ var ( "4bfe14725e685901c062ccd4e220c61cf9c189897b6c78bd18d7f51291b2b8f8", 777, gethlog.New()) - l2Host = "erpc.testnet.obscu.ro" + l2Host = "erpc.uat-testnet.obscu.ro" l2Port = 81 ) diff --git a/integration/networktest/env/network_setup.go b/integration/networktest/env/network_setup.go index 4a91d78d24..7ac7a59cfc 100644 --- a/integration/networktest/env/network_setup.go +++ b/integration/networktest/env/network_setup.go @@ -17,8 +17,8 @@ func SepoliaTestnet() networktest.Environment { func Testnet() networktest.Environment { connector := NewTestnetConnector( - "http://erpc.testnet.obscu.ro:80", // this is actually a validator... - []string{"http://erpc.testnet.obscu.ro:80"}, + "http://erpc.uat-testnet.obscu.ro:80", // this is actually a validator... + []string{"http://erpc.uat-testnet.obscu.ro:80"}, "http://testnet-faucet.uksouth.azurecontainer.io/fund/eth", "ws://testnet-eth2network.uksouth.cloudapp.azure.com:9000", ) diff --git a/tools/faucet/cmd/cli.go b/tools/faucet/cmd/cli.go index b395823904..640a957aec 100644 --- a/tools/faucet/cmd/cli.go +++ b/tools/faucet/cmd/cli.go @@ -16,8 +16,8 @@ const ( faucetPortUsage = "The port on which to serve the faucet endpoint. Default: 80." nodeHostName = "nodeHost" - nodeHostDefault = "erpc.testnet.obscu.ro" - nodeHostUsage = "The host on which to connect to the Obscuro node. Default: `erpc.testnet.obscu.ro`." + nodeHostDefault = "erpc.sepolia-testnet.obscu.ro" + nodeHostUsage = "The host on which to connect to the Obscuro node. Default: `erpc.sepolia-testnet.obscu.ro`." nodeHTTPPortName = "nodePort" nodeHTTPPortDefault = 80 diff --git a/tools/obscuroscan/main/cli.go b/tools/obscuroscan/main/cli.go index 95e75155ad..cd211d4885 100644 --- a/tools/obscuroscan/main/cli.go +++ b/tools/obscuroscan/main/cli.go @@ -29,7 +29,7 @@ type obscuroscanConfig struct { func defaultObscuroClientConfig() obscuroscanConfig { return obscuroscanConfig{ nodeID: "", - rpcServerAddr: "http://erpc.testnet.obscu.ro:80", + rpcServerAddr: "http://erpc.uat-testnet.obscu.ro:80", address: "127.0.0.1:3000/v1", logPath: "obscuroscan_logs.txt", } diff --git a/tools/walletextension/container_run.sh b/tools/walletextension/container_run.sh index 95dc96ae38..01aa5fe428 100755 --- a/tools/walletextension/container_run.sh +++ b/tools/walletextension/container_run.sh @@ -11,7 +11,7 @@ set -euo pipefail port=3000 portWS=3001 host="0.0.0.0" -nodeHost="erpc.testnet.obscu.ro" +nodeHost="erpc.sepolia-testnet.obscu.ro" nodePortHTTP=80 nodePortWS=81 logPath="wallet_extension_logs.txt" diff --git a/tools/walletextension/main/cli.go b/tools/walletextension/main/cli.go index f0e35a3fda..132444ddfb 100644 --- a/tools/walletextension/main/cli.go +++ b/tools/walletextension/main/cli.go @@ -21,8 +21,8 @@ const ( walletExtensionPortWSUsage = "The port on which to serve websocket JSON RPC requests. Default: 3001." nodeHostName = "nodeHost" - nodeHostDefault = "erpc.testnet.obscu.ro" - nodeHostUsage = "The host on which to connect to the Obscuro node. Default: `erpc.testnet.obscu.ro`." + nodeHostDefault = "erpc.sepolia-testnet.obscu.ro" + nodeHostUsage = "The host on which to connect to the Obscuro node. Default: `erpc.sepolia-testnet.obscu.ro`." nodeHTTPPortName = "nodePortHTTP" nodeHTTPPortDefault = 80 From adc24d5dab0c31ad816dc7721105dc69a7ff416d Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Wed, 4 Oct 2023 15:30:04 +0100 Subject: [PATCH 2/8] Update tools/obscuroscan/main/cli.go --- tools/obscuroscan/main/cli.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/obscuroscan/main/cli.go b/tools/obscuroscan/main/cli.go index cd211d4885..33988f9af6 100644 --- a/tools/obscuroscan/main/cli.go +++ b/tools/obscuroscan/main/cli.go @@ -29,7 +29,7 @@ type obscuroscanConfig struct { func defaultObscuroClientConfig() obscuroscanConfig { return obscuroscanConfig{ nodeID: "", - rpcServerAddr: "http://erpc.uat-testnet.obscu.ro:80", + rpcServerAddr: "http://erpc.sepolia-testnet.obscu.ro:80", address: "127.0.0.1:3000/v1", logPath: "obscuroscan_logs.txt", } From 88807aa688f5166986cb3a24cb6be0258adfccd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=BDiga=20Kokelj?= Date: Wed, 4 Oct 2023 16:54:00 +0200 Subject: [PATCH 3/8] get rpc values from address --- .../walletextension/api/staticOG/javascript.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/tools/walletextension/api/staticOG/javascript.js b/tools/walletextension/api/staticOG/javascript.js index 44a0419b4e..b04bddd6f3 100644 --- a/tools/walletextension/api/staticOG/javascript.js +++ b/tools/walletextension/api/staticOG/javascript.js @@ -50,6 +50,22 @@ async function fetchAndDisplayVersion() { } } +function getRPCFromUrl(gatewayAddress) { + // get the correct RPC endpoint for each network + switch(gatewayAddress) { + case 'https://testnet.obscu.ro/': + return 'https://rpc.sepolia-testnet.obscu.ro' + case 'https://sepolia-testnet.obscu.ro': + return 'https://rpc.sepolia-testnet.obscu.ro' + case 'https://uat-testnet.obscu.ro/': + return 'https://rpc.uat-testnet.obscu.ro'; + case 'https://dev-testnet.obscu.ro/': + return 'https://rpc.dev-testnet.obscu.ro'; + default: + return gatewayAddress; + } +} + async function addNetworkToMetaMask(ethereum, userID, chainIDDecimal) { // add network to MetaMask let chainIdHex = "0x" + chainIDDecimal.toString(16); // Convert to hexadecimal and prefix with '0x' @@ -65,7 +81,7 @@ async function addNetworkToMetaMask(ethereum, userID, chainIDDecimal) { symbol: 'ETH', decimals: 18 }, - rpcUrls: [obscuroGatewayAddress+"/"+obscuroGatewayVersion+'/?u='+userID], + rpcUrls: [getRPCFromUrl(obscuroGatewayAddress)+"/"+obscuroGatewayVersion+'/?u='+userID], blockExplorerUrls: ['https://testnet.obscuroscan.io'], }, ], From 8c86c03ca6e194ed7dfd5da7895dc39f1f012e14 Mon Sep 17 00:00:00 2001 From: otherview Date: Wed, 4 Oct 2023 16:44:25 +0100 Subject: [PATCH 4/8] updating images names --- .../manual-deploy-obscuro-gateway-database.yml | 10 +++++----- .github/workflows/manual-deploy-obscuro-gateway.yml | 2 +- .github/workflows/manual-deploy-obscuro-scan-2.yml | 4 ++-- .github/workflows/manual-deploy-testnet-faucet.yml | 6 +++--- README.md | 4 ++-- tools/faucet/container_run.sh | 4 ++-- tools/walletextension/container_run.sh | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/manual-deploy-obscuro-gateway-database.yml b/.github/workflows/manual-deploy-obscuro-gateway-database.yml index b73b022bcf..02cf206c25 100644 --- a/.github/workflows/manual-deploy-obscuro-gateway-database.yml +++ b/.github/workflows/manual-deploy-obscuro-gateway-database.yml @@ -13,7 +13,7 @@ on: type: choice options: - 'dev-testnet' - - 'testnet' + - 'uat-testnet' - 'sepolia-testnet' jobs: @@ -28,17 +28,17 @@ jobs: echo "Branch Name: ${GITHUB_REF_NAME}" echo "BRANCH_NAME=${GITHUB_REF_NAME}" >> $GITHUB_ENV - - name: 'Set Obscuro Gateway variables for testnet' - if: ${{ github.event.inputs.testnet_type == 'testnet' }} + - name: 'Set Obscuro Gateway variables for UAT testnet' + if: ${{ github.event.inputs.testnet_type == 'uat-testnet' }} run: | - echo "OBSCURO_GATEWAY_DB_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/obscuro_gateway_mariadb_testnet:latest" >> $GITHUB_ENV + echo "OBSCURO_GATEWAY_DB_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/obscuro_gateway_mariadb_uat_testnet:latest" >> $GITHUB_ENV echo "RESOURCE_STARTING_NAME=testnet" >> $GITHUB_ENV echo "RESOURCE_TAG_NAME=obscurogatewaydbtestnetlatest" >> $GITHUB_ENV - name: 'Set Obscuro Gateway variables for dev-testnet' if: ${{ github.event.inputs.testnet_type == 'dev-testnet' }} run: | - echo "OBSCURO_GATEWAY_DB_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/dev_obscuro_gateway_mariadb_testnet:latest" >> $GITHUB_ENV + echo "OBSCURO_GATEWAY_DB_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/obscuro_gateway_mariadb_dev_testnet:latest" >> $GITHUB_ENV echo "RESOURCE_STARTING_NAME=dev-testnet" >> $GITHUB_ENV echo "RESOURCE_TAG_NAME=obscurogatewaydbdevtestnetlatest" >> $GITHUB_ENV diff --git a/.github/workflows/manual-deploy-obscuro-gateway.yml b/.github/workflows/manual-deploy-obscuro-gateway.yml index f499801f94..efef3be8eb 100644 --- a/.github/workflows/manual-deploy-obscuro-gateway.yml +++ b/.github/workflows/manual-deploy-obscuro-gateway.yml @@ -42,7 +42,7 @@ jobs: - name: 'Set Obscuro Gateway variables for dev-testnet' if: ${{ github.event.inputs.testnet_type == 'dev-testnet' }} run: | - echo "OBSCURO_GATEWAY_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/dev_obscuro_gateway_testnet:latest" >> $GITHUB_ENV + echo "OBSCURO_GATEWAY_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/obscuro_gateway_dev_testnet:latest" >> $GITHUB_ENV echo "OBSCURO_GATEWAY_NODE_HOST=erpc.dev-testnet.obscu.ro" >> $GITHUB_ENV echo "RESOURCE_STARTING_NAME=dev-testnet" >> $GITHUB_ENV echo "RESOURCE_TAG_NAME=obscurogatewaydevtestnetlatest" >> $GITHUB_ENV diff --git a/.github/workflows/manual-deploy-obscuro-scan-2.yml b/.github/workflows/manual-deploy-obscuro-scan-2.yml index 15eb8e0a9e..91af8ee707 100644 --- a/.github/workflows/manual-deploy-obscuro-scan-2.yml +++ b/.github/workflows/manual-deploy-obscuro-scan-2.yml @@ -34,8 +34,8 @@ jobs: - name: 'Set Obscuro Scan variables for dev-testnet' if: ${{ github.event.inputs.testnet_type == 'dev-testnet' }} run: | - echo "OBSCURO_SCAN_FE_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/dev_fe_obscuro_scan_testnet:latest" >> $GITHUB_ENV - echo "OBSCURO_SCAN_API_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/dev_api_obscuro_scan_testnet:latest" >> $GITHUB_ENV + echo "OBSCURO_SCAN_FE_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/fe_obscuro_scan_dev_testnet:latest" >> $GITHUB_ENV + echo "OBSCURO_SCAN_API_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/api_obscuro_scan_dev_testnet:latest" >> $GITHUB_ENV echo "OBSCURO_SCAN_NODE_HOST=erpc.dev-testnet.obscu.ro" >> $GITHUB_ENV - name: 'Login to Azure docker registry' diff --git a/.github/workflows/manual-deploy-testnet-faucet.yml b/.github/workflows/manual-deploy-testnet-faucet.yml index 0cd77f536c..de5088af70 100644 --- a/.github/workflows/manual-deploy-testnet-faucet.yml +++ b/.github/workflows/manual-deploy-testnet-faucet.yml @@ -44,21 +44,21 @@ jobs: - name: 'Sets env vars for testnet' if: ${{ inputs.testnet_type == 'uat-testnet' }} run: | - echo "FAUCET_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/uat_faucet_testnet:latest" >> $GITHUB_ENV + echo "FAUCET_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/faucet_uat_testnet:latest" >> $GITHUB_ENV echo "TESTNET_ADDR=erpc.uat-testnet.obscu.ro" >> $GITHUB_ENV echo "DEFAULT_FAUCET_AMOUNT=100" >> $GITHUB_ENV - name: 'Sets env vars for dev-testnet' if: ${{ inputs.testnet_type == 'dev-testnet' }} run: | - echo "FAUCET_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/dev_faucet_testnet:latest" >> $GITHUB_ENV + echo "FAUCET_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/faucet_dev_testnet:latest" >> $GITHUB_ENV echo "TESTNET_ADDR=erpc.dev-testnet.obscu.ro" >> $GITHUB_ENV echo "DEFAULT_FAUCET_AMOUNT=100" >> $GITHUB_ENV - name: 'Sets env vars for sepolia-testnet' if: ${{ inputs.testnet_type == 'sepolia-testnet' }} run: | - echo "FAUCET_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/sepolia_faucet_testnet:latest" >> $GITHUB_ENV + echo "FAUCET_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/faucet_sepolia_testnet:latest" >> $GITHUB_ENV echo "TESTNET_ADDR=erpc.sepolia-testnet.obscu.ro" >> $GITHUB_ENV echo "DEFAULT_FAUCET_AMOUNT=0.5" >> $GITHUB_ENV diff --git a/README.md b/README.md index 197cc26cdc..685b53f384 100644 --- a/README.md +++ b/README.md @@ -354,8 +354,8 @@ To pull the testnet faucet and run use; ``` cd tools/faucet -docker pull testnetobscuronet.azurecr.io/obscuronet/faucet_testnet:latest -./container_run.sh -image testnetobscuronet.azurecr.io/obscuronet/faucet_testnet:latest +docker pull testnetobscuronet.azurecr.io/obscuronet/faucet_sepolia_testnet:latest +./container_run.sh -image testnetobscuronet.azurecr.io/obscuronet/faucet_sepolia_testnet:latest ``` The faucet runs a web server within the container, with a port mapping of 8080 set to allow POST requests to be made to diff --git a/tools/faucet/container_run.sh b/tools/faucet/container_run.sh index 5b4e6272a3..e83f108363 100755 --- a/tools/faucet/container_run.sh +++ b/tools/faucet/container_run.sh @@ -18,7 +18,7 @@ help_and_exit() { echo "" echo " jwtSecret *Optional* Set the jwt secret" echo "" - echo " image *Optional* Set image to use, defaults to testnetobscuronet.azurecr.io/obscuronet/faucet_testnet:latest" + echo " image *Optional* Set image to use, defaults to testnetobscuronet.azurecr.io/obscuronet/faucet_sepolia_testnet:latest" echo "" echo "" echo "" @@ -34,7 +34,7 @@ nodePort=13010 port=80 pk="0x8dfb8083da6275ae3e4f41e3e8a8c19d028d32c9247e24530933782f2a05035b" jwtSecret="This_is_the_secret" -image="testnetobscuronet.azurecr.io/obscuronet/faucet_testnet:latest" +image="testnetobscuronet.azurecr.io/obscuronet/faucet_sepolia_testnet:latest" # Parse the options for argument in "$@" diff --git a/tools/walletextension/container_run.sh b/tools/walletextension/container_run.sh index 01aa5fe428..58c053c218 100755 --- a/tools/walletextension/container_run.sh +++ b/tools/walletextension/container_run.sh @@ -16,7 +16,7 @@ nodePortHTTP=80 nodePortWS=81 logPath="wallet_extension_logs.txt" databasePath=".obscuro/gateway_database.db" -image="obscuronet/obscuro_gateway_testnet:latest" +image="obscuronet/obscuro_gateway_sepolia_testnet:latest" # Parse the options for argument in "$@" From b1672df3ccd5b61c3e0b6d18c9f993ced157250e Mon Sep 17 00:00:00 2001 From: otherview Date: Mon, 9 Oct 2023 11:01:08 +0100 Subject: [PATCH 5/8] fix the lb script --- .../runner-scripts/testnet-clear-loadbalancer.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/runner-scripts/testnet-clear-loadbalancer.sh b/.github/workflows/runner-scripts/testnet-clear-loadbalancer.sh index 0a6eeb1dc5..5bddad6a22 100755 --- a/.github/workflows/runner-scripts/testnet-clear-loadbalancer.sh +++ b/.github/workflows/runner-scripts/testnet-clear-loadbalancer.sh @@ -5,12 +5,18 @@ # # -if [[ $1 == "testnet" ]]; then - lb=testnet-loadbalancer - pool=Backend-Pool-Obscuro-testnet +if [[ $1 == "uat-testnet" ]]; then + lb=uat-testnet-loadbalancer + pool=uat-testnet-backend-pool +elif [[ $1 == "dev-testnet" ]]; then + lb=dev-testnet-loadbalancer + pool=dev-testnet-backend-pool +elif [[ $1 == "sepolia-testnet" ]]; then + lb=sepolia-testnet-loadbalancer + pool=sepolia-testnet-backend-pool else - lb=devtestnet-loadbalancer - pool=Backend-Pool-Obscuro-devtestnet + echo "Invalid argument. Use 'uat-testnet', 'dev-testnet', or 'sepolia-testnet'" + exit 1 fi nic_id=$(az network lb address-pool show \ From e37496cdf26e9cf261686208b4b374cddc9c4511 Mon Sep 17 00:00:00 2001 From: otherview Date: Mon, 9 Oct 2023 11:29:05 +0100 Subject: [PATCH 6/8] fix naming --- .github/workflows/manual-deploy-testnet-l2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual-deploy-testnet-l2.yml b/.github/workflows/manual-deploy-testnet-l2.yml index cc0fe1490d..0425fe0ae5 100644 --- a/.github/workflows/manual-deploy-testnet-l2.yml +++ b/.github/workflows/manual-deploy-testnet-l2.yml @@ -281,7 +281,7 @@ jobs: with: inlineScript: | az network nic ip-config address-pool add \ - --address-pool Backend-Pool-Obscuro-${{vars.RESOURCE_TESTNET_NAME}} \ + --address-pool ${{vars.RESOURCE_TESTNET_NAME}}-backend-pool \ --ip-config-name ipconfig${{vars.RESOURCE_STARTING_NAME}}-1-${{ GITHUB.RUN_NUMBER }} \ --nic-name ${{vars.RESOURCE_STARTING_NAME}}-1-${{ GITHUB.RUN_NUMBER }}VMNic \ --resource-group Testnet \ From ceebdec25e88a24c48631d1def3601e7715b213f Mon Sep 17 00:00:00 2001 From: otherview Date: Mon, 9 Oct 2023 15:50:25 +0100 Subject: [PATCH 7/8] fixing some names --- .github/workflows/manual-deploy-testnet-l2.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/manual-deploy-testnet-l2.yml b/.github/workflows/manual-deploy-testnet-l2.yml index 0425fe0ae5..4c3e43e82f 100644 --- a/.github/workflows/manual-deploy-testnet-l2.yml +++ b/.github/workflows/manual-deploy-testnet-l2.yml @@ -197,7 +197,7 @@ jobs: --admin-username obscurouser --admin-password "${{ secrets.OBSCURO_NODE_VM_PWD }}" \ --public-ip-address-dns-name "obscuronode-${{ matrix.host_id }}-${{vars.RESOURCE_TESTNET_NAME}}-${{ GITHUB.RUN_NUMBER }}" \ --tags deploygroup=ObscuroNode-${{vars.RESOURCE_TESTNET_NAME}}-${{ GITHUB.RUN_NUMBER }} ${{vars.RESOURCE_TAG_NAME}}=true \ - --vnet-name ObscuroHost-${{vars.RESOURCE_TESTNET_NAME}}-01VNET --subnet ObscuroHost-${{vars.RESOURCE_TESTNET_NAME}}-01Subnet \ + --vnet-name ${{vars.RESOURCE_TESTNET_NAME}}-virtual-network --subnet ${{vars.RESOURCE_TESTNET_NAME}}-sub-network \ --size Standard_DC8_v2 --storage-sku StandardSSD_LRS --image ObscuroConfUbuntu \ --public-ip-sku Standard --authentication-type password @@ -282,8 +282,8 @@ jobs: inlineScript: | az network nic ip-config address-pool add \ --address-pool ${{vars.RESOURCE_TESTNET_NAME}}-backend-pool \ - --ip-config-name ipconfig${{vars.RESOURCE_STARTING_NAME}}-1-${{ GITHUB.RUN_NUMBER }} \ - --nic-name ${{vars.RESOURCE_STARTING_NAME}}-1-${{ GITHUB.RUN_NUMBER }}VMNic \ + --ip-config-name ${{vars.RESOURCE_STARTING_NAME}}-${{ GITHUB.RUN_NUMBER }}-ipconfig \ + --nic-name ${{vars.RESOURCE_STARTING_NAME}}-${{ GITHUB.RUN_NUMBER }}-${{ matrix.host_id }}-nic \ --resource-group Testnet \ --lb-name ${{vars.RESOURCE_TESTNET_NAME}}-loadbalancer From 918065387a27505fec5f58caab8685c56baa019b Mon Sep 17 00:00:00 2001 From: otherview Date: Mon, 9 Oct 2023 16:20:40 +0100 Subject: [PATCH 8/8] fix auto generated names --- .github/workflows/manual-deploy-testnet-l2.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/manual-deploy-testnet-l2.yml b/.github/workflows/manual-deploy-testnet-l2.yml index 4c3e43e82f..3e8c1299c6 100644 --- a/.github/workflows/manual-deploy-testnet-l2.yml +++ b/.github/workflows/manual-deploy-testnet-l2.yml @@ -282,8 +282,8 @@ jobs: inlineScript: | az network nic ip-config address-pool add \ --address-pool ${{vars.RESOURCE_TESTNET_NAME}}-backend-pool \ - --ip-config-name ${{vars.RESOURCE_STARTING_NAME}}-${{ GITHUB.RUN_NUMBER }}-ipconfig \ - --nic-name ${{vars.RESOURCE_STARTING_NAME}}-${{ GITHUB.RUN_NUMBER }}-${{ matrix.host_id }}-nic \ + --ip-config-name ipconfig${{vars.RESOURCE_STARTING_NAME}}-1-${{ GITHUB.RUN_NUMBER }} \ + --nic-name ${{vars.RESOURCE_STARTING_NAME}}-1-${{ GITHUB.RUN_NUMBER }}VMNic \ --resource-group Testnet \ --lb-name ${{vars.RESOURCE_TESTNET_NAME}}-loadbalancer