Update new DNS

.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
 

.github/workflows/manual-deploy-obscuro-gateway.yml

@@ -13,7 +13,7 @@ on:
         type: choice
         options:
           - 'dev-testnet'
-          - 'testnet'
+          - 'uat-testnet'
           - 'sepolia-testnet'
 
 jobs:
@@ -32,17 +32,17 @@ 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' }}
         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

.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,17 +25,17 @@ 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' }}
         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'

.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

.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,23 +42,23 @@ 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/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
 

.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
 
@@ -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 \

.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 \

.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 ""

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 
@@ -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/

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:

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.

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)
 

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
 )
 

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",
 	)

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

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 "$@"

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.sepolia-testnet.obscu.ro:80",
 		address:       "127.0.0.1:3000/v1",
 		logPath:       "obscuroscan_logs.txt",
 	}

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'],
                 },
             ],

tools/walletextension/container_run.sh

@@ -11,12 +11,12 @@ 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"
 databasePath=".obscuro/gateway_database.db"
-image="obscuronet/obscuro_gateway_testnet:latest"
+image="obscuronet/obscuro_gateway_sepolia_testnet:latest"
 
 # Parse the options
 for argument in "$@"

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