Integrate asynchronous backing for 6000ms block time

.github/workflows/integration-tests.yml

@@ -157,7 +157,7 @@ jobs:
           chmod uog+x target/release/zeitgeist
 
           cd integration-tests
-          pnpm exec moonwall test zombienet_zeitgeist_upgrade
+          pnpm exec moonwall test zombienet_zeitgeist_upgrade --runInBand
 
   chopsticks_battery_station_upgrade:
     name: Battery Station Chopsticks Post-Upgrade Tests
@@ -205,7 +205,7 @@ jobs:
       - name: Battery Station post-upgrade tests using Chopsticks
         run: |
           cd integration-tests
-          pnpm exec moonwall test chopsticks_battery_station_upgrade
+          pnpm exec moonwall test chopsticks_battery_station_upgrade --runInBand
 
       - name: Show chopsticks logs
         if: ${{ failure() }}
@@ -260,7 +260,7 @@ jobs:
       - name: Zeitgeist post-upgrade tests using Chopsticks
         run: |
           cd integration-tests
-          pnpm exec moonwall test chopsticks_zeitgeist_upgrade
+          pnpm exec moonwall test chopsticks_zeitgeist_upgrade --runInBand
 
       - name: Show chopsticks logs
         if: ${{ failure() }}

.npmrc

@@ -0,0 +1,2 @@
+ignore-scripts=false
+allow-scripts=sqlite3

Cargo.toml

@@ -103,6 +103,7 @@ cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk",
 cumulus-primitives-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409", default-features = false }
 cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409", default-features = false }
 nimbus-primitives = { git = "https://github.com/zeitgeistpm/moonkit", branch = "zeitgeist-polkadot-stable2409", default-features = false }
+pallet-async-backing = { git = "https://github.com/zeitgeistpm/moonkit", branch = "zeitgeist-polkadot-stable2409", default-features = false }
 pallet-author-inherent = { git = "https://github.com/zeitgeistpm/moonkit", branch = "zeitgeist-polkadot-stable2409", default-features = false }
 pallet-author-mapping = { git = "https://github.com/zeitgeistpm/moonkit", branch = "zeitgeist-polkadot-stable2409", default-features = false }
 pallet-author-slot-filter = { git = "https://github.com/zeitgeistpm/moonkit", branch = "zeitgeist-polkadot-stable2409", default-features = false }
