From 32c902aa211df572f2e71f7aeec0bf357149c194 Mon Sep 17 00:00:00 2001 From: otherview Date: Mon, 18 Sep 2023 12:17:46 +0100 Subject: [PATCH] Update Tesnet dns --- .github/workflows/manual-deploy-dev-obscuroscan.yml | 2 +- .github/workflows/manual-deploy-obscuro-scan-2.yml | 4 ++-- .github/workflows/manual-deploy-obscuroscan.yml | 2 +- .github/workflows/manual-deploy-testnet-faucet.yml | 4 ++-- .github/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 +- tools/faucet/cmd/cli.go | 4 ++-- tools/obscuroscan/main/cli.go | 2 +- tools/obscuroscan_v2/backend/cmd/cli.go | 2 +- tools/walletextension/container_run.sh | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/manual-deploy-dev-obscuroscan.yml b/.github/workflows/manual-deploy-dev-obscuroscan.yml index 151f945610..0f53d1c6aa 100644 --- a/.github/workflows/manual-deploy-dev-obscuroscan.yml +++ b/.github/workflows/manual-deploy-dev-obscuroscan.yml @@ -49,7 +49,7 @@ jobs: name: dev-testnet-obscuroscan location: 'uksouth' restart-policy: 'Never' - command-line: ./tools/obscuroscan/main/main --rpcServerAddress http://dev-testnet.obscu.ro:80 --address 0.0.0.0:80 + command-line: ./tools/obscuroscan/main/main --rpcServerAddress http://erpc.dev-testnet.obscu.ro:80 --address 0.0.0.0:80 ports: '80' cpu: 2 memory: 2 diff --git a/.github/workflows/manual-deploy-obscuro-scan-2.yml b/.github/workflows/manual-deploy-obscuro-scan-2.yml index 3719f97eaa..71da379b93 100644 --- a/.github/workflows/manual-deploy-obscuro-scan-2.yml +++ b/.github/workflows/manual-deploy-obscuro-scan-2.yml @@ -29,14 +29,14 @@ jobs: 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=testnet.obscu.ro" >> $GITHUB_ENV + echo "OBSCURO_SCAN_NODE_HOST=erpc.testnet.obscu.ro" >> $GITHUB_ENV - 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_NODE_HOST=dev-testnet.obscu.ro" >> $GITHUB_ENV + echo "OBSCURO_SCAN_NODE_HOST=erpc.dev-testnet.obscu.ro" >> $GITHUB_ENV - name: 'Login to Azure docker registry' uses: azure/docker-login@v1 diff --git a/.github/workflows/manual-deploy-obscuroscan.yml b/.github/workflows/manual-deploy-obscuroscan.yml index f3eea02a49..f521a89677 100644 --- a/.github/workflows/manual-deploy-obscuroscan.yml +++ b/.github/workflows/manual-deploy-obscuroscan.yml @@ -45,4 +45,4 @@ jobs: with: app-name: ${{ env.AZURE_WEBAPP_NAME }} images: testnetobscuronet.azurecr.io/obscuronet/obscuro_testnet_obscuroscan:latest - startup-command: './tools/obscuroscan/main/main --rpcServerAddress http://testnet.obscu.ro:80 --address 0.0.0.0:80' \ No newline at end of file + startup-command: './tools/obscuroscan/main/main --rpcServerAddress http://erpc.testnet.obscu.ro:80 --address 0.0.0.0:80' \ No newline at end of file diff --git a/.github/workflows/manual-deploy-testnet-faucet.yml b/.github/workflows/manual-deploy-testnet-faucet.yml index 7548006595..1c19efede2 100644 --- a/.github/workflows/manual-deploy-testnet-faucet.yml +++ b/.github/workflows/manual-deploy-testnet-faucet.yml @@ -44,13 +44,13 @@ jobs: if: ${{ inputs.testnet_type == 'testnet' }} run: | echo "FAUCET_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/faucet_testnet:latest" >> $GITHUB_ENV - echo "TESTNET_ADDR=testnet.obscu.ro" >> $GITHUB_ENV + echo "TESTNET_ADDR=erpc.testnet.obscu.ro" >> $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 "TESTNET_ADDR=dev-testnet.obscu.ro" >> $GITHUB_ENV + echo "TESTNET_ADDR=erpc.dev-testnet.obscu.ro" >> $GITHUB_ENV - name: 'Login to Azure docker registry' uses: azure/docker-login@v1 diff --git a/.github/workflows/runner-scripts/wait-node-healthy.sh b/.github/workflows/runner-scripts/wait-node-healthy.sh index 3c6e1692af..af25dc756f 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=testnet.obscu.ro --port=80" + echo " - $(basename "${0}") --host=erpc.testnet.obscu.ro --port=80" echo "" echo " node *Required* Set the host address" echo "" diff --git a/README.md b/README.md index 2264f34f2d..181330f568 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 `testnet.obscu.ro` i.e. +extension using the default parameters, where the `nodeHost` will default to the testnet host URL `erpc.testnet.obscu.ro` i.e. ``` cd ./tools/walletextension/main/ diff --git a/docs/_docs/testnet/essentials.md b/docs/_docs/testnet/essentials.md index b6d3b5aac3..91fa04c4e7 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:** `testnet.obscu.ro:80` -- **RPC websocket address:** `testnet.obscu.ro:81` +- **RPC http address:** `erpc.testnet.obscu.ro:80` +- **RPC websocket address:** `erpc.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 d40e6bb994..11b39648d3 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: `testnet.obscu.ro`): The Obscuro node for the RPC connection. + * `nodeHost` (default: `erpc.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 1481c5bce0..88fc11ca38 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://testnet.obscu.ro:80" + hostRPCAddress := "http://erpc.erpc.testnet.obscu.ro:80" client, err := rpc.NewNetworkClient(hostRPCAddress) assert.Nil(t, err) diff --git a/tools/faucet/cmd/cli.go b/tools/faucet/cmd/cli.go index f6bf8c4c3f..1db159f207 100644 --- a/tools/faucet/cmd/cli.go +++ b/tools/faucet/cmd/cli.go @@ -14,8 +14,8 @@ const ( faucetPortUsage = "The port on which to serve the faucet endpoint. Default: 80." nodeHostName = "nodeHost" - nodeHostDefault = "testnet.obscu.ro" - nodeHostUsage = "The host on which to connect to the Obscuro node. Default: `testnet.obscu.ro`." + nodeHostDefault = "erpc.testnet.obscu.ro" + nodeHostUsage = "The host on which to connect to the Obscuro node. Default: `erpc.testnet.obscu.ro`." nodeHTTPPortName = "nodePort" nodeHTTPPortDefault = 80 diff --git a/tools/obscuroscan/main/cli.go b/tools/obscuroscan/main/cli.go index 8c563fd078..95e75155ad 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://testnet.obscu.ro:80", + rpcServerAddr: "http://erpc.testnet.obscu.ro:80", address: "127.0.0.1:3000/v1", logPath: "obscuroscan_logs.txt", } diff --git a/tools/obscuroscan_v2/backend/cmd/cli.go b/tools/obscuroscan_v2/backend/cmd/cli.go index d70a348c88..863876ff31 100644 --- a/tools/obscuroscan_v2/backend/cmd/cli.go +++ b/tools/obscuroscan_v2/backend/cmd/cli.go @@ -8,7 +8,7 @@ import ( func parseCLIArgs() *config.Config { defaultConfig := &config.Config{ - NodeHostAddress: "http://dev-testnet.obscu.ro:80", + NodeHostAddress: "http://erpc.dev-testnet.obscu.ro:80", ServerAddress: "0.0.0.0:80", LogPath: "obscuroscan_logs.txt", } diff --git a/tools/walletextension/container_run.sh b/tools/walletextension/container_run.sh index fcd8c916ca..95dc96ae38 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="testnet.obscu.ro" +nodeHost="erpc.testnet.obscu.ro" nodePortHTTP=80 nodePortWS=81 logPath="wallet_extension_logs.txt"