From ee1396ab46c3466f27af67558e481ad4ca1f4edf Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Thu, 26 Sep 2024 21:45:03 +0200 Subject: [PATCH 01/14] Update check-migrations.yml --- .github/workflows/check-migrations.yml | 47 ++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/.github/workflows/check-migrations.yml b/.github/workflows/check-migrations.yml index f2f2d621ee..edd80d0fb4 100644 --- a/.github/workflows/check-migrations.yml +++ b/.github/workflows/check-migrations.yml @@ -85,13 +85,48 @@ jobs: echo "EXTRA_ARGS=$EXTRA_FLAGS" >> $GITHUB_ENV echo "CHECKS=$CHECKS" >> $GITHUB_ENV - - name: Run ${{ matrix.runtime.name }} Runtime Checks - uses: "paritytech/try-runtime-gha@v0.2.0" + - name: Install Protoc + uses: arduino/setup-protoc@v1.3.0 with: - runtime-package: ${{ matrix.runtime.package }} - node-uri: ${{ matrix.runtime.uri }} - checks: ${{ env.CHECKS }} - extra-args: ${{ env.EXTRA_ARGS }} + version: "3.6.1" + + - name: Add wasm32-unknown-unknown target + run: rustup target add wasm32-unknown-unknown + shell: bash + + - name: Add rust-src component + run: rustup component add rust-src + shell: bash + + - name: Run ${{ matrix.runtime.name }} Runtime Checks + #uses: "paritytech/try-runtime-gha@v0.2.0" + #with: + # runtime-package: ${{ matrix.runtime.package }} + # node-uri: ${{ matrix.runtime.uri }} + # checks: ${{ env.CHECKS }} + # extra-args: ${{ env.EXTRA_ARGS }} + run: | + cargo install --git https://github.com/liamaharon/try-runtime-cli --branch liam-runtime-upgrade-mbms + + cargo build --profile production -p ${{ matrix.runtime.package }} --features try-runtime -q --locked + + PACKAGE_NAME=${{ matrix.runtime.package }} + RUNTIME_BLOB_NAME=$(echo $PACKAGE_NAME | sed 's/-/_/g').compact.compressed.wasm + RUNTIME_BLOB_PATH=./target/production/wbuild/$PACKAGE_NAME/$RUNTIME_BLOB_NAME + export RUST_LOG=remote-ext=debug,runtime=debug + + # Store the command in a variable so we can log it + COMMAND="try-runtime \ + --runtime $RUNTIME_BLOB_PATH \ + on-runtime-upgrade --checks=$CHECKS \ + $EXTRA_FLAGS \ + live --uri ${{ matrix.runtime.uri }}" + + # Echo the command before running it, for debugging purposes + echo "Running command:" + echo "$COMMAND" + eval "$COMMAND" + # This will only run if all the tests in its "needs" array passed. # Add this as your required job, becuase if the matrix changes size (new things get added) From 2d07cfa22421c8b0cd773c82d6efd366a4ba2583 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Thu, 26 Sep 2024 21:47:21 +0200 Subject: [PATCH 02/14] Adjust Blocktime Signed-off-by: Oliver Tale-Yazdi --- .github/workflows/check-migrations.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check-migrations.yml b/.github/workflows/check-migrations.yml index edd80d0fb4..6031814698 100644 --- a/.github/workflows/check-migrations.yml +++ b/.github/workflows/check-migrations.yml @@ -58,12 +58,13 @@ jobs: # When running on relay, we don't need weight checks. EXTRA_FLAGS="" if [[ "${{ matrix.runtime.is_relay }}" == "true" ]]; then - EXTRA_FLAGS+="--no-weight-warnings" + EXTRA_FLAGS+="--no-weight-warnings --blocktime 6000" echo "Disabling weight checks since we are on a relay" echo "Disabling try-state checks on the relay" CHECKS="pre-and-post" else + EXTRA_FLAGS+="--blocktime 12000" echo "Enabling weight checks since we are not on a relay" echo "Enabling try-state checks on the non-relay" From f74371a87e0111bb2c944155015a8071e5513048 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Thu, 26 Sep 2024 23:28:39 +0200 Subject: [PATCH 03/14] debug Signed-off-by: Oliver Tale-Yazdi --- .github/workflows/check-migrations.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/check-migrations.yml b/.github/workflows/check-migrations.yml index 6031814698..6ef1b5cffa 100644 --- a/.github/workflows/check-migrations.yml +++ b/.github/workflows/check-migrations.yml @@ -101,13 +101,15 @@ jobs: - name: Run ${{ matrix.runtime.name }} Runtime Checks #uses: "paritytech/try-runtime-gha@v0.2.0" - #with: - # runtime-package: ${{ matrix.runtime.package }} - # node-uri: ${{ matrix.runtime.uri }} - # checks: ${{ env.CHECKS }} - # extra-args: ${{ env.EXTRA_ARGS }} + env: + EXTRA_FLAGS: ${{ env.EXTRA_FLAGS }} + CHECKS: ${{ env.CHECKS }} + # runtime-package: ${{ matrix.runtime.package }} + # node-uri: ${{ matrix.runtime.uri }} + # checks: ${{ env.CHECKS }} + # extra-args: ${{ env.EXTRA_ARGS }} run: | - cargo install --git https://github.com/liamaharon/try-runtime-cli --branch liam-runtime-upgrade-mbms + cargo install -q --git https://github.com/liamaharon/try-runtime-cli --branch liam-runtime-upgrade-mbms cargo build --profile production -p ${{ matrix.runtime.package }} --features try-runtime -q --locked @@ -115,6 +117,8 @@ jobs: RUNTIME_BLOB_NAME=$(echo $PACKAGE_NAME | sed 's/-/_/g').compact.compressed.wasm RUNTIME_BLOB_PATH=./target/production/wbuild/$PACKAGE_NAME/$RUNTIME_BLOB_NAME export RUST_LOG=remote-ext=debug,runtime=debug + + echo "Extra args: $EXTRA_ARGS" # Store the command in a variable so we can log it COMMAND="try-runtime \ From 13960d2b46cc57f0e794318c885953e262812a16 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Fri, 27 Sep 2024 17:46:16 +0200 Subject: [PATCH 04/14] typo Signed-off-by: Oliver Tale-Yazdi --- .github/workflows/check-migrations.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check-migrations.yml b/.github/workflows/check-migrations.yml index 6ef1b5cffa..a75fee1987 100644 --- a/.github/workflows/check-migrations.yml +++ b/.github/workflows/check-migrations.yml @@ -53,7 +53,7 @@ jobs: - name: Checkout sources uses: actions/checkout@v4 - - name: Build EXTRA_ARGS + - name: Build EXTRA_FLAGS run: | # When running on relay, we don't need weight checks. EXTRA_FLAGS="" @@ -83,7 +83,7 @@ jobs: echo "Flags: $EXTRA_FLAGS" echo "Checks: $CHECKS" - echo "EXTRA_ARGS=$EXTRA_FLAGS" >> $GITHUB_ENV + echo "EXTRA_FLAGS=$EXTRA_FLAGS" >> $GITHUB_ENV echo "CHECKS=$CHECKS" >> $GITHUB_ENV - name: Install Protoc @@ -107,7 +107,7 @@ jobs: # runtime-package: ${{ matrix.runtime.package }} # node-uri: ${{ matrix.runtime.uri }} # checks: ${{ env.CHECKS }} - # extra-args: ${{ env.EXTRA_ARGS }} + # extra-args: ${{ env.EXTRA_FLAGS }} run: | cargo install -q --git https://github.com/liamaharon/try-runtime-cli --branch liam-runtime-upgrade-mbms @@ -118,7 +118,7 @@ jobs: RUNTIME_BLOB_PATH=./target/production/wbuild/$PACKAGE_NAME/$RUNTIME_BLOB_NAME export RUST_LOG=remote-ext=debug,runtime=debug - echo "Extra args: $EXTRA_ARGS" + echo "Extra args: $EXTRA_FLAGS" # Store the command in a variable so we can log it COMMAND="try-runtime \ From ecb9c8b94f152d21727aeb5d141ad88c92e40287 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Fri, 27 Sep 2024 20:41:17 +0200 Subject: [PATCH 05/14] Set blocktime from json matrix Signed-off-by: Oliver Tale-Yazdi --- .github/workflows/check-migrations.yml | 5 ++-- .github/workflows/runtimes-matrix.json | 39 +++++++++++++++++--------- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/.github/workflows/check-migrations.yml b/.github/workflows/check-migrations.yml index a75fee1987..49c88f56d2 100644 --- a/.github/workflows/check-migrations.yml +++ b/.github/workflows/check-migrations.yml @@ -58,19 +58,20 @@ jobs: # When running on relay, we don't need weight checks. EXTRA_FLAGS="" if [[ "${{ matrix.runtime.is_relay }}" == "true" ]]; then - EXTRA_FLAGS+="--no-weight-warnings --blocktime 6000" + EXTRA_FLAGS+="--no-weight-warnings" echo "Disabling weight checks since we are on a relay" echo "Disabling try-state checks on the relay" CHECKS="pre-and-post" else - EXTRA_FLAGS+="--blocktime 12000" echo "Enabling weight checks since we are not on a relay" echo "Enabling try-state checks on the non-relay" CHECKS="all" fi + EXTRA_FLAGS+="--blocktime ${{ matrix.runtime.blocktime }}" + # Disable the spec version check when we dont want to release. # The program prints either `1` or `0`. if [ "$(.github/changelog-processor.py CHANGELOG.md --should-release)" = "0" ]; then diff --git a/.github/workflows/runtimes-matrix.json b/.github/workflows/runtimes-matrix.json index 2107e8d0b0..df0ffe0305 100644 --- a/.github/workflows/runtimes-matrix.json +++ b/.github/workflows/runtimes-matrix.json @@ -4,88 +4,101 @@ "package": "polkadot-runtime", "path": "relay/polkadot", "uri": "wss://try-runtime.polkadot.io:443", - "is_relay": true + "is_relay": true, + "blocktime": 6000 }, { "name": "kusama", "package": "staging-kusama-runtime", "path": "relay/kusama", "uri": "wss://try-runtime-kusama.polkadot.io:443", - "is_relay": true + "is_relay": true, + "blocktime": 6000 }, { "name": "glutton-kusama", "package": "glutton-kusama-runtime", "path": "system-parachains/gluttons/glutton-kusama", - "is_relay": false + "is_relay": false, + "blocktime": 12000 }, { "name": "asset-hub-kusama", "package": "asset-hub-kusama-runtime", "path": "system-parachains/asset-hubs/asset-hub-kusama", "uri": "wss://kusama-asset-hub-rpc.polkadot.io:443", - "is_relay": false + "is_relay": false, + "blocktime": 12000 }, { "name": "asset-hub-polkadot", "package": "asset-hub-polkadot-runtime", "path": "system-parachains/asset-hubs/asset-hub-polkadot", "uri": "wss://polkadot-asset-hub-rpc.polkadot.io:443", - "is_relay": false + "is_relay": false, + "blocktime": 12000 }, { "name": "bridge-hub-kusama", "package": "bridge-hub-kusama-runtime", "path": "system-parachains/bridge-hubs/bridge-hub-kusama", "uri": "wss://kusama-bridge-hub-rpc.polkadot.io:443", - "is_relay": false + "is_relay": false, + "blocktime": 12000 }, { "name": "bridge-hub-polkadot", "package": "bridge-hub-polkadot-runtime", "path": "system-parachains/bridge-hubs/bridge-hub-polkadot", "uri": "wss://polkadot-bridge-hub-rpc.polkadot.io:443", - "is_relay": false + "is_relay": false, + "blocktime": 12000 }, { "name": "collectives-polkadot", "package": "collectives-polkadot-runtime", "path": "system-parachains/collectives/collectives-polkadot", "uri": "wss://polkadot-collectives-rpc.polkadot.io:443", - "is_relay": false + "is_relay": false, + "blocktime": 12000 }, { "name": "coretime-kusama", "package": "coretime-kusama-runtime", "path": "system-parachains/coretime/coretime-kusama", "uri": "wss://kusama-coretime-rpc.polkadot.io:443", - "is_relay": false + "is_relay": false, + "blocktime": 12000 }, { "name": "coretime-polkadot", "package": "coretime-polkadot-runtime", "path": "system-parachains/coretime/coretime-polkadot", - "is_relay": false + "is_relay": false, + "blocktime": 12000 }, { "name": "people-kusama", "package": "people-kusama-runtime", "path": "system-parachains/people/people-kusama", "uri": "wss://kusama-people-rpc.polkadot.io:443", - "is_relay": false + "is_relay": false, + "blocktime": 6000 }, { "name": "people-polkadot", "package": "people-polkadot-runtime", "path": "system-parachains/people/people-polkadot", "uri": "wss://polkadot-people-rpc.polkadot.io:443", - "is_relay": false + "is_relay": false, + "blocktime": 12000 }, { "name": "encointer-kusama", "package": "encointer-kusama-runtime", "path": "system-parachains/encointer", "uri": "wss://kusama.api.encointer.org:443", - "is_relay": false + "is_relay": false, + "blocktime": 12000 } ] From 779e14a170caec150fdc956555d9fe5bd41d002e Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Mon, 30 Sep 2024 12:54:24 +0200 Subject: [PATCH 06/14] Update .github/workflows/check-migrations.yml --- .github/workflows/check-migrations.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-migrations.yml b/.github/workflows/check-migrations.yml index 49c88f56d2..65b48fdc61 100644 --- a/.github/workflows/check-migrations.yml +++ b/.github/workflows/check-migrations.yml @@ -70,7 +70,7 @@ jobs: CHECKS="all" fi - EXTRA_FLAGS+="--blocktime ${{ matrix.runtime.blocktime }}" + EXTRA_FLAGS+=" --blocktime ${{ matrix.runtime.blocktime }} " # Disable the spec version check when we dont want to release. # The program prints either `1` or `0`. From 0d217af9f9a61f887751c5f2f34cb8f8d94013e0 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Tue, 8 Oct 2024 14:50:20 +0100 Subject: [PATCH 07/14] KAH: Properly bump to spec 1.3.3 Signed-off-by: Oliver Tale-Yazdi --- system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs b/system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs index 141b693afe..e47b8af5f3 100644 --- a/system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs +++ b/system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs @@ -137,7 +137,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("statemine"), impl_name: create_runtime_str!("statemine"), authoring_version: 1, - spec_version: 1_003_000, + spec_version: 1_003_003, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 15, From 4617cfdf27dbb46102ebcc8c9584a3a58a494405 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Tue, 8 Oct 2024 14:52:59 +0100 Subject: [PATCH 08/14] Disable MBM checking for encointer-kusama since it wont work TODO https://github.com/paritytech/try-runtime-cli/issues/101 Signed-off-by: Oliver Tale-Yazdi --- .github/workflows/check-migrations.yml | 6 +----- .github/workflows/runtimes-matrix.json | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/check-migrations.yml b/.github/workflows/check-migrations.yml index 65b48fdc61..9b71b74826 100644 --- a/.github/workflows/check-migrations.yml +++ b/.github/workflows/check-migrations.yml @@ -56,7 +56,7 @@ jobs: - name: Build EXTRA_FLAGS run: | # When running on relay, we don't need weight checks. - EXTRA_FLAGS="" + EXTRA_FLAGS="${{ matrix.runtime.extra_args }}" if [[ "${{ matrix.runtime.is_relay }}" == "true" ]]; then EXTRA_FLAGS+="--no-weight-warnings" echo "Disabling weight checks since we are on a relay" @@ -105,10 +105,6 @@ jobs: env: EXTRA_FLAGS: ${{ env.EXTRA_FLAGS }} CHECKS: ${{ env.CHECKS }} - # runtime-package: ${{ matrix.runtime.package }} - # node-uri: ${{ matrix.runtime.uri }} - # checks: ${{ env.CHECKS }} - # extra-args: ${{ env.EXTRA_FLAGS }} run: | cargo install -q --git https://github.com/liamaharon/try-runtime-cli --branch liam-runtime-upgrade-mbms diff --git a/.github/workflows/runtimes-matrix.json b/.github/workflows/runtimes-matrix.json index 5e0452ee43..172c53929c 100644 --- a/.github/workflows/runtimes-matrix.json +++ b/.github/workflows/runtimes-matrix.json @@ -100,6 +100,7 @@ "path": "system-parachains/encointer", "uri": "wss://kusama.api.encointer.org:443", "is_relay": false, - "blocktime": 12000 + "blocktime": 12000, + "extra_args": "--disable-mbm-checks" } ] From 121884a23167f841f9ada424c9f8f6e85b753529 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Tue, 8 Oct 2024 16:33:32 +0100 Subject: [PATCH 09/14] CHANGELOG Signed-off-by: Oliver Tale-Yazdi --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 263d11c1dd..8dd8908b08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ Changelog for the runtimes governed by the Polkadot Fellowship. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## Unreleased + +### Fixed + +- Fix missing bump of the Kusama-Asset-Hub spec version to 1.3.3 ([polkadot-fellows/runtimes#463](https://github.com/polkadot-fellows/runtimes/pull/463)) + ## [1.3.3] 01.10.2024 ### Changed From d9463a68d2e7b448fe12fc04aafe52a17b848e77 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Tue, 8 Oct 2024 16:37:02 +0100 Subject: [PATCH 10/14] typo Signed-off-by: Oliver Tale-Yazdi --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8dd8908b08..1f3ec667bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ Changelog for the runtimes governed by the Polkadot Fellowship. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). -## Unreleased +## [Unreleased] ### Fixed From 2498f638d575191853739df5a19ad7dd22b88fa1 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Fri, 18 Oct 2024 19:38:13 +0100 Subject: [PATCH 11/14] Update .github/workflows/check-migrations.yml --- .github/workflows/check-migrations.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-migrations.yml b/.github/workflows/check-migrations.yml index 9b71b74826..ccc500302c 100644 --- a/.github/workflows/check-migrations.yml +++ b/.github/workflows/check-migrations.yml @@ -106,7 +106,7 @@ jobs: EXTRA_FLAGS: ${{ env.EXTRA_FLAGS }} CHECKS: ${{ env.CHECKS }} run: | - cargo install -q --git https://github.com/liamaharon/try-runtime-cli --branch liam-runtime-upgrade-mbms + cargo install -q --git https://github.com/liamaharon/try-runtime-cli cargo build --profile production -p ${{ matrix.runtime.package }} --features try-runtime -q --locked From c080d42d926d81e42f4d5258091a7aed836c7e6c Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Fri, 18 Oct 2024 19:39:21 +0100 Subject: [PATCH 12/14] install from parity repo Signed-off-by: Oliver Tale-Yazdi --- .github/workflows/check-migrations.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-migrations.yml b/.github/workflows/check-migrations.yml index ccc500302c..0356a42023 100644 --- a/.github/workflows/check-migrations.yml +++ b/.github/workflows/check-migrations.yml @@ -106,7 +106,7 @@ jobs: EXTRA_FLAGS: ${{ env.EXTRA_FLAGS }} CHECKS: ${{ env.CHECKS }} run: | - cargo install -q --git https://github.com/liamaharon/try-runtime-cli + cargo install -q --git https://github.com/paritytech/try-runtime-cli cargo build --profile production -p ${{ matrix.runtime.package }} --features try-runtime -q --locked From 08129f086a17aaf6ee55977fb086f5041a16d039 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Fri, 18 Oct 2024 22:48:22 +0100 Subject: [PATCH 13/14] Update CHANGELOG.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Bastian Köcher --- CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cce596c56..4d9cbc5dfd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,10 +6,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] -### Fixed - -- Fix missing bump of the Kusama-Asset-Hub spec version to 1.3.3 ([polkadot-fellows/runtimes#463](https://github.com/polkadot-fellows/runtimes/pull/463)) - ### Changed Change Polkadot inflation to 120M DOT per year ([polkadot-fellows/runtimes#471](https://github.com/polkadot-fellows/runtimes/pull/471)) From a713c8c3684ad1527cb0c4981bcbd487b0f5e086 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Fri, 18 Oct 2024 23:02:52 +0100 Subject: [PATCH 14/14] Update .github/workflows/check-migrations.yml --- .github/workflows/check-migrations.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-migrations.yml b/.github/workflows/check-migrations.yml index 0356a42023..968ff80c00 100644 --- a/.github/workflows/check-migrations.yml +++ b/.github/workflows/check-migrations.yml @@ -106,7 +106,7 @@ jobs: EXTRA_FLAGS: ${{ env.EXTRA_FLAGS }} CHECKS: ${{ env.CHECKS }} run: | - cargo install -q --git https://github.com/paritytech/try-runtime-cli + cargo install -q --git https://github.com/paritytech/try-runtime-cli --tag v0.8.0 --locked && try-runtime --version cargo build --profile production -p ${{ matrix.runtime.package }} --features try-runtime -q --locked