Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update new DNS #1580

Merged
merged 10 commits into from
Oct 10, 2023
Merged

Update new DNS #1580

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ad95f81
Update new DNS
otherview Oct 4, 2023
adc24d5
Update tools/obscuroscan/main/cli.go
otherview Oct 4, 2023
88807aa
get rpc values from address
zkokelj Oct 4, 2023
8c86c03
updating images names
otherview Oct 4, 2023
2201eeb
Merge branch 'pedro/update_dns_2' of github.com:obscuronet/go-obscuro…
otherview Oct 4, 2023
b1672df
fix the lb script
otherview Oct 9, 2023
e37496c
fix naming
otherview Oct 9, 2023
ceebdec
fixing some names
otherview Oct 9, 2023
9180653
fix auto generated names
otherview Oct 9, 2023
edb6595
Merge branch 'pedro/fix_deploy_3' into pedro/update_dns_2
otherview Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/manual-deploy-obscuro-gateway.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
type: choice
options:
- 'dev-testnet'
- 'testnet'
- 'uat-testnet'
- 'sepolia-testnet'

jobs:
Expand All @@ -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' }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/manual-deploy-obscuro-scan-2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
type: choice
options:
- 'dev-testnet'
- 'testnet'
- 'uat-testnet'

jobs:
build-and-deploy:
Expand All @@ -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' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/manual-deploy-obscuroscan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/manual-deploy-testnet-faucet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
type: choice
options:
- 'dev-testnet'
- 'testnet'
- 'uat-testnet'
- 'sepolia-testnet'

workflow_call:
Expand All @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not faucet_uat_testnet?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like all other images are prepended at the start - should we change it ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah changing it everywhere to normalize it

echo "TESTNET_ADDR=erpc.uat-testnet.obscu.ro" >> $GITHUB_ENV
echo "DEFAULT_FAUCET_AMOUNT=100" >> $GITHUB_ENV

- name: 'Sets env vars for dev-testnet'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/runner-scripts/wait-node-healthy.sh
View file
Open in desktop
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=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 ""
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
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 `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/
Expand Down
4 changes: 2 additions & 2 deletions docs/_docs/testnet/essentials.md
View file
Open in desktop
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:** `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:
Expand Down
2 changes: 1 addition & 1 deletion docs/_docs/wallet-extension/wallet-extension.md
View file
Open in desktop
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: `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.
Expand Down
2 changes: 1 addition & 1 deletion integration/manualtests/client_test.go
View file
Open in desktop
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://erpc.testnet.obscu.ro:80"
hostRPCAddress := "http://erpc.sepolia-testnet.obscu.ro:80"
client, err := rpc.NewNetworkClient(hostRPCAddress)
assert.Nil(t, err)

Expand Down
2 changes: 1 addition & 1 deletion integration/manualtests/tx_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ var (
"4bfe14725e685901c062ccd4e220c61cf9c189897b6c78bd18d7f51291b2b8f8",
777,
gethlog.New())
l2Host = "erpc.testnet.obscu.ro"
l2Host = "erpc.uat-testnet.obscu.ro"
l2Port = 81
)

Expand Down
4 changes: 2 additions & 2 deletions integration/networktest/env/network_setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
)
Expand Down
4 changes: 2 additions & 2 deletions tools/faucet/cmd/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/obscuroscan/main/cli.go
View file
Open in desktop
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://erpc.testnet.obscu.ro:80",
rpcServerAddr: "http://erpc.sepolia-testnet.obscu.ro:80",
address: "127.0.0.1:3000/v1",
logPath: "obscuroscan_logs.txt",
}
Expand Down
18 changes: 17 additions & 1 deletion tools/walletextension/api/staticOG/javascript.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'],
},
],
Expand Down
2 changes: 1 addition & 1 deletion tools/walletextension/container_run.sh
View file
Open in desktop
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="erpc.testnet.obscu.ro"
nodeHost="erpc.sepolia-testnet.obscu.ro"
nodePortHTTP=80
nodePortWS=81
logPath="wallet_extension_logs.txt"
Expand Down
4 changes: 2 additions & 2 deletions tools/walletextension/main/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading