diff --git a/.gitlab/pipeline/zombienet/polkadot.yml b/.gitlab/pipeline/zombienet/polkadot.yml
index 14a235bcda8604dfee771d49ffb22163510df73b..878f241317a42a102e08e7267a9b5d09c1fc1771 100644
--- a/.gitlab/pipeline/zombienet/polkadot.yml
+++ b/.gitlab/pipeline/zombienet/polkadot.yml
@@ -160,39 +160,6 @@ zombienet-polkadot-functional-0010-validator-disabling:
--local-dir="${LOCAL_DIR}/functional"
--test="0010-validator-disabling.zndsl"
-.zombienet-polkadot-functional-0011-async-backing-6-seconds-rate:
- extends:
- - .zombienet-polkadot-common
- script:
- - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
- --local-dir="${LOCAL_DIR}/functional"
- --test="0011-async-backing-6-seconds-rate.zndsl"
-
-zombienet-polkadot-elastic-scaling-0001-basic-3cores-6s-blocks:
- extends:
- - .zombienet-polkadot-common
- variables:
- FORCED_INFRA_INSTANCE: "spot-iops"
- before_script:
- - !reference [ .zombienet-polkadot-common, before_script ]
- - cp --remove-destination ${LOCAL_DIR}/assign-core.js ${LOCAL_DIR}/elastic_scaling
- script:
- - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
- --local-dir="${LOCAL_DIR}/elastic_scaling"
- --test="0001-basic-3cores-6s-blocks.zndsl"
-
-.zombienet-polkadot-elastic-scaling-0002-elastic-scaling-doesnt-break-parachains:
- extends:
- - .zombienet-polkadot-common
- before_script:
- - !reference [ .zombienet-polkadot-common, before_script ]
- - cp --remove-destination ${LOCAL_DIR}/assign-core.js ${LOCAL_DIR}/elastic_scaling
- script:
- - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
- --local-dir="${LOCAL_DIR}/elastic_scaling"
- --test="0002-elastic-scaling-doesnt-break-parachains.zndsl"
-
-
.zombienet-polkadot-functional-0012-spam-statement-distribution-requests:
extends:
- .zombienet-polkadot-common
@@ -236,14 +203,6 @@ zombienet-polkadot-functional-0015-coretime-shared-core:
--local-dir="${LOCAL_DIR}/functional"
--test="0016-approval-voting-parallel.zndsl"
-.zombienet-polkadot-functional-0017-sync-backing:
- extends:
- - .zombienet-polkadot-common
- script:
- - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
- --local-dir="${LOCAL_DIR}/functional"
- --test="0017-sync-backing.zndsl"
-
zombienet-polkadot-functional-0018-shared-core-idle-parachain:
extends:
- .zombienet-polkadot-common
@@ -386,6 +345,8 @@ zombienet-polkadot-malus-0001-dispute-valid:
--local-dir="${LOCAL_DIR}/integrationtests"
--test="0001-dispute-valid-block.zndsl"
+# sdk tests
+
.zombienet-polkadot-coretime-revenue:
extends:
- .zombienet-polkadot-common
@@ -411,8 +372,78 @@ zombienet-polkadot-elastic-scaling-slot-based-3cores:
- !reference [ ".zombienet-polkadot-common", "before_script" ]
- export POLKADOT_IMAGE="${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
- export CUMULUS_IMAGE="docker.io/paritypr/test-parachain:${PIPELINE_IMAGE_TAG}"
+ - export X_INFRA_INSTANCE=spot # use spot by default
script:
# we want to use `--no-capture` in zombienet tests.
- unset NEXTEST_FAILURE_OUTPUT
- unset NEXTEST_SUCCESS_OUTPUT
- cargo nextest run --archive-file ./artifacts/polkadot-zombienet-tests.tar.zst --no-capture -- elastic_scaling::slot_based_3cores::slot_based_3cores_test
+
+zombienet-polkadot-elastic-scaling-doesnt-break-parachains:
+ extends:
+ - .zombienet-polkadot-common
+ needs:
+ - job: build-polkadot-zombienet-tests
+ artifacts: true
+ before_script:
+ - !reference [ ".zombienet-polkadot-common", "before_script" ]
+ - export POLKADOT_IMAGE="${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
+ - export X_INFRA_INSTANCE=spot # use spot by default
+ variables:
+ KUBERNETES_CPU_REQUEST: "1"
+ script:
+ # we want to use `--no-capture` in zombienet tests.
+ - unset NEXTEST_FAILURE_OUTPUT
+ - unset NEXTEST_SUCCESS_OUTPUT
+ - RUST_LOG=info,zombienet_=trace cargo nextest run --archive-file ./artifacts/polkadot-zombienet-tests.tar.zst --no-capture -- elastic_scaling::doesnt_break_parachains::doesnt_break_parachains_test
+
+zombienet-polkadot-elastic-scaling-basic-3cores:
+ extends:
+ - .zombienet-polkadot-common
+ needs:
+ - job: build-polkadot-zombienet-tests
+ artifacts: true
+ before_script:
+ - !reference [ ".zombienet-polkadot-common", "before_script" ]
+ - export POLKADOT_IMAGE="${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
+ - export CUMULUS_IMAGE="${COL_IMAGE}"
+ - export X_INFRA_INSTANCE=spot # use spot by default
+ script:
+ # we want to use `--no-capture` in zombienet tests.
+ - unset NEXTEST_FAILURE_OUTPUT
+ - unset NEXTEST_SUCCESS_OUTPUT
+ - cargo nextest run --archive-file ./artifacts/polkadot-zombienet-tests.tar.zst --no-capture -- elastic_scaling::basic_3cores::basic_3cores_test
+
+zombienet-polkadot-functional-sync-backing:
+ extends:
+ - .zombienet-polkadot-common
+ needs:
+ - job: build-polkadot-zombienet-tests
+ artifacts: true
+ before_script:
+ - !reference [ ".zombienet-polkadot-common", "before_script" ]
+ - export POLKADOT_IMAGE="${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
+ # Hardcoded to an old polkadot-parachain image, pre async backing.
+ - export CUMULUS_IMAGE="docker.io/paritypr/polkadot-parachain-debug:master-99623e62"
+ - export X_INFRA_INSTANCE=spot # use spot by default
+ script:
+ # we want to use `--no-capture` in zombienet tests.
+ - unset NEXTEST_FAILURE_OUTPUT
+ - unset NEXTEST_SUCCESS_OUTPUT
+ - cargo nextest run --archive-file ./artifacts/polkadot-zombienet-tests.tar.zst --no-capture -- functional::sync_backing::sync_backing_test
+
+zombienet-polkadot-functional-async-backing-6-seconds-rate:
+ extends:
+ - .zombienet-polkadot-common
+ needs:
+ - job: build-polkadot-zombienet-tests
+ artifacts: true
+ before_script:
+ - !reference [ ".zombienet-polkadot-common", "before_script" ]
+ - export POLKADOT_IMAGE="${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
+ - export X_INFRA_INSTANCE=spot # use spot by default
+ script:
+ # we want to use `--no-capture` in zombienet tests.
+ - unset NEXTEST_FAILURE_OUTPUT
+ - unset NEXTEST_SUCCESS_OUTPUT
+ - cargo nextest run --archive-file ./artifacts/polkadot-zombienet-tests.tar.zst --no-capture -- functional::async_backing_6_seconds_rate::async_backing_6_seconds_rate_test
diff --git a/Cargo.lock b/Cargo.lock
index cc34514aeb93d02ed0a768ffaf2cfa2acc2aa6f9..0a22179eb3d75f751a1252d04b659465720c8323 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6213,7 +6213,7 @@ dependencies = [
"regex",
"syn 2.0.87",
"termcolor",
- "toml 0.8.12",
+ "toml 0.8.19",
"walkdir",
]
@@ -9777,29 +9777,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "libp2p"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94495eb319a85b70a68b85e2389a95bb3555c71c49025b78c691a854a7e6464"
-dependencies = [
- "bytes",
- "either",
- "futures",
- "futures-timer",
- "getrandom",
- "instant",
- "libp2p-allow-block-list 0.2.0",
- "libp2p-connection-limits 0.2.1",
- "libp2p-core 0.40.1",
- "libp2p-identity",
- "libp2p-swarm 0.43.7",
- "multiaddr 0.18.1",
- "pin-project",
- "rw-stream-sink",
- "thiserror",
-]
-
[[package]]
name = "libp2p"
version = "0.54.1"
@@ -9811,9 +9788,9 @@ dependencies = [
"futures",
"futures-timer",
"getrandom",
- "libp2p-allow-block-list 0.4.0",
- "libp2p-connection-limits 0.4.0",
- "libp2p-core 0.42.0",
+ "libp2p-allow-block-list",
+ "libp2p-connection-limits",
+ "libp2p-core",
"libp2p-dns",
"libp2p-identify",
"libp2p-identity",
@@ -9824,7 +9801,7 @@ dependencies = [
"libp2p-ping",
"libp2p-quic",
"libp2p-request-response",
- "libp2p-swarm 0.45.1",
+ "libp2p-swarm",
"libp2p-tcp",
"libp2p-upnp",
"libp2p-websocket",
@@ -9835,39 +9812,15 @@ dependencies = [
"thiserror",
]
-[[package]]
-name = "libp2p-allow-block-list"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55b46558c5c0bf99d3e2a1a38fd54ff5476ca66dd1737b12466a1824dd219311"
-dependencies = [
- "libp2p-core 0.40.1",
- "libp2p-identity",
- "libp2p-swarm 0.43.7",
- "void",
-]
-
[[package]]
name = "libp2p-allow-block-list"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d1027ccf8d70320ed77e984f273bc8ce952f623762cb9bf2d126df73caef8041"
dependencies = [
- "libp2p-core 0.42.0",
+ "libp2p-core",
"libp2p-identity",
- "libp2p-swarm 0.45.1",
- "void",
-]
-
-[[package]]
-name = "libp2p-connection-limits"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f5107ad45cb20b2f6c3628c7b6014b996fcb13a88053f4569c872c6e30abf58"
-dependencies = [
- "libp2p-core 0.40.1",
- "libp2p-identity",
- "libp2p-swarm 0.43.7",
+ "libp2p-swarm",
"void",
]
@@ -9877,37 +9830,9 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d003540ee8baef0d254f7b6bfd79bac3ddf774662ca0abf69186d517ef82ad8"
dependencies = [
- "libp2p-core 0.42.0",
- "libp2p-identity",
- "libp2p-swarm 0.45.1",
- "void",
-]
-
-[[package]]
-name = "libp2p-core"
-version = "0.40.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd44289ab25e4c9230d9246c475a22241e301b23e8f4061d3bdef304a1a99713"
-dependencies = [
- "either",
- "fnv",
- "futures",
- "futures-timer",
- "instant",
+ "libp2p-core",
"libp2p-identity",
- "log",
- "multiaddr 0.18.1",
- "multihash 0.19.1",
- "multistream-select",
- "once_cell",
- "parking_lot 0.12.3",
- "pin-project",
- "quick-protobuf 0.8.1",
- "rand",
- "rw-stream-sink",
- "smallvec",
- "thiserror",
- "unsigned-varint 0.7.2",
+ "libp2p-swarm",
"void",
]
@@ -9948,7 +9873,7 @@ dependencies = [
"async-trait",
"futures",
"hickory-resolver",
- "libp2p-core 0.42.0",
+ "libp2p-core",
"libp2p-identity",
"parking_lot 0.12.3",
"smallvec",
@@ -9966,9 +9891,9 @@ dependencies = [
"futures",
"futures-bounded",
"futures-timer",
- "libp2p-core 0.42.0",
+ "libp2p-core",
"libp2p-identity",
- "libp2p-swarm 0.45.1",
+ "libp2p-swarm",
"lru 0.12.3",
"quick-protobuf 0.8.1",
"quick-protobuf-codec",
@@ -10010,9 +9935,9 @@ dependencies = [
"futures",
"futures-bounded",
"futures-timer",
- "libp2p-core 0.42.0",
+ "libp2p-core",
"libp2p-identity",
- "libp2p-swarm 0.45.1",
+ "libp2p-swarm",
"quick-protobuf 0.8.1",
"quick-protobuf-codec",
"rand",
@@ -10035,9 +9960,9 @@ dependencies = [
"futures",
"hickory-proto",
"if-watch",
- "libp2p-core 0.42.0",
+ "libp2p-core",
"libp2p-identity",
- "libp2p-swarm 0.45.1",
+ "libp2p-swarm",
"rand",
"smallvec",
"socket2 0.5.7",
@@ -10053,12 +9978,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77ebafa94a717c8442d8db8d3ae5d1c6a15e30f2d347e0cd31d057ca72e42566"
dependencies = [
"futures",
- "libp2p-core 0.42.0",
+ "libp2p-core",
"libp2p-identify",
"libp2p-identity",
"libp2p-kad",
"libp2p-ping",
- "libp2p-swarm 0.45.1",
+ "libp2p-swarm",
"pin-project",
"prometheus-client",
"web-time",
@@ -10074,7 +9999,7 @@ dependencies = [
"bytes",
"curve25519-dalek 4.1.3",
"futures",
- "libp2p-core 0.42.0",
+ "libp2p-core",
"libp2p-identity",
"multiaddr 0.18.1",
"multihash 0.19.1",
@@ -10099,9 +10024,9 @@ dependencies = [
"either",
"futures",
"futures-timer",
- "libp2p-core 0.42.0",
+ "libp2p-core",
"libp2p-identity",
- "libp2p-swarm 0.45.1",
+ "libp2p-swarm",
"rand",
"tracing",
"void",
@@ -10118,7 +10043,7 @@ dependencies = [
"futures",
"futures-timer",
"if-watch",
- "libp2p-core 0.42.0",
+ "libp2p-core",
"libp2p-identity",
"libp2p-tls",
"parking_lot 0.12.3",
@@ -10142,9 +10067,9 @@ dependencies = [
"futures",
"futures-bounded",
"futures-timer",
- "libp2p-core 0.42.0",
+ "libp2p-core",
"libp2p-identity",
- "libp2p-swarm 0.45.1",
+ "libp2p-swarm",
"rand",
"smallvec",
"tracing",
@@ -10152,27 +10077,6 @@ dependencies = [
"web-time",
]
-[[package]]
-name = "libp2p-swarm"
-version = "0.43.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "580189e0074af847df90e75ef54f3f30059aedda37ea5a1659e8b9fca05c0141"
-dependencies = [
- "either",
- "fnv",
- "futures",
- "futures-timer",
- "instant",
- "libp2p-core 0.40.1",
- "libp2p-identity",
- "log",
- "multistream-select",
- "once_cell",
- "rand",
- "smallvec",
- "void",
-]
-
[[package]]
name = "libp2p-swarm"
version = "0.45.1"
@@ -10183,7 +10087,7 @@ dependencies = [
"fnv",
"futures",
"futures-timer",
- "libp2p-core 0.42.0",
+ "libp2p-core",
"libp2p-identity",
"libp2p-swarm-derive",
"lru 0.12.3",
@@ -10219,7 +10123,7 @@ dependencies = [
"futures-timer",
"if-watch",
"libc",
- "libp2p-core 0.42.0",
+ "libp2p-core",
"libp2p-identity",
"socket2 0.5.7",
"tokio",
@@ -10234,7 +10138,7 @@ checksum = "47b23dddc2b9c355f73c1e36eb0c3ae86f7dc964a3715f0731cfad352db4d847"
dependencies = [
"futures",
"futures-rustls",
- "libp2p-core 0.42.0",
+ "libp2p-core",
"libp2p-identity",
"rcgen 0.11.3",
"ring 0.17.8",
@@ -10254,8 +10158,8 @@ dependencies = [
"futures",
"futures-timer",
"igd-next",
- "libp2p-core 0.42.0",
- "libp2p-swarm 0.45.1",
+ "libp2p-core",
+ "libp2p-swarm",
"tokio",
"tracing",
"void",
@@ -10270,7 +10174,7 @@ dependencies = [
"either",
"futures",
"futures-rustls",
- "libp2p-core 0.42.0",
+ "libp2p-core",
"libp2p-identity",
"parking_lot 0.12.3",
"pin-project-lite",
@@ -10290,7 +10194,7 @@ checksum = "788b61c80789dba9760d8c669a5bedb642c8267555c803fabd8396e4ca5c5882"
dependencies = [
"either",
"futures",
- "libp2p-core 0.42.0",
+ "libp2p-core",
"thiserror",
"tracing",
"yamux 0.12.1",
@@ -11300,17 +11204,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "nix"
-version = "0.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
-dependencies = [
- "bitflags 2.6.0",
- "cfg-if",
- "libc",
-]
-
[[package]]
name = "nix"
version = "0.29.0"
@@ -13015,7 +12908,7 @@ dependencies = [
"parity-wasm",
"sp-runtime 31.0.1",
"tempfile",
- "toml 0.8.12",
+ "toml 0.8.19",
"twox-hash",
]
@@ -14936,7 +14829,7 @@ dependencies = [
"polkavm-linker 0.18.0",
"sp-core 28.0.0",
"sp-io 30.0.0",
- "toml 0.8.12",
+ "toml 0.8.19",
]
[[package]]
@@ -14951,7 +14844,7 @@ dependencies = [
"polkavm-linker 0.10.0",
"sp-runtime 39.0.2",
"tempfile",
- "toml 0.8.12",
+ "toml 0.8.19",
]
[[package]]
@@ -19854,6 +19747,7 @@ dependencies = [
"env_logger 0.11.3",
"log",
"parity-scale-codec",
+ "polkadot-primitives 7.0.0",
"serde",
"serde_json",
"substrate-build-script-utils",
@@ -19930,12 +19824,6 @@ dependencies = [
"log",
]
-[[package]]
-name = "polkavm-common"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92c99f7eee94e7be43ba37eef65ad0ee8cbaf89b7c00001c3f6d2be985cb1817"
-
[[package]]
name = "polkavm-common"
version = "0.9.0"
@@ -19965,15 +19853,6 @@ dependencies = [
"polkavm-assembler 0.18.0",
]
-[[package]]
-name = "polkavm-derive"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79fa916f7962348bd1bb1a65a83401675e6fc86c51a0fdbcf92a3108e58e6125"
-dependencies = [
- "polkavm-derive-impl-macro 0.8.0",
-]
-
[[package]]
name = "polkavm-derive"
version = "0.9.1"
@@ -20001,18 +19880,6 @@ dependencies = [
"polkavm-derive-impl-macro 0.18.0",
]
-[[package]]
-name = "polkavm-derive-impl"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c10b2654a8a10a83c260bfb93e97b262cf0017494ab94a65d389e0eda6de6c9c"
-dependencies = [
- "polkavm-common 0.8.0",
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.87",
-]
-
[[package]]
name = "polkavm-derive-impl"
version = "0.9.0"
@@ -20049,16 +19916,6 @@ dependencies = [
"syn 2.0.87",
]
-[[package]]
-name = "polkavm-derive-impl-macro"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e85319a0d5129dc9f021c62607e0804f5fb777a05cdda44d750ac0732def66"
-dependencies = [
- "polkavm-derive-impl 0.8.0",
- "syn 2.0.87",
-]
-
[[package]]
name = "polkavm-derive-impl-macro"
version = "0.9.0"
@@ -23042,7 +22899,7 @@ dependencies = [
"futures",
"futures-timer",
"ip_network",
- "libp2p 0.54.1",
+ "libp2p",
"linked_hash_set",
"litep2p",
"log",
@@ -23218,7 +23075,7 @@ dependencies = [
"async-trait",
"futures",
"futures-timer",
- "libp2p 0.54.1",
+ "libp2p",
"log",
"parking_lot 0.12.3",
"rand",
@@ -23675,7 +23532,7 @@ version = "15.0.0"
dependencies = [
"chrono",
"futures",
- "libp2p 0.54.1",
+ "libp2p",
"log",
"parking_lot 0.12.3",
"pin-project",
@@ -26177,53 +26034,6 @@ dependencies = [
"zeroize",
]
-[[package]]
-name = "sp-core"
-version = "31.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d7a0fd8f16dcc3761198fc83be12872f823b37b749bc72a3a6a1f702509366"
-dependencies = [
- "array-bytes",
- "bitflags 1.3.2",
- "blake2 0.10.6",
- "bounded-collections",
- "bs58",
- "dyn-clonable",
- "ed25519-zebra 3.1.0",
- "futures",
- "hash-db",
- "hash256-std-hasher",
- "impl-serde 0.4.0",
- "itertools 0.10.5",
- "k256",
- "libsecp256k1",
- "log",
- "merlin",
- "parity-bip39",
- "parity-scale-codec",
- "parking_lot 0.12.3",
- "paste",
- "primitive-types 0.12.2",
- "rand",
- "scale-info",
- "schnorrkel 0.11.4",
- "secp256k1 0.28.2",
- "secrecy 0.8.0",
- "serde",
- "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-debug-derive 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-externalities 0.27.0",
- "sp-runtime-interface 26.0.0",
- "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-storage 20.0.0",
- "ss58-registry",
- "substrate-bip39 0.5.0",
- "thiserror",
- "tracing",
- "w3f-bls",
- "zeroize",
-]
-
[[package]]
name = "sp-core"
version = "32.0.0"
@@ -26564,18 +26374,6 @@ dependencies = [
"sp-storage 19.0.0",
]
-[[package]]
-name = "sp-externalities"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d6a4572eadd4a63cff92509a210bf425501a0c5e76574b30a366ac77653787"
-dependencies = [
- "environmental",
- "parity-scale-codec",
- "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-storage 20.0.0",
-]
-
[[package]]
name = "sp-externalities"
version = "0.28.0"
@@ -27160,26 +26958,6 @@ dependencies = [
"trybuild",
]
-[[package]]
-name = "sp-runtime-interface"
-version = "26.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a675ea4858333d4d755899ed5ed780174aa34fec15953428d516af5452295"
-dependencies = [
- "bytes",
- "impl-trait-for-tuples",
- "parity-scale-codec",
- "polkavm-derive 0.8.0",
- "primitive-types 0.12.2",
- "sp-externalities 0.27.0",
- "sp-runtime-interface-proc-macro 18.0.0",
- "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-storage 20.0.0",
- "sp-tracing 16.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-wasm-interface 20.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "static_assertions",
-]
-
[[package]]
name = "sp-runtime-interface"
version = "27.0.0"
@@ -27537,20 +27315,6 @@ dependencies = [
"sp-debug-derive 14.0.0",
]
-[[package]]
-name = "sp-storage"
-version = "20.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dba5791cb3978e95daf99dad919ecb3ec35565604e88cd38d805d9d4981e8bd"
-dependencies = [
- "impl-serde 0.4.0",
- "parity-scale-codec",
- "ref-cast",
- "serde",
- "sp-debug-derive 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
[[package]]
name = "sp-storage"
version = "21.0.0"
@@ -27622,19 +27386,6 @@ dependencies = [
"tracing-subscriber 0.3.18",
]
-[[package]]
-name = "sp-tracing"
-version = "16.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0351810b9d074df71c4514c5228ed05c250607cba131c1c9d1526760ab69c05c"
-dependencies = [
- "parity-scale-codec",
- "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tracing",
- "tracing-core",
- "tracing-subscriber 0.2.25",
-]
-
[[package]]
name = "sp-tracing"
version = "17.0.1"
@@ -27891,20 +27642,6 @@ dependencies = [
"wasmtime",
]
-[[package]]
-name = "sp-wasm-interface"
-version = "20.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ef97172c42eb4c6c26506f325f48463e9bc29b2034a587f1b9e48c751229bee"
-dependencies = [
- "anyhow",
- "impl-trait-for-tuples",
- "log",
- "parity-scale-codec",
- "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasmtime",
-]
-
[[package]]
name = "sp-wasm-interface"
version = "21.0.1"
@@ -28444,19 +28181,6 @@ dependencies = [
"zeroize",
]
-[[package]]
-name = "substrate-bip39"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2b564c293e6194e8b222e52436bcb99f60de72043c7f845cf6c4406db4df121"
-dependencies = [
- "hmac 0.12.1",
- "pbkdf2",
- "schnorrkel 0.11.4",
- "sha2 0.10.8",
- "zeroize",
-]
-
[[package]]
name = "substrate-bip39"
version = "0.6.0"
@@ -28797,7 +28521,7 @@ dependencies = [
"sp-version 29.0.0",
"strum 0.26.3",
"tempfile",
- "toml 0.8.12",
+ "toml 0.8.19",
"walkdir",
"wasm-opt",
]
@@ -28818,7 +28542,7 @@ dependencies = [
"sp-maybe-compressed-blob 11.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"strum 0.26.3",
"tempfile",
- "toml 0.8.12",
+ "toml 0.8.19",
"walkdir",
"wasm-opt",
]
@@ -29815,33 +29539,21 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit 0.19.15",
-]
-
-[[package]]
-name = "toml"
-version = "0.8.12"
+version = "0.8.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
- "toml_edit 0.22.12",
+ "toml_edit 0.22.22",
]
[[package]]
name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
dependencies = [
"serde",
]
@@ -29853,8 +29565,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
dependencies = [
"indexmap 2.7.0",
- "serde",
- "serde_spanned",
"toml_datetime",
"winnow 0.5.15",
]
@@ -29872,9 +29582,9 @@ dependencies = [
[[package]]
name = "toml_edit"
-version = "0.22.12"
+version = "0.22.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
dependencies = [
"indexmap 2.7.0",
"serde",
@@ -32076,9 +31786,9 @@ dependencies = [
[[package]]
name = "zombienet-configuration"
-version = "0.2.19"
+version = "0.2.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d716b3ff8112d98ced15f53b0c72454f8cde533fe2b68bb04379228961efbd80"
+checksum = "5ced2fca1322821431f03d06dcf2ea74d3a7369760b6c587b372de6eada3ce43"
dependencies = [
"anyhow",
"lazy_static",
@@ -32089,23 +31799,23 @@ dependencies = [
"serde_json",
"thiserror",
"tokio",
- "toml 0.7.8",
+ "toml 0.8.19",
"url",
"zombienet-support",
]
[[package]]
name = "zombienet-orchestrator"
-version = "0.2.19"
+version = "0.2.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4098a7d33b729b59e32c41a87aa4d484bd1b8771a059bbd4edfb4d430b3b2d74"
+checksum = "86ecd17133c3129547b6472591b5e58d4aee1fc63c965a3418fd56d33a8a4e82"
dependencies = [
"anyhow",
"async-trait",
"futures",
"glob-match",
"hex",
- "libp2p 0.52.4",
+ "libp2p",
"libsecp256k1",
"multiaddr 0.18.1",
"rand",
@@ -32114,7 +31824,7 @@ dependencies = [
"serde",
"serde_json",
"sha2 0.10.8",
- "sp-core 31.0.0",
+ "sp-core 34.0.0",
"subxt",
"subxt-signer",
"thiserror",
@@ -32129,9 +31839,9 @@ dependencies = [
[[package]]
name = "zombienet-prom-metrics-parser"
-version = "0.2.19"
+version = "0.2.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "961e30be45b34f6ebeabf29ee2f47b0cd191ea62e40c064752572207509a6f5c"
+checksum = "23702db0819a050c8a0130a769b105695137020a64207b4597aa021f06924552"
dependencies = [
"pest",
"pest_derive",
@@ -32140,9 +31850,9 @@ dependencies = [
[[package]]
name = "zombienet-provider"
-version = "0.2.19"
+version = "0.2.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab0f7f01780b7c99a6c40539d195d979f234305f32808d547438b50829d44262"
+checksum = "83e903843c62cd811e7730ccc618dcd14444d20e8aadfcd7d7561c7b47d8f984"
dependencies = [
"anyhow",
"async-trait",
@@ -32151,7 +31861,7 @@ dependencies = [
"hex",
"k8s-openapi",
"kube",
- "nix 0.27.1",
+ "nix 0.29.0",
"regex",
"reqwest 0.11.27",
"serde",
@@ -32171,9 +31881,9 @@ dependencies = [
[[package]]
name = "zombienet-sdk"
-version = "0.2.19"
+version = "0.2.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99a3c5f2d657235b3ab7dc384677e63cde21983029e99106766ecd49e9f8d7f3"
+checksum = "e457b12c8fdc7003c12dd56855da09812ac11dd232e4ec01acccb2899fe05e44"
dependencies = [
"async-trait",
"futures",
@@ -32189,14 +31899,14 @@ dependencies = [
[[package]]
name = "zombienet-support"
-version = "0.2.19"
+version = "0.2.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "296f887ea88e07edd771f8e1d0dec5297a58b422f4b884a6292a21ebe03277cb"
+checksum = "43547d65b19a92cf0ee44380239d82ef345e7d26f7b04b9e0ecf48496af6346b"
dependencies = [
"anyhow",
"async-trait",
"futures",
- "nix 0.27.1",
+ "nix 0.29.0",
"rand",
"regex",
"reqwest 0.11.27",
diff --git a/Cargo.toml b/Cargo.toml
index c917a8a8fead4960cd60d1a86e802673afd74f0d..c30a9949e85e4212a9ead1f895889ee8bf69a53c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1391,7 +1391,7 @@ xcm-procedural = { path = "polkadot/xcm/procedural", default-features = false }
xcm-runtime-apis = { path = "polkadot/xcm/xcm-runtime-apis", default-features = false }
xcm-simulator = { path = "polkadot/xcm/xcm-simulator", default-features = false }
zeroize = { version = "1.7.0", default-features = false }
-zombienet-sdk = { version = "0.2.19" }
+zombienet-sdk = { version = "0.2.20" }
zstd = { version = "0.12.4", default-features = false }
[profile.release]
diff --git a/polkadot/zombienet-sdk-tests/Cargo.toml b/polkadot/zombienet-sdk-tests/Cargo.toml
index 120857c9a42e22cb1634994694915cc143e1b0cf..ba7517ddce6631df2b56f3c9632c3ec7f55c5b6f 100644
--- a/polkadot/zombienet-sdk-tests/Cargo.toml
+++ b/polkadot/zombienet-sdk-tests/Cargo.toml
@@ -12,6 +12,7 @@ anyhow = { workspace = true }
codec = { workspace = true, features = ["derive"] }
env_logger = { workspace = true }
log = { workspace = true }
+polkadot-primitives = { workspace = true, default-features = true }
serde = { workspace = true }
serde_json = { workspace = true }
subxt = { workspace = true, features = ["substrate-compat"] }
diff --git a/polkadot/zombienet-sdk-tests/tests/elastic_scaling/basic_3cores.rs b/polkadot/zombienet-sdk-tests/tests/elastic_scaling/basic_3cores.rs
new file mode 100644
index 0000000000000000000000000000000000000000..42aa83d9da7a22c2e21b9020cade89cf7c89c8ca
--- /dev/null
+++ b/polkadot/zombienet-sdk-tests/tests/elastic_scaling/basic_3cores.rs
@@ -0,0 +1,135 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Test that a parachain that uses a basic collator (like adder-collator) with elastic scaling
+// can achieve full throughput of 3 candidates per block.
+
+use anyhow::anyhow;
+
+use crate::helpers::{
+ assert_para_throughput, rococo,
+ rococo::runtime_types::{
+ pallet_broker::coretime_interface::CoreAssignment,
+ polkadot_runtime_parachains::assigner_coretime::PartsOf57600,
+ },
+};
+use polkadot_primitives::Id as ParaId;
+use serde_json::json;
+use subxt::{OnlineClient, PolkadotConfig};
+use subxt_signer::sr25519::dev;
+use zombienet_sdk::NetworkConfigBuilder;
+
+#[tokio::test(flavor = "multi_thread")]
+async fn basic_3cores_test() -> Result<(), anyhow::Error> {
+ let _ = env_logger::try_init_from_env(
+ env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
+ );
+
+ let images = zombienet_sdk::environment::get_images_from_env();
+
+ let config = NetworkConfigBuilder::new()
+ .with_relaychain(|r| {
+ let r = r
+ .with_chain("rococo-local")
+ .with_default_command("polkadot")
+ .with_default_image(images.polkadot.as_str())
+ .with_default_args(vec![("-lparachain=debug").into()])
+ .with_genesis_overrides(json!({
+ "configuration": {
+ "config": {
+ "scheduler_params": {
+ "num_cores": 2,
+ "max_validators_per_core": 1
+ },
+ "async_backing_params": {
+ "max_candidate_depth": 6,
+ "allowed_ancestry_len": 2
+ }
+ }
+ }
+ }))
+ // Have to set a `with_node` outside of the loop below, so that `r` has the right
+ // type.
+ .with_node(|node| node.with_name("validator-0"));
+
+ (1..4).fold(r, |acc, i| acc.with_node(|node| node.with_name(&format!("validator-{i}"))))
+ })
+ .with_parachain(|p| {
+ p.with_id(2000)
+ .with_default_command("adder-collator")
+ .cumulus_based(false)
+ .with_default_image(images.cumulus.as_str())
+ .with_default_args(vec![("-lparachain=debug").into()])
+ .with_collator(|n| n.with_name("adder-2000"))
+ })
+ .with_parachain(|p| {
+ p.with_id(2001)
+ .with_default_command("adder-collator")
+ .cumulus_based(false)
+ .with_default_image(images.cumulus.as_str())
+ .with_default_args(vec![("-lparachain=debug").into()])
+ .with_collator(|n| n.with_name("adder-2001"))
+ })
+ .build()
+ .map_err(|e| {
+ let errs = e.into_iter().map(|e| e.to_string()).collect::<Vec<_>>().join(" ");
+ anyhow!("config errs: {errs}")
+ })?;
+
+ let spawn_fn = zombienet_sdk::environment::get_spawn_fn();
+ let network = spawn_fn(config).await?;
+
+ let relay_node = network.get_node("validator-0")?;
+
+ let relay_client: OnlineClient<PolkadotConfig> = relay_node.wait_client().await?;
+ let alice = dev::alice();
+
+ // Assign two extra cores to adder-2000.
+ relay_client
+ .tx()
+ .sign_and_submit_then_watch_default(
+ &rococo::tx()
+ .sudo()
+ .sudo(rococo::runtime_types::rococo_runtime::RuntimeCall::Utility(
+ rococo::runtime_types::pallet_utility::pallet::Call::batch {
+ calls: vec![
+ rococo::runtime_types::rococo_runtime::RuntimeCall::Coretime(
+ rococo::runtime_types::polkadot_runtime_parachains::coretime::pallet::Call::assign_core {
+ core: 0,
+ begin: 0,
+ assignment: vec![(CoreAssignment::Task(2000), PartsOf57600(57600))],
+ end_hint: None
+ }
+ ),
+ rococo::runtime_types::rococo_runtime::RuntimeCall::Coretime(
+ rococo::runtime_types::polkadot_runtime_parachains::coretime::pallet::Call::assign_core {
+ core: 1,
+ begin: 0,
+ assignment: vec![(CoreAssignment::Task(2000), PartsOf57600(57600))],
+ end_hint: None
+ }
+ ),
+ ],
+ },
+ )),
+ &alice,
+ )
+ .await?
+ .wait_for_finalized_success()
+ .await?;
+
+ log::info!("2 more cores assigned to adder-2000");
+
+ assert_para_throughput(
+ &relay_client,
+ 15,
+ [(ParaId::from(2000), 40..46), (ParaId::from(2001), 12..16)]
+ .into_iter()
+ .collect(),
+ )
+ .await?;
+
+ log::info!("Test finished successfully");
+
+ Ok(())
+}
diff --git a/polkadot/zombienet-sdk-tests/tests/elastic_scaling/doesnt_break_parachains.rs b/polkadot/zombienet-sdk-tests/tests/elastic_scaling/doesnt_break_parachains.rs
new file mode 100644
index 0000000000000000000000000000000000000000..f83400d2b22abe7418d5e022b28d773ca04e790b
--- /dev/null
+++ b/polkadot/zombienet-sdk-tests/tests/elastic_scaling/doesnt_break_parachains.rs
@@ -0,0 +1,133 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Test that a paraid that doesn't use elastic scaling which acquired multiple cores does not brick
+// itself if ElasticScalingMVP feature is enabled in genesis.
+
+use anyhow::anyhow;
+
+use crate::helpers::{
+ assert_finalized_block_height, assert_para_throughput, rococo,
+ rococo::runtime_types::{
+ pallet_broker::coretime_interface::CoreAssignment,
+ polkadot_runtime_parachains::assigner_coretime::PartsOf57600,
+ },
+};
+use polkadot_primitives::{CoreIndex, Id as ParaId};
+use serde_json::json;
+use std::collections::{BTreeMap, VecDeque};
+use subxt::{OnlineClient, PolkadotConfig};
+use subxt_signer::sr25519::dev;
+use zombienet_sdk::NetworkConfigBuilder;
+
+#[tokio::test(flavor = "multi_thread")]
+async fn doesnt_break_parachains_test() -> Result<(), anyhow::Error> {
+ let _ = env_logger::try_init_from_env(
+ env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
+ );
+
+ let images = zombienet_sdk::environment::get_images_from_env();
+
+ let config = NetworkConfigBuilder::new()
+ .with_relaychain(|r| {
+ let r = r
+ .with_chain("rococo-local")
+ .with_default_command("polkadot")
+ .with_default_image(images.polkadot.as_str())
+ .with_default_args(vec![("-lparachain=debug").into()])
+ .with_genesis_overrides(json!({
+ "configuration": {
+ "config": {
+ "scheduler_params": {
+ "num_cores": 1,
+ "max_validators_per_core": 2
+ },
+ "async_backing_params": {
+ "max_candidate_depth": 6,
+ "allowed_ancestry_len": 2
+ }
+ }
+ }
+ }))
+ // Have to set a `with_node` outside of the loop below, so that `r` has the right
+ // type.
+ .with_node(|node| node.with_name("validator-0"));
+
+ (1..4).fold(r, |acc, i| acc.with_node(|node| node.with_name(&format!("validator-{i}"))))
+ })
+ .with_parachain(|p| {
+ // Use rococo-parachain default, which has 6 second slot time. Also, don't use
+ // slot-based collator.
+ p.with_id(2000)
+ .with_default_command("polkadot-parachain")
+ .with_default_image(images.cumulus.as_str())
+ .with_default_args(vec![("-lparachain=debug,aura=debug").into()])
+ .with_collator(|n| n.with_name("collator-2000"))
+ })
+ .build()
+ .map_err(|e| {
+ let errs = e.into_iter().map(|e| e.to_string()).collect::<Vec<_>>().join(" ");
+ anyhow!("config errs: {errs}")
+ })?;
+
+ let spawn_fn = zombienet_sdk::environment::get_spawn_fn();
+ let network = spawn_fn(config).await?;
+
+ let relay_node = network.get_node("validator-0")?;
+ let para_node = network.get_node("collator-2000")?;
+
+ let relay_client: OnlineClient<PolkadotConfig> = relay_node.wait_client().await?;
+ let alice = dev::alice();
+
+ relay_client
+ .tx()
+ .sign_and_submit_then_watch_default(
+ &rococo::tx()
+ .sudo()
+ .sudo(rococo::runtime_types::rococo_runtime::RuntimeCall::Coretime(
+ rococo::runtime_types::polkadot_runtime_parachains::coretime::pallet::Call::assign_core {
+ core: 0,
+ begin: 0,
+ assignment: vec![(CoreAssignment::Task(2000), PartsOf57600(57600))],
+ end_hint: None
+ }
+ )),
+ &alice,
+ )
+ .await?
+ .wait_for_finalized_success()
+ .await?;
+
+ log::info!("1 more core assigned to the parachain");
+
+ let para_id = ParaId::from(2000);
+ // Expect the parachain to be making normal progress, 1 candidate backed per relay chain block.
+ assert_para_throughput(&relay_client, 15, [(para_id, 13..16)].into_iter().collect()).await?;
+
+ let para_client = para_node.wait_client().await?;
+ // Assert the parachain finalized block height is also on par with the number of backed
+ // candidates.
+ assert_finalized_block_height(¶_client, 12..16).await?;
+
+ // Sanity check that indeed the parachain has two assigned cores.
+ let cq = relay_client
+ .runtime_api()
+ .at_latest()
+ .await?
+ .call_raw::<BTreeMap<CoreIndex, VecDeque<ParaId>>>("ParachainHost_claim_queue", None)
+ .await?;
+
+ assert_eq!(
+ cq,
+ [
+ (CoreIndex(0), [para_id, para_id].into_iter().collect()),
+ (CoreIndex(1), [para_id, para_id].into_iter().collect()),
+ ]
+ .into_iter()
+ .collect()
+ );
+
+ log::info!("Test finished successfully");
+
+ Ok(())
+}
diff --git a/polkadot/zombienet-sdk-tests/tests/elastic_scaling/mod.rs b/polkadot/zombienet-sdk-tests/tests/elastic_scaling/mod.rs
index bb296a419df1f2387d7ff44d4f71769eaadd0467..9cfd5db5a096dbd393f84ea4fff7bf2b1df59227 100644
--- a/polkadot/zombienet-sdk-tests/tests/elastic_scaling/mod.rs
+++ b/polkadot/zombienet-sdk-tests/tests/elastic_scaling/mod.rs
@@ -1,8 +1,6 @@
// Copyright (C) Parity Technologies (UK) Ltd.
// SPDX-License-Identifier: Apache-2.0
-#[subxt::subxt(runtime_metadata_path = "metadata-files/rococo-local.scale")]
-pub mod rococo {}
-
-mod helpers;
+mod basic_3cores;
+mod doesnt_break_parachains;
mod slot_based_3cores;
diff --git a/polkadot/zombienet-sdk-tests/tests/elastic_scaling/slot_based_3cores.rs b/polkadot/zombienet-sdk-tests/tests/elastic_scaling/slot_based_3cores.rs
index 41ec1250ecc4479f6d0cca4ff61c49b5bc33b901..aa9f41320135defd9a85e9ba3c5dafa623a3187b 100644
--- a/polkadot/zombienet-sdk-tests/tests/elastic_scaling/slot_based_3cores.rs
+++ b/polkadot/zombienet-sdk-tests/tests/elastic_scaling/slot_based_3cores.rs
@@ -6,14 +6,14 @@
use anyhow::anyhow;
-use super::{
- helpers::assert_para_throughput,
- rococo,
+use crate::helpers::{
+ assert_finalized_block_height, assert_para_throughput, rococo,
rococo::runtime_types::{
pallet_broker::coretime_interface::CoreAssignment,
polkadot_runtime_parachains::assigner_coretime::PartsOf57600,
},
};
+use polkadot_primitives::Id as ParaId;
use serde_json::json;
use subxt::{OnlineClient, PolkadotConfig};
use subxt_signer::sr25519::dev;
@@ -63,7 +63,6 @@ async fn slot_based_3cores_test() -> Result<(), anyhow::Error> {
.with_default_command("test-parachain")
.with_default_image(images.cumulus.as_str())
.with_chain("elastic-scaling-mvp")
- .with_default_args(vec![("--experimental-use-slot-based").into()])
.with_default_args(vec![
("--experimental-use-slot-based").into(),
("-lparachain=debug,aura=debug").into(),
@@ -93,6 +92,8 @@ async fn slot_based_3cores_test() -> Result<(), anyhow::Error> {
let network = spawn_fn(config).await?;
let relay_node = network.get_node("validator-0")?;
+ let para_node_elastic = network.get_node("collator-elastic")?;
+ let para_node_elastic_mvp = network.get_node("collator-elastic-mvp")?;
let relay_client: OnlineClient<PolkadotConfig> = relay_node.wait_client().await?;
let alice = dev::alice();
@@ -156,10 +157,17 @@ async fn slot_based_3cores_test() -> Result<(), anyhow::Error> {
assert_para_throughput(
&relay_client,
15,
- [(2100, 39..46), (2200, 39..46)].into_iter().collect(),
+ [(ParaId::from(2100), 39..46), (ParaId::from(2200), 39..46)]
+ .into_iter()
+ .collect(),
)
.await?;
+ // Assert the parachain finalized block height is also on par with the number of backed
+ // candidates.
+ assert_finalized_block_height(¶_node_elastic.wait_client().await?, 36..46).await?;
+ assert_finalized_block_height(¶_node_elastic_mvp.wait_client().await?, 36..46).await?;
+
log::info!("Test finished successfully");
Ok(())
diff --git a/polkadot/zombienet-sdk-tests/tests/functional/async_backing_6_seconds_rate.rs b/polkadot/zombienet-sdk-tests/tests/functional/async_backing_6_seconds_rate.rs
new file mode 100644
index 0000000000000000000000000000000000000000..14f86eb130f78e24796db6280f17fcb430d604ae
--- /dev/null
+++ b/polkadot/zombienet-sdk-tests/tests/functional/async_backing_6_seconds_rate.rs
@@ -0,0 +1,95 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Test we are producing 12-second parachain blocks if using an old collator, pre async-backing.
+
+use anyhow::anyhow;
+
+use crate::helpers::{assert_finalized_block_height, assert_para_throughput};
+use polkadot_primitives::Id as ParaId;
+use serde_json::json;
+use subxt::{OnlineClient, PolkadotConfig};
+use zombienet_sdk::NetworkConfigBuilder;
+
+#[tokio::test(flavor = "multi_thread")]
+async fn async_backing_6_seconds_rate_test() -> Result<(), anyhow::Error> {
+ let _ = env_logger::try_init_from_env(
+ env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
+ );
+
+ let images = zombienet_sdk::environment::get_images_from_env();
+
+ let config = NetworkConfigBuilder::new()
+ .with_relaychain(|r| {
+ let r = r
+ .with_chain("rococo-local")
+ .with_default_command("polkadot")
+ .with_default_image(images.polkadot.as_str())
+ .with_default_args(vec![("-lparachain=debug").into()])
+ .with_genesis_overrides(json!({
+ "configuration": {
+ "config": {
+ "scheduler_params": {
+ "group_rotation_frequency": 4,
+ "lookahead": 2,
+ "max_candidate_depth": 3,
+ "allowed_ancestry_len": 2,
+ },
+ }
+ }
+ }))
+ .with_node(|node| node.with_name("validator-0"));
+
+ (1..12)
+ .fold(r, |acc, i| acc.with_node(|node| node.with_name(&format!("validator-{i}"))))
+ })
+ .with_parachain(|p| {
+ p.with_id(2000)
+ .with_default_command("adder-collator")
+ .with_default_image(
+ std::env::var("COL_IMAGE")
+ .unwrap_or("docker.io/paritypr/colander:latest".to_string())
+ .as_str(),
+ )
+ .cumulus_based(false)
+ .with_default_args(vec![("-lparachain=debug").into()])
+ .with_collator(|n| n.with_name("collator-adder-2000"))
+ })
+ .with_parachain(|p| {
+ p.with_id(2001)
+ .with_default_command("polkadot-parachain")
+ .with_default_image(images.cumulus.as_str())
+ .with_default_args(vec![("-lparachain=debug,aura=debug").into()])
+ .with_collator(|n| n.with_name("collator-2001"))
+ })
+ .build()
+ .map_err(|e| {
+ let errs = e.into_iter().map(|e| e.to_string()).collect::<Vec<_>>().join(" ");
+ anyhow!("config errs: {errs}")
+ })?;
+
+ let spawn_fn = zombienet_sdk::environment::get_spawn_fn();
+ let network = spawn_fn(config).await?;
+
+ let relay_node = network.get_node("validator-0")?;
+ let para_node_2001 = network.get_node("collator-2001")?;
+
+ let relay_client: OnlineClient<PolkadotConfig> = relay_node.wait_client().await?;
+
+ assert_para_throughput(
+ &relay_client,
+ 15,
+ [(ParaId::from(2000), 11..16), (ParaId::from(2001), 11..16)]
+ .into_iter()
+ .collect(),
+ )
+ .await?;
+
+ // Assert the parachain finalized block height is also on par with the number of backed
+ // candidates. We can only do this for the collator based on cumulus.
+ assert_finalized_block_height(¶_node_2001.wait_client().await?, 10..16).await?;
+
+ log::info!("Test finished successfully");
+
+ Ok(())
+}
diff --git a/polkadot/zombienet-sdk-tests/tests/functional/mod.rs b/polkadot/zombienet-sdk-tests/tests/functional/mod.rs
new file mode 100644
index 0000000000000000000000000000000000000000..ecdab38e1d2865faaa6957c5f2ce331dc96d61df
--- /dev/null
+++ b/polkadot/zombienet-sdk-tests/tests/functional/mod.rs
@@ -0,0 +1,5 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+mod async_backing_6_seconds_rate;
+mod sync_backing;
diff --git a/polkadot/zombienet-sdk-tests/tests/functional/sync_backing.rs b/polkadot/zombienet-sdk-tests/tests/functional/sync_backing.rs
new file mode 100644
index 0000000000000000000000000000000000000000..6da45e2844919ea924317d2a65ced7e57e7c8060
--- /dev/null
+++ b/polkadot/zombienet-sdk-tests/tests/functional/sync_backing.rs
@@ -0,0 +1,74 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Test we are producing 12-second parachain blocks if using an old collator, pre async-backing.
+
+use anyhow::anyhow;
+
+use crate::helpers::{assert_finalized_block_height, assert_para_throughput};
+use polkadot_primitives::Id as ParaId;
+use serde_json::json;
+use subxt::{OnlineClient, PolkadotConfig};
+use zombienet_sdk::NetworkConfigBuilder;
+
+#[tokio::test(flavor = "multi_thread")]
+async fn sync_backing_test() -> Result<(), anyhow::Error> {
+ let _ = env_logger::try_init_from_env(
+ env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, "info"),
+ );
+
+ let images = zombienet_sdk::environment::get_images_from_env();
+
+ let config = NetworkConfigBuilder::new()
+ .with_relaychain(|r| {
+ let r = r
+ .with_chain("rococo-local")
+ .with_default_command("polkadot")
+ .with_default_image(images.polkadot.as_str())
+ .with_default_args(vec![("-lparachain=debug").into()])
+ .with_genesis_overrides(json!({
+ "configuration": {
+ "config": {
+ "scheduler_params": {
+ "group_rotation_frequency": 4,
+ },
+ }
+ }
+ }))
+ .with_node(|node| node.with_name("validator-0"));
+
+ (1..5).fold(r, |acc, i| acc.with_node(|node| node.with_name(&format!("validator-{i}"))))
+ })
+ .with_parachain(|p| {
+ p.with_id(2000)
+ .with_default_command("polkadot-parachain")
+ // This must be a very old polkadot-parachain image, pre async backing
+ .with_default_image(images.cumulus.as_str())
+ .with_default_args(vec![("-lparachain=debug,aura=debug").into()])
+ .with_collator(|n| n.with_name("collator-2000"))
+ })
+ .build()
+ .map_err(|e| {
+ let errs = e.into_iter().map(|e| e.to_string()).collect::<Vec<_>>().join(" ");
+ anyhow!("config errs: {errs}")
+ })?;
+
+ let spawn_fn = zombienet_sdk::environment::get_spawn_fn();
+ let network = spawn_fn(config).await?;
+
+ let relay_node = network.get_node("validator-0")?;
+ let para_node = network.get_node("collator-2000")?;
+
+ let relay_client: OnlineClient<PolkadotConfig> = relay_node.wait_client().await?;
+
+ assert_para_throughput(&relay_client, 15, [(ParaId::from(2000), 5..9)].into_iter().collect())
+ .await?;
+
+ // Assert the parachain finalized block height is also on par with the number of backed
+ // candidates.
+ assert_finalized_block_height(¶_node.wait_client().await?, 5..9).await?;
+
+ log::info!("Test finished successfully");
+
+ Ok(())
+}
diff --git a/polkadot/zombienet-sdk-tests/tests/elastic_scaling/helpers.rs b/polkadot/zombienet-sdk-tests/tests/helpers/mod.rs
similarity index 65%
rename from polkadot/zombienet-sdk-tests/tests/elastic_scaling/helpers.rs
rename to polkadot/zombienet-sdk-tests/tests/helpers/mod.rs
index 7d4ad4a1dd8b1a05738e5dd9a9ef06f55ad26be3..470345ca4d621fb87100b9c783098d288b22cdb6 100644
--- a/polkadot/zombienet-sdk-tests/tests/elastic_scaling/helpers.rs
+++ b/polkadot/zombienet-sdk-tests/tests/helpers/mod.rs
@@ -1,19 +1,22 @@
// Copyright (C) Parity Technologies (UK) Ltd.
// SPDX-License-Identifier: Apache-2.0
-use super::rococo;
+use polkadot_primitives::Id as ParaId;
use std::{collections::HashMap, ops::Range};
use subxt::{OnlineClient, PolkadotConfig};
+#[subxt::subxt(runtime_metadata_path = "metadata-files/rococo-local.scale")]
+pub mod rococo {}
+
// Helper function for asserting the throughput of parachains (total number of backed candidates in
// a window of relay chain blocks), after the first session change.
pub async fn assert_para_throughput(
relay_client: &OnlineClient<PolkadotConfig>,
stop_at: u32,
- expected_candidate_ranges: HashMap<u32, Range<u32>>,
+ expected_candidate_ranges: HashMap<ParaId, Range<u32>>,
) -> Result<(), anyhow::Error> {
let mut blocks_sub = relay_client.blocks().subscribe_finalized().await?;
- let mut candidate_count: HashMap<u32, u32> = HashMap::new();
+ let mut candidate_count: HashMap<ParaId, u32> = HashMap::new();
let mut current_block_count = 0;
let mut had_first_session_change = false;
@@ -31,7 +34,7 @@ pub async fn assert_para_throughput(
current_block_count += 1;
for event in events.find::<rococo::para_inclusion::events::CandidateBacked>() {
- *(candidate_count.entry(event?.0.descriptor.para_id.0).or_default()) += 1;
+ *(candidate_count.entry(event?.0.descriptor.para_id.0.into()).or_default()) += 1;
}
}
@@ -58,3 +61,21 @@ pub async fn assert_para_throughput(
Ok(())
}
+
+// Helper function for retrieving the latest finalized block height and asserting it's within a
+// range.
+pub async fn assert_finalized_block_height(
+ client: &OnlineClient<PolkadotConfig>,
+ expected_range: Range<u32>,
+) -> Result<(), anyhow::Error> {
+ if let Some(block) = client.blocks().subscribe_finalized().await?.next().await {
+ let height = block?.number();
+ log::info!("Finalized block number {height}");
+
+ assert!(
+ expected_range.contains(&height),
+ "Finalized block number {height} not within range {expected_range:?}"
+ );
+ }
+ Ok(())
+}
diff --git a/polkadot/zombienet-sdk-tests/tests/lib.rs b/polkadot/zombienet-sdk-tests/tests/lib.rs
index 977e0f90b1c94ad333fa02baa23b10a4132bde69..9feb9775e450e0149b0e357c4861a62beff5732e 100644
--- a/polkadot/zombienet-sdk-tests/tests/lib.rs
+++ b/polkadot/zombienet-sdk-tests/tests/lib.rs
@@ -1,7 +1,12 @@
// Copyright (C) Parity Technologies (UK) Ltd.
// SPDX-License-Identifier: Apache-2.0
+#[cfg(feature = "zombie-metadata")]
+mod helpers;
+
#[cfg(feature = "zombie-metadata")]
mod elastic_scaling;
#[cfg(feature = "zombie-metadata")]
+mod functional;
+#[cfg(feature = "zombie-metadata")]
mod smoke;
diff --git a/polkadot/zombienet-sdk-tests/tests/smoke/coretime_revenue.rs b/polkadot/zombienet-sdk-tests/tests/smoke/coretime_revenue.rs
index 2da2436a1111221fff1aeb2fb57b09798ea37880..59a71a83e01ecf91bbad9b5358caa0bc08f0cd0e 100644
--- a/polkadot/zombienet-sdk-tests/tests/smoke/coretime_revenue.rs
+++ b/polkadot/zombienet-sdk-tests/tests/smoke/coretime_revenue.rs
@@ -10,21 +10,24 @@
//! normal parachain runtime WILL mess things up.
use anyhow::anyhow;
-#[subxt::subxt(runtime_metadata_path = "metadata-files/rococo-local.scale")]
-pub mod rococo {}
#[subxt::subxt(runtime_metadata_path = "metadata-files/coretime-rococo-local.scale")]
mod coretime_rococo {}
-use rococo::runtime_types::{
- staging_xcm::v4::{
- asset::{Asset, AssetId, Assets, Fungibility},
- junction::Junction,
- junctions::Junctions,
- location::Location,
+use crate::helpers::rococo::{
+ self as rococo_api,
+ runtime_types::{
+ polkadot_parachain_primitives::primitives,
+ staging_xcm::v4::{
+ asset::{Asset, AssetId, Assets, Fungibility},
+ junction::Junction,
+ junctions::Junctions,
+ location::Location,
+ },
+ xcm::{VersionedAssets, VersionedLocation},
},
- xcm::{VersionedAssets, VersionedLocation},
};
+
use serde_json::json;
use std::{fmt::Display, sync::Arc};
use subxt::{events::StaticEvent, utils::AccountId32, OnlineClient, PolkadotConfig};
@@ -41,8 +44,6 @@ use coretime_rococo::{
},
};
-use rococo::{self as rococo_api, runtime_types::polkadot_parachain_primitives::primitives};
-
type CoretimeRuntimeCall = coretime_api::runtime_types::coretime_rococo_runtime::RuntimeCall;
type CoretimeUtilityCall = coretime_api::runtime_types::pallet_utility::pallet::Call;
type CoretimeBrokerCall = coretime_api::runtime_types::pallet_broker::pallet::Call;
diff --git a/polkadot/zombienet_tests/elastic_scaling/0001-basic-3cores-6s-blocks.toml b/polkadot/zombienet_tests/elastic_scaling/0001-basic-3cores-6s-blocks.toml
deleted file mode 100644
index 611978a33a5f145274dd3c6c158e0de69a1c436a..0000000000000000000000000000000000000000
--- a/polkadot/zombienet_tests/elastic_scaling/0001-basic-3cores-6s-blocks.toml
+++ /dev/null
@@ -1,49 +0,0 @@
-[settings]
-timeout = 1000
-
-[relaychain.genesis.runtimeGenesis.patch.configuration.config.async_backing_params]
- max_candidate_depth = 6
- allowed_ancestry_len = 2
-
-[relaychain.genesis.runtimeGenesis.patch.configuration.config.scheduler_params]
- max_validators_per_core = 1
- num_cores = 3
-
-[relaychain.genesis.runtimeGenesis.patch.configuration.config.approval_voting_params]
- max_approval_coalesce_count = 5
-
-[relaychain]
-default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}"
-chain = "rococo-local"
-default_command = "polkadot"
-
- [relaychain.default_resources]
- limits = { memory = "4G", cpu = "3" }
- requests = { memory = "4G", cpu = "3" }
-
- [[relaychain.node_groups]]
- name = "elastic-validator"
- count = 5
- args = [ "-lparachain=debug,parachain::candidate-backing=trace,parachain::provisioner=trace,parachain::prospective-parachains=trace,runtime=debug"]
-
-{% for id in range(2000,2002) %}
-[[parachains]]
-id = {{id}}
-addToGenesis = true
- [parachains.default_resources]
- limits = { memory = "4G", cpu = "3" }
- requests = { memory = "4G", cpu = "3" }
-
- [parachains.collator]
- name = "some-parachain"
- image = "{{COL_IMAGE}}"
- command = "adder-collator"
- args = ["-lparachain::collation-generation=trace,parachain::collator-protocol=trace,parachain=debug"]
-
-{% endfor %}
-
-# This represents the layout of the adder collator block header.
-[types.Header]
-number = "u64"
-parent_hash = "Hash"
-post_state = "Hash"
diff --git a/polkadot/zombienet_tests/elastic_scaling/0001-basic-3cores-6s-blocks.zndsl b/polkadot/zombienet_tests/elastic_scaling/0001-basic-3cores-6s-blocks.zndsl
deleted file mode 100644
index d47ef8f415f7ac9ca94b825de23580ab6131f013..0000000000000000000000000000000000000000
--- a/polkadot/zombienet_tests/elastic_scaling/0001-basic-3cores-6s-blocks.zndsl
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Test with adder collator using 3 cores and async backing
-Network: ./0001-basic-3cores-6s-blocks.toml
-Creds: config
-
-# Check authority status.
-elastic-validator-0: reports node_roles is 4
-elastic-validator-1: reports node_roles is 4
-elastic-validator-2: reports node_roles is 4
-elastic-validator-3: reports node_roles is 4
-elastic-validator-4: reports node_roles is 4
-
-
-# Register 2 extra cores to this some-parachain.
-elastic-validator-0: js-script ./assign-core.js with "0,2000,57600" return is 0 within 600 seconds
-elastic-validator-0: js-script ./assign-core.js with "1,2000,57600" return is 0 within 600 seconds
-
-# Wait for 20 relay chain blocks
-elastic-validator-0: reports substrate_block_height{status="best"} is at least 20 within 600 seconds
-
-# Non elastic parachain should progress normally
-some-parachain-1: count of log lines containing "Parachain velocity: 1" is at least 5 within 20 seconds
-# Sanity
-some-parachain-1: count of log lines containing "Parachain velocity: 2" is 0
-
-# Parachain should progress 3 blocks per relay chain block ideally, however CI might not be
-# the most performant environment so we'd just use a lower bound of 2 blocks per RCB
-elastic-validator-0: parachain 2000 block height is at least 20 within 200 seconds
-
diff --git a/polkadot/zombienet_tests/elastic_scaling/0002-elastic-scaling-doesnt-break-parachains.toml b/polkadot/zombienet_tests/elastic_scaling/0002-elastic-scaling-doesnt-break-parachains.toml
deleted file mode 100644
index 046d707cc1e8db0f08e7870b663e715f3c5f9420..0000000000000000000000000000000000000000
--- a/polkadot/zombienet_tests/elastic_scaling/0002-elastic-scaling-doesnt-break-parachains.toml
+++ /dev/null
@@ -1,40 +0,0 @@
-[settings]
-timeout = 1000
-bootnode = true
-
-[relaychain.genesis.runtimeGenesis.patch.configuration.config]
- needed_approvals = 4
-
-[relaychain.genesis.runtimeGenesis.patch.configuration.config.scheduler_params]
- max_validators_per_core = 2
- num_cores = 2
-
-[relaychain]
-default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}"
-chain = "rococo-local"
-default_command = "polkadot"
-
-[relaychain.default_resources]
-limits = { memory = "4G", cpu = "2" }
-requests = { memory = "2G", cpu = "1" }
-
- [[relaychain.nodes]]
- name = "alice"
- validator = "true"
-
- [[relaychain.node_groups]]
- name = "validator"
- count = 3
- args = [ "-lparachain=debug,runtime=debug"]
-
-[[parachains]]
-id = 2000
-default_command = "polkadot-parachain"
-add_to_genesis = false
-register_para = true
-onboard_as_parachain = false
-
- [parachains.collator]
- name = "collator2000"
- command = "polkadot-parachain"
- args = [ "-lparachain=debug", "--experimental-use-slot-based" ]
diff --git a/polkadot/zombienet_tests/elastic_scaling/0002-elastic-scaling-doesnt-break-parachains.zndsl b/polkadot/zombienet_tests/elastic_scaling/0002-elastic-scaling-doesnt-break-parachains.zndsl
deleted file mode 100644
index 0cfc29f532d1e433bd1b5879c6cea93eb94989bf..0000000000000000000000000000000000000000
--- a/polkadot/zombienet_tests/elastic_scaling/0002-elastic-scaling-doesnt-break-parachains.zndsl
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Test that a paraid acquiring multiple cores does not brick itself if ElasticScalingMVP feature is enabled in genesis
-Network: ./0002-elastic-scaling-doesnt-break-parachains.toml
-Creds: config
-
-# Check authority status.
-validator: reports node_roles is 4
-
-validator: reports substrate_block_height{status="finalized"} is at least 10 within 100 seconds
-
-# Ensure parachain was able to make progress.
-validator: parachain 2000 block height is at least 10 within 200 seconds
-
-# Register the second core assigned to this parachain.
-alice: js-script ./assign-core.js with "0,2000,57600" return is 0 within 600 seconds
-alice: js-script ./assign-core.js with "1,2000,57600" return is 0 within 600 seconds
-
-validator: reports substrate_block_height{status="finalized"} is at least 35 within 100 seconds
-
-# Ensure parachain is now making progress.
-validator: parachain 2000 block height is at least 30 within 200 seconds
diff --git a/polkadot/zombienet_tests/elastic_scaling/assign-core.js b/polkadot/zombienet_tests/elastic_scaling/assign-core.js
deleted file mode 120000
index eeb6402c06f5e52cedf150f924d6791beb1d9867..0000000000000000000000000000000000000000
--- a/polkadot/zombienet_tests/elastic_scaling/assign-core.js
+++ /dev/null
@@ -1 +0,0 @@
-../assign-core.js
\ No newline at end of file
diff --git a/polkadot/zombienet_tests/functional/0011-async-backing-6-seconds-rate.toml b/polkadot/zombienet_tests/functional/0011-async-backing-6-seconds-rate.toml
deleted file mode 100644
index b776622fdce33df2e9a78debc31ee3e62ae4805d..0000000000000000000000000000000000000000
--- a/polkadot/zombienet_tests/functional/0011-async-backing-6-seconds-rate.toml
+++ /dev/null
@@ -1,54 +0,0 @@
-[settings]
-timeout = 1000
-
-[relaychain]
-default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}"
-chain = "rococo-local"
-
-[relaychain.genesis.runtimeGenesis.patch.configuration.config]
- needed_approvals = 4
- relay_vrf_modulo_samples = 6
-
-[relaychain.genesis.runtimeGenesis.patch.configuration.config.async_backing_params]
- max_candidate_depth = 3
- allowed_ancestry_len = 2
-
-[relaychain.genesis.runtimeGenesis.patch.configuration.config.scheduler_params]
- lookahead = 2
- group_rotation_frequency = 4
-
-
-[relaychain.default_resources]
-limits = { memory = "4G", cpu = "2" }
-requests = { memory = "2G", cpu = "1" }
-
- [[relaychain.node_groups]]
- name = "alice"
- args = [ "-lparachain=debug" ]
- count = 12
-
-[[parachains]]
-id = 2000
-addToGenesis = true
-genesis_state_generator = "undying-collator export-genesis-state --pov-size=100000 --pvf-complexity=1"
-
- [parachains.collator]
- name = "collator01"
- image = "{{COL_IMAGE}}"
- command = "undying-collator"
- args = ["-lparachain=debug", "--pov-size=100000", "--pvf-complexity=1", "--parachain-id=2000"]
-
-[[parachains]]
-id = 2001
-cumulus_based = true
-
- [parachains.collator]
- name = "collator02"
- image = "{{CUMULUS_IMAGE}}"
- command = "polkadot-parachain"
- args = ["-lparachain=debug"]
-
-[types.Header]
-number = "u64"
-parent_hash = "Hash"
-post_state = "Hash"
\ No newline at end of file
diff --git a/polkadot/zombienet_tests/functional/0011-async-backing-6-seconds-rate.zndsl b/polkadot/zombienet_tests/functional/0011-async-backing-6-seconds-rate.zndsl
deleted file mode 100644
index 0d01af82833e36afd3c38b2e00e9d604ace46797..0000000000000000000000000000000000000000
--- a/polkadot/zombienet_tests/functional/0011-async-backing-6-seconds-rate.zndsl
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Test we are producing blocks at 6 seconds clip
-Network: ./0011-async-backing-6-seconds-rate.toml
-Creds: config
-
-# Check authority status.
-alice: reports node_roles is 4
-
-# Ensure parachains are registered.
-alice: parachain 2000 is registered within 60 seconds
-alice: parachain 2001 is registered within 60 seconds
-
-# Ensure parachains made progress.
-alice: reports substrate_block_height{status="finalized"} is at least 10 within 100 seconds
-
-# This parachains should produce blocks at 6s clip, let's assume an 8s rate, allowing for
-# some slots to be missed on slower machines
-alice: parachain 2000 block height is at least 30 within 240 seconds
-# This should already have produced the needed blocks
-alice: parachain 2001 block height is at least 30 within 6 seconds
-
diff --git a/polkadot/zombienet_tests/functional/0017-sync-backing.toml b/polkadot/zombienet_tests/functional/0017-sync-backing.toml
deleted file mode 100644
index 2550054c8dadaf75b34b4c4a50f402576f3f5266..0000000000000000000000000000000000000000
--- a/polkadot/zombienet_tests/functional/0017-sync-backing.toml
+++ /dev/null
@@ -1,48 +0,0 @@
-[settings]
-timeout = 1000
-
-[relaychain]
-default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}"
-chain = "rococo-local"
-
-[relaychain.genesis.runtimeGenesis.patch.configuration.config.async_backing_params]
- max_candidate_depth = 0
- allowed_ancestry_len = 0
-
-[relaychain.genesis.runtimeGenesis.patch.configuration.config.scheduler_params]
- lookahead = 2
- group_rotation_frequency = 4
-
-[relaychain.default_resources]
-limits = { memory = "4G", cpu = "2" }
-requests = { memory = "2G", cpu = "1" }
-
- [[relaychain.node_groups]]
- name = "alice"
- args = [ "-lparachain=debug" ]
- count = 10
-
-[[parachains]]
-id = 2000
-addToGenesis = true
-
- [parachains.collator]
- name = "collator01"
- image = "{{COL_IMAGE}}"
- command = "adder-collator"
- args = ["-lparachain=debug"]
-
-[[parachains]]
-id = 2001
-cumulus_based = true
-
- [parachains.collator]
- name = "collator02"
- image = "{{CUMULUS_IMAGE}}"
- command = "polkadot-parachain"
- args = ["-lparachain=debug"]
-
-[types.Header]
-number = "u64"
-parent_hash = "Hash"
-post_state = "Hash"
\ No newline at end of file
diff --git a/polkadot/zombienet_tests/functional/0017-sync-backing.zndsl b/polkadot/zombienet_tests/functional/0017-sync-backing.zndsl
deleted file mode 100644
index a53de784b2d1349fa890ce51984b6865c2c94fd5..0000000000000000000000000000000000000000
--- a/polkadot/zombienet_tests/functional/0017-sync-backing.zndsl
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Test we are producing 12-second parachain blocks if sync backing is configured
-Network: ./0017-sync-backing.toml
-Creds: config
-
-# Check authority status.
-alice: reports node_roles is 4
-
-# Ensure parachains are registered.
-alice: parachain 2000 is registered within 60 seconds
-alice: parachain 2001 is registered within 60 seconds
-
-# Ensure parachains made progress.
-alice: reports substrate_block_height{status="finalized"} is at least 10 within 100 seconds
-
-# This parachains should produce blocks at 12s clip, let's assume an 14s rate, allowing for
-# some slots to be missed on slower machines
-alice: parachain 2000 block height is at least 21 within 300 seconds
-alice: parachain 2000 block height is lower than 25 within 2 seconds
-
-# This should already have produced the needed blocks
-alice: parachain 2001 block height is at least 21 within 10 seconds
-alice: parachain 2001 block height is lower than 25 within 2 seconds