wait for finalization

.github/scripts/check_finalization.sh

@@ -1,12 +1,18 @@
 #!/bin/bash
 
-RPC_HOST=127.0.0.1
-RPC_PORT=9933
+## USAGE
+##  .github/scripts/check_finalization.sh <rpc-host> <rpc-port>
+## 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=""
-VALIDATOR=damian
 
 while [[ "$LAST_FINALIZED" =~ "0x0" ]] || [[ -z "$LAST_FINALIZED" ]]; do
-  block_hash=$(docker run --network container:$VALIDATOR 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=$?
@@ -15,7 +21,7 @@ while [[ "$LAST_FINALIZED" =~ "0x0" ]] || [[ -z "$LAST_FINALIZED" ]]; do
     continue
   fi
 
-  finalized_block=$(docker run --network container:$VALIDATOR 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/scripts/run_smartnet.sh

@@ -17,6 +17,5 @@ docker run --rm -v $(pwd)/docker/data:/data --entrypoint "/bin/sh" -e RUST_LOG=d
 export BOOTNODE_PEER_ID=$(docker run --rm -v $(pwd)/docker/data:/data --entrypoint "/bin/sh" -e RUST_LOG=info "${NODE_IMAGE}" -c "aleph-node key inspect-node-key --file /data/$NODE_ID/p2p_secret")
 
 docker network create node-network || true
-docker-compose -f docker/smartnet-compose.yml up --remove-orphans 
-
+docker-compose -f docker/smartnet-compose.yml up --remove-orphans
 exit $?

.github/workflows/deploy-the-button.yaml → .github/workflows/deploy-the-button-contracts.yml

@@ -1,40 +1,35 @@
 name: Deploy The Button game
 
+# TODO triggered by the e2e-tests-contracts workflow completed on branch benjamin
 on:
-  pull_request:
-    types: [labeled]
-  push:
-    branches:
-      - benjamin
-    paths:
-      - contracts/**
-
+  workflow_dispatch:
+  workflow_run:
+    workflows:
+      - e2e-tests-contracts
+    types:
+      - completed
+
+# allow only once run instance of this workflow EVER
 concurrency:
   group: ${{ github.workflow }}
-  cancel-in-progress: true
+  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:
-  checkout_benjamin:
-    if: (github.event_name == 'push') || (github.event_name == 'pull_request' && github.event.action == 'labeled' && github.event.label.name == '[AZERO] DEPLOY-CONTRACTS')
+  build_and_deploy_contracts:
     runs-on: ubuntu-20.04
-    #runs-on: self-hosted
     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
@@ -103,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
@@ -186,21 +179,9 @@ jobs:
           -H 'Authorization: Bearer ${{ secrets.CI_GH_TOKEN }}' \
           -d '{ "ref":"main", "inputs": { "buildImage": "false", "deployImage": "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 }}
+      # TODO: trigger indexer deployment
 
       - name: Create empty target directory so that restore-cache does not fail
         run: |
           mkdir -p target
           touch target/emptyfile
-

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

@@ -4,15 +4,21 @@ on:
   pull_request:
     paths:
       - 'contracts/**'
+      - '.github/**'
   push:
     paths:
       - 'contracts/**'
-  workflow_dispatch:
+      - '.github/**'
+    branches:
+      - benjamin
 
 concurrency:
   group: ${{ github.ref }}-${{ github.workflow }}
   cancel-in-progress: true
 
+env:
+  CHECKOUT_BRANCH: benjamin
+
 jobs:
   run-tests:
     name: Run smart contracts test suite
@@ -79,12 +85,20 @@ jobs:
 
       - name: Run one-node smartnet
         shell: bash
-        run: ./.github/scripts/run_smartnet.sh &
+        run: |
+          .github/scripts/run_smartnet.sh &
+
+      - name: Display node logs
+        shell: bash
+        run: |
+          docker logs smartnode --follow &
 
         # wait some while docker pulls the image and starts the node
-      - name: Sleep for a while
+      - name: Wait for finalization
         shell: bash
-        run: sleep 2
+        run:  |
+         .github/scripts/check_finalization.sh
+        timeout-minutes: 1
 
       - name: Run e2e tests
         shell: bash

contracts/scripts/deploy.sh

@@ -200,7 +200,6 @@ ACCESS_CONTROL_PUBKEY=$(docker run --rm --entrypoint "/bin/sh" "${NODE_IMAGE}" -
 echo "access control contract address: $ACCESS_CONTROL"
 echo "access control contract public key \(hex\): $ACCESS_CONTROL_PUBKEY"
 
-
 # --- UPLOAD CONTRACTS CODES
 
 upload_contract TICKET_TOKEN_CODE_HASH ticket_token

docker/smartnet-compose.yml

@@ -20,6 +20,7 @@ services:
       - WS_PORT=9943
       - BOOT_NODES=/ip4/127.0.0.1/tcp/30333/p2p/$BOOTNODE_PEER_ID
       - PUBLIC_ADDR=/ip4/127.0.0.1/tcp/30333
+      - PUBLIC_VALIDATOR_ADDRESS=127.0.0.1:30333
     volumes:
       - ./data/:/data/
     expose: