diff --git a/.github/workflows/forkless-update-data.yml b/.github/workflows/forkless-update-data.yml index 52a17153f1..1e83a17b81 100644 --- a/.github/workflows/forkless-update-data.yml +++ b/.github/workflows/forkless-update-data.yml @@ -150,7 +150,7 @@ jobs: yarn ../scripts/wait_for_first_block.sh echo "Executing upgrade" - yarn node --no-warnings=ExperimentalWarning --loader ts-node/esm util/authorizeEnactUpgrade.ts ${{ steps.wasms.outputs.dir }}/${{ matrix.wasm_name }}-runtime/${{ matrix.wasm_name }}_runtime.compact.compressed.wasm + yarn node --no-warnings=ExperimentalWarning --loader ts-node/esm ../scripts/authorizeEnactUpgrade.ts ${{ steps.wasms.outputs.dir }}/${{ matrix.wasm_name }}-runtime/${{ matrix.wasm_name }}_runtime.compact.compressed.wasm env: RPC_URL: ${{ env.RELAY_UNIQUE_HTTP_URL }} diff --git a/.github/workflows/forkless-update-nodata.yml b/.github/workflows/forkless-update-nodata.yml index 141749ce56..eca8841a09 100644 --- a/.github/workflows/forkless-update-nodata.yml +++ b/.github/workflows/forkless-update-nodata.yml @@ -165,7 +165,7 @@ jobs: yarn ../scripts/wait_for_first_block.sh echo "Executing upgrade" - yarn node --no-warnings=ExperimentalWarning --loader ts-node/esm util/authorizeEnactUpgrade.ts ${{ steps.wasms.outputs.dir }}/${{ matrix.wasm_name }}-runtime/${{ matrix.wasm_name }}_runtime.compact.compressed.wasm + yarn node --no-warnings=ExperimentalWarning --loader ts-node/esm ../scripts/authorizeEnactUpgrade.ts ${{ steps.wasms.outputs.dir }}/${{ matrix.wasm_name }}-runtime/${{ matrix.wasm_name }}_runtime.compact.compressed.wasm env: RPC_URL: ${{ env.RELAY_UNIQUE_HTTP_URL }} diff --git a/js-packages/scripts/generate_types/wait_for_first_block.sh b/js-packages/scripts/generate_types/wait_for_first_block.sh deleted file mode 100755 index b4fec2a03a..0000000000 --- a/js-packages/scripts/generate_types/wait_for_first_block.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env bash - -DIR=$(dirname "$0") - -. "$DIR/functions.sh" - -last_block_id=0 -block_id=0 -counter=0 -function get_block { - block_id_hex=$(do_rpc chain_getHeader | jq -r .result.number) - block_id=$((block_id_hex)) - echo Id = $block_id -} - -function had_new_block { - last_block_id=$block_id - get_block - if (( last_block_id != 0 && block_id > last_block_id )); then - return 0 - fi - return 1 -} - -function reset_check { - last_block_id=0 - block_id=0 - counter=0 -} - -while [ ! had_new_block ] && [ $counter -lt 100 ]; do - echo "Waiting for next block..." - counter=$((counter+1)) - sleep 12 -done - -reset_check - -echo "Chain is running, but lets wait for another block after a minute, to avoid startup flakiness." -sleep 60 - -while ! had_new_block; do - echo "Waiting for another block..." - sleep 12 -done - -echo "Chain is running!"