OK

.github/scripts/check_finalization.sh

@@ -2,16 +2,17 @@
 
 ## USAGE
 ##  .github/scripts/check_finalization.sh <rpc-host> <rpc-port>
-## if <rpc-host> <rpc-port> are empty default values will be used (127.0.0.1 and 9933)
+## if <rpc-host> <rpc-port> <network> are empty default values will be used (127.0.0.1, 9933 and host)
 ##
 
 RPC_HOST=${1:-127.0.0.1}
 RPC_PORT=${2:-9933}
+NETWORK=${3:-host}
 
 LAST_FINALIZED=""
 
 while [[ "$LAST_FINALIZED" =~ "0x0" ]] || [[ -z "$LAST_FINALIZED" ]]; do
-  block_hash=$(docker run --network host appropriate/curl:latest \
+  block_hash=$(docker run --network $NETWORK appropriate/curl:latest \
                       -H "Content-Type: application/json" \
                       -d '{"id":1, "jsonrpc":"2.0", "method": "chain_getFinalizedHead"}' http://$RPC_HOST:$RPC_PORT | jq '.result')
   ret_val=$?
@@ -20,7 +21,7 @@ while [[ "$LAST_FINALIZED" =~ "0x0" ]] || [[ -z "$LAST_FINALIZED" ]]; do
     continue
   fi
 
-  finalized_block=$(docker run --network host appropriate/curl:latest \
+  finalized_block=$(docker run --network $NETWORK appropriate/curl:latest \
                            -H "Content-Type: application/json" \
                            -d '{"id":1, "jsonrpc":"2.0", "method": "chain_getBlock", "params": ['$block_hash']}' http://$RPC_HOST:$RPC_PORT | jq '.result.block.header.number')
 

.github/workflows/deploy-the-button.yaml

@@ -6,33 +6,30 @@ on:
     workflows: [e2e-tests-contracts]
     types:
       - completed
+  branches:
+      - benjamin
 
 # allow only once run instance of this workflow ever
 concurrency:
   group: ${{ github.workflow }}
   cancel-in-progress: false
 
 env:
-  CHECKOUT_REF: benjamin
+  CHECKOUT_BRANCH: benjamin
   CACHE_KEY: fe-benjamin-button
   CONTRACTS_ENVFILE: fe-benjamin
   CARGOCONTRACT_REV: 2b1758756de59bd81e7bed5f8429d364f281cb9a
   NODE_VERSION: 16
   S3BUCKET_PATH: contracts/fe-benjamin-button
-  # LABEL_DEPLOY_CONTRACTS: '[AZERO] DEPLOY-CONTRACTS'
-  # LABEL_DESTROYED: 'DESTROYED'
-  # LABEL_DEPLOYED: 'DEPLOYED'
-  # LABEL_DEPLOYED_CONTRACTS: 'DEPLOYED-CONTRACTS'
 
 jobs:
   build_and_deploy_contracts:
-    # if: (github.event_name == 'push') || (github.event_name == 'pull_request' && github.event.action == 'labeled' && github.event.label.name == '[AZERO] DEPLOY-CONTRACTS')
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout repo
         uses: actions/[email protected]
         with:
-          ref: ${{ env.CHECKOUT_REF }}
+          ref: ${{ env.CHECKOUT_BRANCH }}
 
       - name: Check if environment is reachable
         shell: bash
@@ -101,15 +98,13 @@ jobs:
           aws-region: ${{ env.AWS_REGION }}
 
       - name: Get contracts' target directories cache from S3 bucket
-        # if: (github.event_name == 'push') || (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, env.LABEL_DEPLOYED_CONTRACTS))
         shell: bash
         continue-on-error: true
         run: |
           aws s3 cp s3://${{ secrets.CI_S3BUCKET_NAME }}/${{ env.S3BUCKET_PATH }}/targets.tgz targets.tgz
           tar -xzf targets.tgz
 
       - name: Copy metadata.json and addresses.json files from S3 bucket
-        # if: (github.event_name == 'push') || (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, env.LABEL_DEPLOYED_CONTRACTS))
         shell: bash
         run: |
           aws s3 cp s3://${{ secrets.CI_S3BUCKET_NAME }}/${{ env.S3BUCKET_PATH }}/addresses.json contracts/addresses.json
@@ -184,19 +179,6 @@ jobs:
           -H 'Authorization: Bearer ${{ secrets.CI_GH_TOKEN }}' \
           -d '{ "ref":"main", "inputs": { "buildImage": "false", "deployImage": "true", "buildFEBenjaminImage": "true", "deployFEBenjaminImage": "true" }}'
 
-      # - name: Add label to mark that contracts have been deployed
-      #   uses: actions-ecosystem/[email protected]
-      #   with:
-      #     labels: ${{ env.LABEL_DEPLOYED_CONTRACTS }}
-      #     github_token: ${{ secrets.CI_GH_TOKEN }}
-
-      # - name: Remove request label if exists
-      #   if: contains(github.event.pull_request.labels.*.name, env.LABEL_DEPLOY_CONTRACTS)
-      #   uses: actions-ecosystem/[email protected]
-      #   with:
-      #     labels: ${{ env.LABEL_DEPLOY_CONTRACTS }}
-      #     github_token: ${{ secrets.CI_GH_TOKEN }}
-
       - name: Create empty target directory so that restore-cache does not fail
         run: |
           mkdir -p target

.github/workflows/e2e-tests-contracts.yml

@@ -6,12 +6,11 @@ on:
       - 'contracts/**'
       - '.github/**'
   push:
-    branches:
-      - benjamin
     paths:
       - 'contracts/**'
       - '.github/**'
-  workflow_dispatch:
+    branches:
+      - benjamin
 
 concurrency:
   group: ${{ github.ref }}-${{ github.workflow }}
@@ -41,6 +40,7 @@ jobs:
       - name: Checkout Source code
         uses: actions/checkout@v3
 
+
       - name: Install Rust Toolchain
         uses: actions-rs/toolchain@v1
 
@@ -88,8 +88,9 @@ jobs:
         # wait some while docker pulls the image and starts the node
       - name: Wait for finalization
         shell: bash
-        run: ./.github/scripts/check_finalization.sh
-
+        run:  .github/scripts/check_finalization.sh smartnode 9933 node-network
+        timeout-minutes: 1
+
       - name: Run e2e tests
         shell: bash
         run: |