Update new DNS

ten-protocol · Oct 4, 2023 · ad95f81 · ad95f81
1 parent 1dea9e9
commit ad95f81
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 32 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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