fix: compatibility runtime workflow

Author: ipapandinas

.github/workflows/runtime-compatibility.yml

@@ -67,6 +67,7 @@ jobs:
     # Only run if workflow_run was successful OR if manually triggered
     if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch' }}
     runs-on: ubuntu-latest
+    timeout-minutes: 150
     strategy:
       fail-fast: false
       matrix:
@@ -218,14 +219,15 @@ jobs:
           # 1. Generate plain spec
           "$TMP_COLLATOR" build-spec --chain astar-dev > astar-plain.json
 
-          # 2. Patch sudo key, WASM, and (crucially, since the spec is raw)
-          #    session keys + invulnerables for zombienet's collator names.
+          # 2. Patch sudo key, WASM, and (crucially, since the spec is raw) para ID,
+          #    session keys + invulnerables to match smoke_runtime_upgrade.toml.
           python3 patch_astar_sudo_spec.py \
             astar-plain.json \
             "$SUDO_WASM" \
             astar-patched.json \
             "$ALICE" \
             "$TMP_COLLATOR" \
+            2000 \
             collator1 collator2
 
           # 3. Convert patched spec -> raw spec
@@ -239,6 +241,8 @@ jobs:
       # ── Run the actual compatibility test ─────────────────────────────────────
       - name: Run compatibility test
         working-directory: ${{ env.ZOMBIENET_DIR }}
+        # zombienet's "perform upgrade" waits forever if the chain stops producing blocks
+        timeout-minutes: 40
         run: |
           if [ "${{ matrix.chain }}" = "astar" ]; then
             export CHAIN="./astar-raw.json"

third-party/zombienet/patch_astar_sudo_spec.py

@@ -8,18 +8,20 @@
      these names, and once we hand zombienet a raw spec it can no longer inject
      them itself. Without this rewrite the collators are unauthorised to author
      and the chain never produces a block.
+  4. Set the para ID to the one zombienet registers on the relay, which it can't
+     patch into a raw spec's genesis either. On a mismatch no block is produced.
 
 Usage:
     patch_astar_sudo_spec.py <plain_in> <wasm> <patched_out> \\
-        <sudo_ss58> <collator_binary> <collator_name>...
+        <sudo_ss58> <collator_binary> <para_id> <collator_name>...
 """
 
 import json
 import subprocess
 import sys
 from pathlib import Path
 
-if len(sys.argv) < 7:
+if len(sys.argv) < 8:
     print(__doc__, file=sys.stderr)
     sys.exit(2)
 
@@ -28,7 +30,8 @@
 out_path = Path(sys.argv[3])
 sudo_ss58 = sys.argv[4]
 collator_bin = sys.argv[5]
-collator_names = sys.argv[6:]
+para_id = int(sys.argv[6])
+collator_names = sys.argv[7:]
 
 
 def inspect(uri: str) -> dict:
@@ -64,6 +67,9 @@ def uri_for(name: str) -> str:
 
 cfg.setdefault("sudo", {})["key"] = sudo_ss58
 
+cfg.setdefault("parachainInfo", {})["parachainId"] = para_id
+spec["para_id"] = para_id
+
 cfg.setdefault("session", {})["keys"] = [
     [c["ss58"], c["ss58"], {"aura": c["ss58"]}] for _, c in collators
 ]

third-party/zombienet/setup.sh

@@ -32,3 +32,4 @@ while ps $SETUP_PID > /dev/null ; do
     sleep 1
 done
 chmod +x polkadot polkadot-execute-worker polkadot-prepare-worker
+./polkadot --version

third-party/zombienet/smoke_runtime_upgrade.zndsl

@@ -18,3 +18,6 @@ collator2: parachain 2000 perform upgrade with ./runtime.compact.compressed.wasm
 ## and same-slot collisions between mixed client versions).
 collator1: js-script ./scripts/post_upgrade.js with "20" return is equal to 1 within 450 seconds
 collator2: js-script ./scripts/post_upgrade.js with "20" return is equal to 1 within 450 seconds
+
+## on the upgraded runtime, session keys register only with a valid ownership proof
+collator2: js-script ./scripts/rotate_session_keys.js return is equal to 1 within 200 seconds