From 8683246fd42c8939fee117c6499cc8ca10557009 Mon Sep 17 00:00:00 2001 From: Matt <98158711+BedrockSquirrel@users.noreply.github.com> Date: Thu, 8 Sep 2022 15:06:05 +0100 Subject: [PATCH] update default RPC ports to use WS (#643) --- .github/workflows/manual-deploy-obscuroscan.yml | 2 +- testnet/testnet-deploy-l2-contracts.sh | 2 +- tools/azuredeployer/networkdeployer/README.md | 2 +- tools/azuredeployer/networkdeployer/run.sh | 2 +- tools/networkmanager/cli.go | 2 +- tools/obscuroscan/main/cli.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/manual-deploy-obscuroscan.yml b/.github/workflows/manual-deploy-obscuroscan.yml index 5afb3c758f..eb28fbbd8d 100644 --- a/.github/workflows/manual-deploy-obscuroscan.yml +++ b/.github/workflows/manual-deploy-obscuroscan.yml @@ -63,7 +63,7 @@ jobs: name: testnet-obscuroscan location: 'uksouth' restart-policy: 'Never' - command-line: ./tools/obscuroscan/main/main --rpcServerAddress testnet.obscu.ro:13000 --address 0.0.0.0:80 + command-line: ./tools/obscuroscan/main/main --rpcServerAddress testnet.obscu.ro:13001 --address 0.0.0.0:80 ports: '80' cpu: 2 memory: 2 diff --git a/testnet/testnet-deploy-l2-contracts.sh b/testnet/testnet-deploy-l2-contracts.sh index bc0a695a8d..e71218c64d 100755 --- a/testnet/testnet-deploy-l2-contracts.sh +++ b/testnet/testnet-deploy-l2-contracts.sh @@ -30,7 +30,7 @@ start_path="$(cd "$(dirname "${0}")" && pwd)" testnet_path="${start_path}" # Define defaults -l2port=13000 +l2port=13001 # todo: get rid of these defaults and require them to be passed in, using github secrets for testnet values (requires bridge.go changes) hocpkstring="6e384a07a01263518a09a5424c7b6bbfc3604ba7d93f47e3a455cbdd7f9f0682" pocpkstring="4bfe14725e685901c062ccd4e220c61cf9c189897b6c78bd18d7f51291b2b8f8" diff --git a/tools/azuredeployer/networkdeployer/README.md b/tools/azuredeployer/networkdeployer/README.md index b6564e1623..0c1fb33445 100644 --- a/tools/azuredeployer/networkdeployer/README.md +++ b/tools/azuredeployer/networkdeployer/README.md @@ -26,6 +26,6 @@ network. * The enclave logs can be viewed using `docker logs ` * The Geth network logs are found under `~/go-obscuro/integration/.build/geth//node_logs.txt` -* The first Obscuro host can be connected to remotely on port `13000` +* The first Obscuro host can be connected to remotely via WS on port `13001` * This repo contains a tool under `tools/obscuroclient/` that can be used to connect remotely to the running Obscuro host and retrieve the current block head height diff --git a/tools/azuredeployer/networkdeployer/run.sh b/tools/azuredeployer/networkdeployer/run.sh index 81bd833219..8179dfdbf8 100644 --- a/tools/azuredeployer/networkdeployer/run.sh +++ b/tools/azuredeployer/networkdeployer/run.sh @@ -26,4 +26,4 @@ sudo docker run -e OE_SIMULATION=0 --privileged -v /dev/sgx:/dev/sgx -p 127.0.0. go-obscuro/go/host/main/host --id=1 --isGenesis=true --p2pBindAddress=0.0.0.0:10000 --p2pPublicAddress=127.0.0.1:10000 --enclaveRPCAddress=localhost:11000 --clientRPCHost=0.0.0.0 --clientRPCPortHttp=13000 --l1NodePort=12100 --privateKey=$PRIV_KEY_ONE > ./run_logs.txt 2>&1 & go-obscuro/go/host/main/host --id=2 --isGenesis=false --p2pBindAddress=0.0.0.0:10001 --p2pPublicAddress=127.0.0.1:10001 --enclaveRPCAddress=localhost:11001 --clientRPCHost=localhost --clientRPCPortHttp=13001 --l1NodePort=12101 --privateKey=$PRIV_KEY_TWO > ./run_logs.txt 2>&1 & cd go-obscuro -sudo ./tools/obscuroscan/main/obscuroscan --rpcServerAddress=127.0.0.1:13000 --address=0.0.0.0:80 > ../run_logs.txt 2>&1 & \ No newline at end of file +sudo ./tools/obscuroscan/main/obscuroscan --rpcServerAddress=127.0.0.1:13001 --address=0.0.0.0:80 > ../run_logs.txt 2>&1 & \ No newline at end of file diff --git a/tools/networkmanager/cli.go b/tools/networkmanager/cli.go index 5fa2a7b87d..bd81ee1f98 100644 --- a/tools/networkmanager/cli.go +++ b/tools/networkmanager/cli.go @@ -81,7 +81,7 @@ func defaultNetworkManagerConfig() Config { obscuroChainID: integration.ObscuroChainID, mgmtContractAddress: common.BytesToAddress([]byte("")), erc20ContractAddress: common.BytesToAddress([]byte("")), - obscuroClientAddress: "127.0.0.1:13000", + obscuroClientAddress: "127.0.0.1:13001", erc20Token: "TST", } } diff --git a/tools/obscuroscan/main/cli.go b/tools/obscuroscan/main/cli.go index a7b76933e1..de44fd3554 100644 --- a/tools/obscuroscan/main/cli.go +++ b/tools/obscuroscan/main/cli.go @@ -25,7 +25,7 @@ type obscuroscanConfig struct { func defaultObscuroClientConfig() obscuroscanConfig { return obscuroscanConfig{ nodeID: "", - rpcServerAddr: "testnet.obscu.ro:13000", + rpcServerAddr: "testnet.obscu.ro:13001", address: "127.0.0.1:3000", } }