Skip to content

Commit

Permalink
Update Tesnet dns (#1531)
Browse files Browse the repository at this point in the history
* Update Tesnet dns

* Pr comments
  • Loading branch information
otherview authored Sep 18, 2023
1 parent e9a8d01 commit 7e67c78
Show file tree
Hide file tree
Showing 14 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/manual-deploy-dev-obscuroscan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/manual-deploy-obscuro-scan-2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual-deploy-obscuroscan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
startup-command: './tools/obscuroscan/main/main --rpcServerAddress http://erpc.testnet.obscu.ro:80 --address 0.0.0.0:80'
4 changes: 2 additions & 2 deletions .github/workflows/manual-deploy-testnet-faucet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/runner-scripts/wait-node-healthy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
4 changes: 2 additions & 2 deletions docs/_docs/testnet/essentials.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docs/_docs/wallet-extension/wallet-extension.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion integration/manualtests/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.testnet.obscu.ro:80"
client, err := rpc.NewNetworkClient(hostRPCAddress)
assert.Nil(t, err)

Expand Down
8 changes: 4 additions & 4 deletions integration/networktest/env/network_setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

func Testnet() networktest.Environment {
connector := NewTestnetConnector(
"http://testnet.obscu.ro:80",
[]string{"http://testnet.obscu.ro:80"}, // for now we'll just use sequencer as validator node... todo (@matt)
"http://erpc.testnet.obscu.ro:80",
[]string{"http://erpc.testnet.obscu.ro:80"}, // for now we'll just use sequencer as validator node... todo (@matt)
"http://testnet-faucet.uksouth.azurecontainer.io/fund/obx",
"ws://testnet-eth2network.uksouth.cloudapp.azure.com:9000",
)
Expand All @@ -17,8 +17,8 @@ func Testnet() networktest.Environment {

func DevTestnet() networktest.Environment {
connector := NewTestnetConnector(
"http://dev-testnet.obscu.ro:80",
[]string{"http://dev-testnet.obscu.ro:80"}, // for now we'll just use sequencer as validator node... todo (@matt)
"http://erpc.dev-testnet.obscu.ro:80",
[]string{"http://erpc.dev-testnet.obscu.ro:80"}, // for now we'll just use sequencer as validator node... todo (@matt)
"http://dev-testnet-faucet.uksouth.azurecontainer.io/fund/obx",
"ws://dev-testnet-eth2network.uksouth.cloudapp.azure.com:9000",
)
Expand Down
4 changes: 2 additions & 2 deletions tools/faucet/cmd/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/obscuroscan/main/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
Expand Down
2 changes: 1 addition & 1 deletion tools/obscuroscan_v2/backend/cmd/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
Expand Down
2 changes: 1 addition & 1 deletion tools/walletextension/container_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 7e67c78

Please sign in to comment.