From 843d6cbbe33c5a3c73dea59a4a38c6dbac3359a9 Mon Sep 17 00:00:00 2001
From: Pedro Gomes <otherview@gmail.com>
Date: Thu, 18 Jan 2024 11:42:51 +0000
Subject: [PATCH] 2 validators deploy (#1750)

* Bump deployed validators to 2

* adding prefunding addr

* update matrix

* fix isGenesis

* healthchecks on validator 2

* upgrade 2 validators
---
 .github/workflows/manual-deploy-testnet-l1.yml  |  2 +-
 .github/workflows/manual-deploy-testnet-l2.yml  | 13 ++++++++++++-
 .github/workflows/manual-upgrade-testnet-l2.yml | 12 +++++++++++-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/manual-deploy-testnet-l1.yml b/.github/workflows/manual-deploy-testnet-l1.yml
index 42715aa7a4..ea48890965 100644
--- a/.github/workflows/manual-deploy-testnet-l1.yml
+++ b/.github/workflows/manual-deploy-testnet-l1.yml
@@ -132,4 +132,4 @@ jobs:
             --blockTimeSecs=15 --slotsPerEpoch=2 --slotsPerSecond=15 \
             --numNodes=1 --gethHTTPStartPort=8025 --gethWSStartPort=9000 \
             --logToFile=false \
-            --prefundedAddrs="${{ vars.ACCOUNT_ADDR_WORKER }},${{ vars.ACCOUNT_ADDR_NODE_0 }},${{ vars.ACCOUNT_ADDR_NODE_1 }},${{ vars.ACCOUNT_ADDR_L1_BRIDGE_TEST }}"'
+            --prefundedAddrs="${{ vars.ACCOUNT_ADDR_WORKER }},${{ vars.ACCOUNT_ADDR_NODE_0 }},${{ vars.ACCOUNT_ADDR_NODE_1 }},${{ vars.ACCOUNT_ADDR_NODE_2 }},${{ vars.ACCOUNT_ADDR_L1_BRIDGE_TEST }}"'
diff --git a/.github/workflows/manual-deploy-testnet-l2.yml b/.github/workflows/manual-deploy-testnet-l2.yml
index 74cea5711f..adbe923a03 100644
--- a/.github/workflows/manual-deploy-testnet-l2.yml
+++ b/.github/workflows/manual-deploy-testnet-l2.yml
@@ -128,31 +128,41 @@ jobs:
 
     strategy:
       matrix:
-        host_id: [ 0,1 ]
+        host_id: [ 0,1,2 ]
         include:
           # Ensure there is a single genesis node
           - is_genesis: true
             host_id: 0
           - is_genesis: false
             host_id: 1
+          - is_genesis: false
+            host_id: 2
           # Ensure there is a single sequencer
           - node_type: sequencer
             host_id: 0
           - node_type: validator
             host_id: 1
+          - node_type: validator
+            host_id: 2
           # Hardcoded lookup keys because GH actions doesn't let you build them inline with the host_id
           - node_pk_lookup: ACCOUNT_PK_NODE_0
             host_id: 0
           - node_pk_lookup: ACCOUNT_PK_NODE_1
             host_id: 1
+          - node_pk_lookup: ACCOUNT_PK_NODE_2
+            host_id: 2
           - node_addr_lookup: ACCOUNT_ADDR_NODE_0
             host_id: 0
           - node_addr_lookup: ACCOUNT_ADDR_NODE_1
             host_id: 1
+          - node_addr_lookup: ACCOUNT_ADDR_NODE_2
+            host_id: 2
           - node_l1_ws_lookup: L1_WS_URL_0
             host_id: 0
           - node_l1_ws_lookup: L1_WS_URL_1
             host_id: 1
+          - node_l1_ws_lookup: L1_WS_URL_2
+            host_id: 2
 
     steps:
       - name: 'Extract branch name'
@@ -286,6 +296,7 @@ jobs:
         run: |
           ./.github/workflows/runner-scripts/wait-node-healthy.sh --host=obscuronode-0-${{ github.event.inputs.testnet_type }}-${{ GITHUB.RUN_NUMBER }}.uksouth.cloudapp.azure.com
           ./.github/workflows/runner-scripts/wait-node-healthy.sh --host=obscuronode-1-${{ github.event.inputs.testnet_type }}-${{ GITHUB.RUN_NUMBER }}.uksouth.cloudapp.azure.com
+          ./.github/workflows/runner-scripts/wait-node-healthy.sh --host=obscuronode-2-${{ github.event.inputs.testnet_type }}-${{ GITHUB.RUN_NUMBER }}.uksouth.cloudapp.azure.com
 
   deploy-l2-contracts:
     needs:
diff --git a/.github/workflows/manual-upgrade-testnet-l2.yml b/.github/workflows/manual-upgrade-testnet-l2.yml
index 0a62c53053..6305e50bd4 100644
--- a/.github/workflows/manual-upgrade-testnet-l2.yml
+++ b/.github/workflows/manual-upgrade-testnet-l2.yml
@@ -99,31 +99,41 @@ jobs:
 
     strategy:
       matrix:
-        host_id: [ 0,1 ]
+        host_id: [ 0,1,2 ]
         include:
           # Ensure there is a single genesis node
           - is_genesis: true
             host_id: 0
           - is_genesis: false
             host_id: 1
+          - is_genesis: false
+            host_id: 2
           # Ensure there is a single sequencer
           - node_type: sequencer
             host_id: 0
           - node_type: validator
             host_id: 1
+          - node_type: validator
+            host_id: 2
           # Hardcoded lookup keys because GH actions doesn't let you build them inline with the host_id
           - node_pk_lookup: ACCOUNT_PK_NODE_0
             host_id: 0
           - node_pk_lookup: ACCOUNT_PK_NODE_1
             host_id: 1
+          - node_pk_lookup: ACCOUNT_PK_NODE_2
+            host_id: 2
           - node_addr_lookup: ACCOUNT_ADDR_NODE_0
             host_id: 0
           - node_addr_lookup: ACCOUNT_ADDR_NODE_1
             host_id: 1
+          - node_addr_lookup: ACCOUNT_ADDR_NODE_2
+            host_id: 2
           - node_l1_ws_lookup: L1_WS_URL_0
             host_id: 0
           - node_l1_ws_lookup: L1_WS_URL_1
             host_id: 1
+          - node_l1_ws_lookup: L1_WS_URL_2
+            host_id: 2
 
     steps:
       - name: 'Extract branch name'