From f63a2852aa23a8903a764aaa76d87dc622ca329c Mon Sep 17 00:00:00 2001 From: otherview Date: Mon, 16 Oct 2023 14:07:12 +0100 Subject: [PATCH 1/4] Updates GH Inputs to reflect current networks --- .github/workflows/manual-deploy-testnet-l1.yml | 2 +- .github/workflows/manual-deploy-testnet-l2.yml | 2 +- .github/workflows/manual-recover-network-funds.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/manual-deploy-testnet-l1.yml b/.github/workflows/manual-deploy-testnet-l1.yml index e186d85561..96d5d3814b 100644 --- a/.github/workflows/manual-deploy-testnet-l1.yml +++ b/.github/workflows/manual-deploy-testnet-l1.yml @@ -25,7 +25,7 @@ on: type: choice options: - 'dev-testnet' - - 'testnet' + - 'uat-testnet' jobs: build-and-deploy: diff --git a/.github/workflows/manual-deploy-testnet-l2.yml b/.github/workflows/manual-deploy-testnet-l2.yml index 728dce846d..99b55bee79 100644 --- a/.github/workflows/manual-deploy-testnet-l2.yml +++ b/.github/workflows/manual-deploy-testnet-l2.yml @@ -18,7 +18,7 @@ on: type: choice options: - 'dev-testnet' - - 'testnet' + - 'uat-testnet' - 'sepolia-testnet' log_level: description: 'Log Level 1-Error 5-Trace' diff --git a/.github/workflows/manual-recover-network-funds.yml b/.github/workflows/manual-recover-network-funds.yml index cb0f786a71..e065310d5e 100644 --- a/.github/workflows/manual-recover-network-funds.yml +++ b/.github/workflows/manual-recover-network-funds.yml @@ -12,7 +12,7 @@ on: type: choice options: - 'dev-testnet' - - 'testnet' + - 'uat-testnet' - 'sepolia-testnet' mgmt_contract_addr: description: 'Deployed management contract which will be used to request the funds' From 71fbfa1c9d11e4b0007b77ba25648bbc3e36b612 Mon Sep 17 00:00:00 2001 From: otherview Date: Mon, 16 Oct 2023 15:07:42 +0100 Subject: [PATCH 2/4] updates --- .github/workflows/manual-deploy-testnet-l1.yml | 16 ++++++++-------- .github/workflows/manual-deploy-testnet-l2.yml | 4 ++-- .github/workflows/manual-upgrade-testnet-l2.yml | 6 +++--- integration/manualtests/connection_test.go | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/manual-deploy-testnet-l1.yml b/.github/workflows/manual-deploy-testnet-l1.yml index 96d5d3814b..b7ca94b874 100644 --- a/.github/workflows/manual-deploy-testnet-l1.yml +++ b/.github/workflows/manual-deploy-testnet-l1.yml @@ -40,22 +40,22 @@ jobs: uses: docker/setup-buildx-action@v1 - name: 'Sets env vars for testnet' - if: ${{ github.event.inputs.testnet_type == 'testnet' }} + if: ${{ github.event.inputs.testnet_type == 'uat-testnet' }} run: | - echo "ETH2NETWORK_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/eth2network:latest" >> $GITHUB_ENV - echo "L1_DOCKER_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/testnet_l1network:latest" >> $GITHUB_ENV - echo "L1_CONTAINER_NAME=testnet-eth2network" >> $GITHUB_ENV - echo "RESOURCE_TAG_NAME=l1testnetlatest" >> $GITHUB_ENV - echo "RESOURCE_NAME=testnet-eth2network" >> $GITHUB_ENV + echo "ETH2NETWORK_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/uat_testnet_eth2network:latest" >> $GITHUB_ENV + echo "L1_DOCKER_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/uat_testnet_l1network:latest" >> $GITHUB_ENV + echo "L1_CONTAINER_NAME=uat_testnet-eth2network" >> $GITHUB_ENV + echo "RESOURCE_TAG_NAME=uat-testnet-l1-latest" >> $GITHUB_ENV + echo "RESOURCE_NAME=uat-testnet-eth2network" >> $GITHUB_ENV echo "TEST_BRIDGE_ADDRESS=0xE09a37ABc1A63441404007019E5BC7517bE2c43f" >> $GITHUB_ENV - name: 'Sets env vars for dev-testnet' if: ${{ github.event.inputs.testnet_type == 'dev-testnet' }} run: | - echo "ETH2NETWORK_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/dev_eth2network:latest" >> $GITHUB_ENV + echo "ETH2NETWORK_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/dev_testnet_eth2network:latest" >> $GITHUB_ENV echo "L1_DOCKER_BUILD_TAG=testnetobscuronet.azurecr.io/obscuronet/dev_testnet_l1network:latest" >> $GITHUB_ENV echo "L1_CONTAINER_NAME=dev-testnet-eth2network" >> $GITHUB_ENV - echo "RESOURCE_TAG_NAME=devl1testnetlatest" >> $GITHUB_ENV + echo "RESOURCE_TAG_NAME=dev-testnet-l1-latest" >> $GITHUB_ENV echo "RESOURCE_NAME=dev-testnet-eth2network" >> $GITHUB_ENV echo "TEST_BRIDGE_ADDRESS=0xE09a37ABc1A63441404007019E5BC7517bE2c43f" >> $GITHUB_ENV diff --git a/.github/workflows/manual-deploy-testnet-l2.yml b/.github/workflows/manual-deploy-testnet-l2.yml index 99b55bee79..4ea71928b7 100644 --- a/.github/workflows/manual-deploy-testnet-l2.yml +++ b/.github/workflows/manual-deploy-testnet-l2.yml @@ -363,6 +363,6 @@ jobs: curl -XPOST -H "Authorization: Bearer ${{ secrets.GH_TOKEN }}" -H "Accept:application/vnd.github" -H "Content-Type:application/json" https://api.github.com/repos/obscuronet/obscuro-test/dispatches --data '{ "event_type": "dev_testnet_deployed", "client_payload": { "ref": "${{ github.ref_name }}" }' - name: 'Send a repository dispatch to obscuro-test on deployment of testnet' - if: ${{ (github.event.inputs.testnet_type == 'testnet') }} + if: ${{ (github.event.inputs.testnet_type == 'uat-testnet') }} run: | - curl -XPOST -H "Authorization: Bearer ${{ secrets.GH_TOKEN }}" -H "Accept:application/vnd.github" -H "Content-Type:application/json" https://api.github.com/repos/obscuronet/obscuro-test/dispatches --data '{ "event_type": "testnet_deployed", "client_payload": { "ref": "${{ github.ref_name }}" }' + curl -XPOST -H "Authorization: Bearer ${{ secrets.GH_TOKEN }}" -H "Accept:application/vnd.github" -H "Content-Type:application/json" https://api.github.com/repos/obscuronet/obscuro-test/dispatches --data '{ "event_type": "uat_testnet_deployed", "client_payload": { "ref": "${{ github.ref_name }}" }' diff --git a/.github/workflows/manual-upgrade-testnet-l2.yml b/.github/workflows/manual-upgrade-testnet-l2.yml index 56bdb9884d..ae90440b30 100644 --- a/.github/workflows/manual-upgrade-testnet-l2.yml +++ b/.github/workflows/manual-upgrade-testnet-l2.yml @@ -25,7 +25,7 @@ on: type: choice options: - 'dev-testnet' - - 'testnet' + - 'uat-testnet' - 'sepolia-testnet' log_level: description: 'Log Level 1-Error 5-Trace' @@ -230,9 +230,9 @@ jobs: curl -XPOST -H "Authorization: Bearer ${{ secrets.GH_TOKEN }}" -H "Accept:application/vnd.github" -H "Content-Type:application/json" https://api.github.com/repos/obscuronet/obscuro-test/dispatches --data '{ "event_type": "dev_testnet_upgraded", "client_payload": { "ref": "${{ github.ref_name }}" }' - name: 'Send a repository dispatch to obscuro-test on upgrade of testnet' - if: ${{ github.event.inputs.testnet_type == 'testnet' }} + if: ${{ github.event.inputs.testnet_type == 'uat-testnet' }} run: | - curl -XPOST -H "Authorization: Bearer ${{ secrets.GH_TOKEN }}" -H "Accept:application/vnd.github" -H "Content-Type:application/json" https://api.github.com/repos/obscuronet/obscuro-test/dispatches --data '{ "event_type": "testnet_upgraded", "client_payload": { "ref": "${{ github.ref_name }}" }' + curl -XPOST -H "Authorization: Bearer ${{ secrets.GH_TOKEN }}" -H "Accept:application/vnd.github" -H "Content-Type:application/json" https://api.github.com/repos/obscuronet/obscuro-test/dispatches --data '{ "event_type": "uat_testnet_upgraded", "client_payload": { "ref": "${{ github.ref_name }}" }' obscuro-test-signal-on-schedule: runs-on: ubuntu-latest diff --git a/integration/manualtests/connection_test.go b/integration/manualtests/connection_test.go index 55f30e8f7c..fcbb66c4df 100644 --- a/integration/manualtests/connection_test.go +++ b/integration/manualtests/connection_test.go @@ -15,11 +15,11 @@ import ( ) func TestSubscribeToOG(t *testing.T) { - t.Skip("skip manual tests") + //t.Skip("skip manual tests") // Using http - ogHTTPAddress := "https://dev-testnet.obscu.ro:443" - ogWSAddress := "wss://dev-testnet.obscu.ro:81" + ogHTTPAddress := "https://uat-testnet.obscu.ro" + ogWSAddress := "wss://uat-testnet.obscu.ro:81" // ogWSAddress := "ws://51.132.131.47:81" ogClient := lib.NewObscuroGatewayLibrary(ogHTTPAddress, ogWSAddress) From 36c2a702baaada850ccefc2d360c2bd5427b0d9d Mon Sep 17 00:00:00 2001 From: otherview Date: Mon, 16 Oct 2023 15:12:21 +0100 Subject: [PATCH 3/4] remove manual test --- integration/manualtests/connection_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/integration/manualtests/connection_test.go b/integration/manualtests/connection_test.go index fcbb66c4df..55f30e8f7c 100644 --- a/integration/manualtests/connection_test.go +++ b/integration/manualtests/connection_test.go @@ -15,11 +15,11 @@ import ( ) func TestSubscribeToOG(t *testing.T) { - //t.Skip("skip manual tests") + t.Skip("skip manual tests") // Using http - ogHTTPAddress := "https://uat-testnet.obscu.ro" - ogWSAddress := "wss://uat-testnet.obscu.ro:81" + ogHTTPAddress := "https://dev-testnet.obscu.ro:443" + ogWSAddress := "wss://dev-testnet.obscu.ro:81" // ogWSAddress := "ws://51.132.131.47:81" ogClient := lib.NewObscuroGatewayLibrary(ogHTTPAddress, ogWSAddress) From 9bf87911892746a3419a0cd6fa737bf39577aaf4 Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Mon, 16 Oct 2023 15:22:20 +0100 Subject: [PATCH 4/4] Update .github/workflows/manual-upgrade-testnet-l2.yml --- .github/workflows/manual-upgrade-testnet-l2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual-upgrade-testnet-l2.yml b/.github/workflows/manual-upgrade-testnet-l2.yml index ae90440b30..780c7b0b80 100644 --- a/.github/workflows/manual-upgrade-testnet-l2.yml +++ b/.github/workflows/manual-upgrade-testnet-l2.yml @@ -229,7 +229,7 @@ jobs: run: | curl -XPOST -H "Authorization: Bearer ${{ secrets.GH_TOKEN }}" -H "Accept:application/vnd.github" -H "Content-Type:application/json" https://api.github.com/repos/obscuronet/obscuro-test/dispatches --data '{ "event_type": "dev_testnet_upgraded", "client_payload": { "ref": "${{ github.ref_name }}" }' - - name: 'Send a repository dispatch to obscuro-test on upgrade of testnet' + - name: 'Send a repository dispatch to obscuro-test on upgrade of uat-testnet' if: ${{ github.event.inputs.testnet_type == 'uat-testnet' }} run: | curl -XPOST -H "Authorization: Bearer ${{ secrets.GH_TOKEN }}" -H "Accept:application/vnd.github" -H "Content-Type:application/json" https://api.github.com/repos/obscuronet/obscuro-test/dispatches --data '{ "event_type": "uat_testnet_upgraded", "client_payload": { "ref": "${{ github.ref_name }}" }'