Merge pull request #898 from near/develop

merge develop to main for rc5

.github/workflows/deploy-multichain-dev-contract.yml

@@ -1,5 +1,6 @@
 name: Deploy Dev Smart Contract
 on:
+  workflow_dispatch:
   pull_request:
     types: [closed]
     branches:

.github/workflows/multichain-dev.yml → .github/workflows/multichain-deploy-dev-nodes.yml

@@ -1,5 +1,6 @@
 name: Build Image & Deploy Multichain Dev
 on:
+  workflow_dispatch:
   pull_request:
     types: [closed]
     branches:
@@ -13,7 +14,7 @@ env:
 
 jobs:
   build-mpc-recovery:
-    if: github.event.pull_request.merged == true
+    if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -30,10 +31,10 @@ jobs:
         with:
           push: true
           file: ./Dockerfile.multichain
-          tags: "${{ env.IMAGE }}:${{ env.TAG }}"
+          tags: "${{ env.IMAGE }}:${{ env.TAG }},${{ env.IMAGE }}:latest"
 
   deploy:
-    if: github.event.pull_request.merged == true
+    if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-latest
     needs: build-mpc-recovery
     steps:
@@ -48,6 +49,7 @@ jobs:
       - name: 'Set project'
         run: 'gcloud config set project pagoda-discovery-platform-dev'
 
+        # This is not pretty, but this step needs to be updated every time a new node is added.
       - name: 'Update Nodes'
         run: |
           gcloud compute instances update-container multichain-dev-0 --zone us-central1-a --container-image=${{ env.IMAGE }}:${{ env.TAG }} & \
@@ -57,4 +59,8 @@ jobs:
           gcloud compute instances update-container multichain-dev-4 --zone us-central1-a --container-image=${{ env.IMAGE }}:${{ env.TAG }} & \
           gcloud compute instances update-container multichain-dev-5 --zone us-central1-a --container-image=${{ env.IMAGE }}:${{ env.TAG }} & \
           gcloud compute instances update-container multichain-dev-6 --zone us-central1-a --container-image=${{ env.IMAGE }}:${{ env.TAG }} & \
-          gcloud compute instances update-container multichain-dev-7 --zone us-central1-a --container-image=${{ env.IMAGE }}:${{ env.TAG }}
+          gcloud compute instances update-container multichain-dev-7 --zone us-central1-a --container-image=${{ env.IMAGE }}:${{ env.TAG }} & \
+          gcloud compute instances update-container multichain-dev-8 --zone us-central1-a --container-image=${{ env.IMAGE }}:${{ env.TAG }} & \
+          gcloud compute instances update-container multichain-dev-9 --zone us-central1-a --container-image=${{ env.IMAGE }}:${{ env.TAG }} & \
+          gcloud compute instances update-container multichain-dev-10 --zone us-central1-a --container-image=${{ env.IMAGE }}:${{ env.TAG }} & \
+          gcloud compute instances update-container multichain-dev-11 --zone us-central1-a --container-image=${{ env.IMAGE }}:${{ env.TAG }} & \

.github/workflows/multichain-integration.yml

@@ -42,7 +42,7 @@ jobs:
       - name: Pull Relayer & Sandbox Docker Images
         run: |
           docker pull ghcr.io/near/os-relayer:12ba6e35690df3979fce0b36a41d0ca0db9c0ab4
-          docker pull ghcr.io/near/near-lake-indexer:node-1.40.0
+          docker pull ghcr.io/near/near-lake-indexer:node-2.3.0
           docker pull localstack/localstack:3.5.0
 
       - name: Install stable toolchain

.github/workflows/multichain-nightly.yml

@@ -53,7 +53,7 @@ jobs:
       - name: Pull Relayer & Sandbox Docker Images
         run: |
           docker pull ghcr.io/near/os-relayer:12ba6e35690df3979fce0b36a41d0ca0db9c0ab4
-          docker pull ghcr.io/near/near-lake-indexer:node-1.40.0
+          docker pull ghcr.io/near/near-lake-indexer:node-2.3.0
           docker pull localstack/localstack:3.5.0
 
       - name: Install stable toolchain

.github/workflows/multichain-prod.yml → .github/workflows/multichain-update-prod-nodes.yml

@@ -10,15 +10,12 @@ on:
         description: mainnet or testnet network
         default: testnet
         required: true
-      image:
-        description: Full Artifact Registry image with tag (e.g. us-east1-docker.pkg.dev/pagoda-discovery-platform-prod/multichain-public/multichain-< testnet | mainnet >)
-        required: true
-        default: us-east1-docker.pkg.dev/pagoda-discovery-platform-prod/multichain-public/multichain-testnet
 
 
 jobs:
   build-mpc-recovery:
     runs-on: ubuntu-latest
+    environment: prod
     steps:
       - uses: actions/checkout@v3
         name: "Checkout mpc-recovery"
@@ -28,10 +25,11 @@ jobs:
         env:
           GOOGLE_CREDENTIALS: ${{ secrets.GCP_CREDENTIALS_PROD }}
 
+        # Since the Mainnet and Testnet nodes are polling this image repository, only the image needs to be updated in order to trigger a deployment
       - name: Build Docker image and deploy partner nodes
         id: docker-push-tagged-partner
         uses: docker/build-push-action@v4
         with:
           push: true
           file: ./Dockerfile.multichain
-          tags: "${{ github.event.inputs.image }}:latest"
+          tags: "us-east1-docker.pkg.dev/pagoda-discovery-platform-prod/multichain-public/multichain-${{ github.event.inputs.network }}:latest"