@@ -117,7 +118,7 @@ hydra-dx-math = { git = "https://github.com/galacticcouncil/HydraDX-node", packa
 moonbeam-vrf = { git = "https://github.com/zeitgeistpm/moonbeam", branch = "zeitgeist-polkadot-stable2409" }
 
 # Moonbeam (wasm)
-pallet-parachain-staking = { git = "https://github.com/zeitgeistpm/moonbeam", branch = "zeitgeist-polkadot-stable2409-added-prev-migrations-fix", default-features = false }
+pallet-parachain-staking = { git = "https://github.com/zeitgeistpm/moonbeam", branch = "zeitgeist-polkadot-stable2409-modified-migrations", default-features = false }
 
 # ORML (wasm)
 orml-asset-registry = { git = "https://github.com/zeitgeistpm/open-runtime-module-library", branch = "zeitgeist-polkadot-stable2409-asset-registry-location-fix", default-features = false }
@@ -160,7 +161,6 @@ sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polk
 sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409" }
 sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409" }
 sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409" }
-sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409" }
 sp-trie = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409" }
 substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409" }
 substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409" }
@@ -188,6 +188,7 @@ pallet-identity = { git = "https://github.com/paritytech/polkadot-sdk", tag = "p
 pallet-im-online = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409", default-features = false }
 pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409", default-features = false }
 pallet-membership = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409", default-features = false }
+pallet-migrations = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409", default-features = false }
 pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409", default-features = false }
 pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409", default-features = false }
 pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409", default-features = false }
@@ -219,6 +220,7 @@ sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polka
 sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409", default-features = false }
 sp-session = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409", default-features = false }
 sp-std = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409", default-features = false }
+sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409", default-features = false }
 sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409", default-features = false }
 sp-version = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409", default-features = false }
 

Makefile

@@ -23,7 +23,9 @@ check-dummy:
 	--runtime=${RUNTIME_PATH} \
 	on-runtime-upgrade \
 	--checks=all \
-	--blocktime=12000 \
+	--blocktime=6000 \
+	--disable-idempotency-checks \
+  	--mbm-max-blocks 128 \
 	live \
 	--uri=${TRYRUNTIME_URL}
 

integration-tests/README.md

@@ -89,17 +89,17 @@ Unable to map [u8; 32] to a lookup index
 #### Test the upgrade to the WASM from `./target/release/wbuild/zeitgeist-runtime` on zombienet:
 
 ```bash
-pnpm exec moonwall test zombienet_zeitgeist_upgrade
+pnpm exec moonwall test zombienet_zeitgeist_upgrade --runInBand
 ```
 
 #### Test the upgrade to the WASM from `./target/release/wbuild/zeitgeist-runtime` on the live main-net fork using chopsticks:
 
 ```bash
-pnpm exec moonwall test chopsticks_zeitgeist_upgrade
+pnpm exec moonwall test chopsticks_zeitgeist_upgrade --runInBand
 ```
 
 #### Test the upgrade to the WASM from `./target/release/wbuild/battery-station-runtime` on the live test-net fork using chopsticks:
 
 ```bash
-pnpm exec moonwall test chopsticks_battery_station_upgrade
+pnpm exec moonwall test chopsticks_battery_station_upgrade --runInBand
 ```

integration-tests/configs/hydradx.yml

@@ -1,7 +1,8 @@
-endpoint: wss://hydradx-rpc.dwellir.com
+endpoint: wss://rpc.hydradx.cloud/public-ws
 mock-signature-host: true
 block: ${env.HYDRADX_BLOCK_NUMBER}
 db: ./tmp/hydradx_db_mba.sqlite
+runtime-log-level: 5
 # wasm-override: hydradx_runtime.compact.compressed.wasm
 
 import-storage:
@@ -105,7 +106,3 @@ import-storage:
           - 5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY
           - 17 # Interlay
         - free: '100000000000000000000000'
-  TechnicalCommittee:
-    Members: ["5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY"]
-  Council:
-    Members: ["5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY"]

integration-tests/configs/polkadot.yml

@@ -0,0 +1,6 @@
+endpoint:
+  - wss://rpc.ibp.network/polkadot
+  - wss://polkadot-rpc.n.dwellir.com
+mock-signature-host: true
+db: ./tmp/polkadot_db_mba.sqlite
+runtime-log-level: 5

integration-tests/configs/zombieZeitgeist.json

@@ -10,11 +10,12 @@
         "nodes": [
             {
                 "name": "charlie",
-                "ws_port": 9947,
+                "rpc_port": 9947,
                 "validator": true
             },
             {
                 "name": "bob",
+                "rpc_port": 9950,
                 "validator": true
             }
         ]
@@ -27,7 +28,7 @@
                 {
                     "name": "alice",
                     "command": "../target/release/zeitgeist",
-                    "ws_port": 9944,
+                    "rpc_port": 9944,
                     "p2p_port": 33049,
                     "args": ["-lparachain=debug", "--force-authoring", "--detailed-log-output"]
                 }
@@ -41,4 +42,4 @@
             "post_state": "Hash"
         }
     }
-}
+}

integration-tests/moonwall.config.json

@@ -57,7 +57,7 @@
           {
             "name": "PolkadotDB",
             "type": "relaychain",
-            "configPath": "polkadot"
+            "configPath": "./configs/polkadot.yml"
           }
         ]
       },

integration-tests/package.json

@@ -6,13 +6,13 @@
     "ws": "8.16.0"
   },
   "devDependencies": {
-    "@acala-network/chopsticks": "1.0.6",
-    "@moonwall/cli": "5.1.5",
-    "@moonwall/util": "5.1.5",
-    "@polkadot/api": "16.1.1",
-    "@polkadot/keyring": "13.2.3",
-    "@polkadot/types": "16.1.1",
-    "@polkadot/util-crypto": "13.2.3",
+    "@acala-network/chopsticks": "1.2.4",
+    "@moonwall/cli": "5.16.4",
+    "@moonwall/util": "5.16.4",
+    "@polkadot/api": "16.5.2",
+    "@polkadot/keyring": "13.5.2",
+    "@polkadot/types": "16.5.2",
+    "@polkadot/util-crypto": "13.5.2",
     "@types/node": "22.10.2",
     "debug": "4.3.4",
     "ts-node": "10.9.2"
@@ -23,5 +23,15 @@
   "main": "index.js",
   "name": "integration-tests",
   "scripts": {},
-  "version": "0.0.0"
+  "version": "0.0.0",
+  "pnpm": {
+    "overrides": {
+      "@polkadot/api": "16.5.2",
+      "@polkadot/types": "16.5.2",
+      "@polkadot/types-support": "16.5.2",
+      "@polkadot/util": "13.5.2",
+      "@polkadot/util-crypto": "13.5.2",
+      "@polkadot/keyring": "13.5.2"
+    }
+  }
 }