diff --git a/.cargo/config.toml b/.cargo/config.toml index f113e9114ace..1b8ffe1a1c82 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -8,3 +8,4 @@ rustdocflags = [ # Needed for musl builds so user doesn't have to install musl-tools. CC_x86_64_unknown_linux_musl = { value = ".cargo/musl-gcc", force = true, relative = true } CXX_x86_64_unknown_linux_musl = { value = ".cargo/musl-g++", force = true, relative = true } +CARGO_WORKSPACE_ROOT_DIR = { value = "", relative = true } diff --git a/.github/scripts/deny-git-deps.py b/.github/scripts/deny-git-deps.py index 622fc64c4881..bd4fcf1f9237 100644 --- a/.github/scripts/deny-git-deps.py +++ b/.github/scripts/deny-git-deps.py @@ -15,6 +15,7 @@ 'simple-mermaid': ['xcm-docs'], # Fix in 'bandersnatch_vrfs': ['sp-core'], + 'subwasmlib': ['polkadot-zombienet-sdk-tests'], } root = sys.argv[1] if len(sys.argv) > 1 else os.getcwd() @@ -24,7 +25,7 @@ def check_dep(dep, used_by): if dep.location != DependencyLocation.GIT: return - + if used_by in KNOWN_BAD_GIT_DEPS.get(dep.name, []): print(f'🤨 Ignoring git dependency {dep.name} in {used_by}') else: diff --git a/.gitlab/pipeline/build.yml b/.gitlab/pipeline/build.yml index 74b6ccb49981..931aef802330 100644 --- a/.gitlab/pipeline/build.yml +++ b/.gitlab/pipeline/build.yml @@ -173,6 +173,25 @@ build-short-benchmark: - target/release/polkadot --version - cp ./target/release/polkadot ./artifacts/ +build-polkadot-zombienet-tests: + stage: build + extends: + - .docker-env + - .common-refs + - .run-immediately + - .collect-artifacts + needs: + - job: build-linux-stable + artifacts: true + - job: build-linux-stable-cumulus + artifacts: true + + script: + - cargo nextest --manifest-path polkadot/zombienet-sdk-tests/Cargo.toml archive --features zombie-metadata --archive-file polkadot-zombienet-tests.tar.zst + - mkdir -p artifacts + - cp polkadot-zombienet-tests.tar.zst ./artifacts + + # build jobs from cumulus build-linux-stable-cumulus: diff --git a/.gitlab/pipeline/zombienet.yml b/.gitlab/pipeline/zombienet.yml index 23521b299b1d..c17366dbe4c2 100644 --- a/.gitlab/pipeline/zombienet.yml +++ b/.gitlab/pipeline/zombienet.yml @@ -4,6 +4,10 @@ ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.105" PUSHGATEWAY_URL: "http://zombienet-prometheus-pushgateway.managed-monitoring:9091/metrics/job/zombie-metrics" DEBUG: "zombie,zombie::network-node,zombie::kube::client::logs" + ZOMBIE_PROVIDER: "k8s" + RUST_LOG: "info,zombienet_orchestrator=debug" + RUN_IN_CI: "1" + timeout: 60m include: # substrate tests diff --git a/.gitlab/pipeline/zombienet/polkadot.yml b/.gitlab/pipeline/zombienet/polkadot.yml index b4ef4bb7446c..93fc4bbb578a 100644 --- a/.gitlab/pipeline/zombienet/polkadot.yml +++ b/.gitlab/pipeline/zombienet/polkadot.yml @@ -31,6 +31,12 @@ - echo "colander image ${COL_IMAGE}" - echo "cumulus image ${CUMULUS_IMAGE}" - echo "malus image ${MALUS_IMAGE}" + # RUN_IN_CONTAINER is env var that is set in the dockerfile + - if [[ -v RUN_IN_CONTAINER ]]; then + echo "Initializing zombie cluster"; + gcloud auth activate-service-account --key-file "/etc/zombie-net/sa-zombie.json"; + gcloud container clusters get-credentials parity-zombienet --zone europe-west3-b --project parity-zombienet; + fi stage: zombienet image: "${ZOMBIENET_IMAGE}" needs: @@ -54,6 +60,7 @@ MALUS_IMAGE: "docker.io/paritypr/malus" GH_DIR: "https://github.com/paritytech/substrate/tree/${CI_COMMIT_SHA}/zombienet" LOCAL_DIR: "/builds/parity/mirrors/polkadot-sdk/polkadot/zombienet_tests" + LOCAL_SDK_TEST: "/builds/parity/mirrors/polkadot-sdk/polkadot/zombienet-sdk-tests" FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1 RUN_IN_CONTAINER: "1" artifacts: @@ -335,3 +342,18 @@ zombienet-polkadot-malus-0001-dispute-valid: - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh --local-dir="${LOCAL_DIR}/integrationtests" --test="0001-dispute-valid-block.zndsl" + +zombienet-polkadot-coretime-revenue: + 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}" + 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 -- smoke::coretime_revenue::coretime_revenue_test diff --git a/Cargo.lock b/Cargo.lock index 7d894af7b7fc..3985f9f994b3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -77,6 +77,15 @@ dependencies = [ "subtle 2.5.0", ] +[[package]] +name = "affix" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50e7ea84d3fa2009f355f8429a0b418a96849135a4188fadf384f59127d5d4bc" +dependencies = [ + "convert_case 0.5.0", +] + [[package]] name = "ahash" version = "0.7.8" @@ -656,7 +665,7 @@ dependencies = [ "ark-std 0.4.0", "digest 0.10.7", "rand_core 0.6.4", - "sha3", + "sha3 0.10.8", ] [[package]] @@ -680,6 +689,12 @@ dependencies = [ "nodrop", ] +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + [[package]] name = "arrayvec" version = "0.7.4" @@ -890,7 +905,7 @@ dependencies = [ "scale-info", "serde_json", "snowbridge-router-primitives", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-consensus-aura", "sp-core 28.0.0", @@ -901,7 +916,7 @@ dependencies = [ "sp-session", "sp-storage 19.0.0", "sp-transaction-pool", - "sp-version", + "sp-version 29.0.0", "sp-weights 27.0.0", "staging-parachain-info", "staging-xcm", @@ -1021,7 +1036,7 @@ dependencies = [ "primitive-types", "scale-info", "snowbridge-router-primitives", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-consensus-aura", "sp-core 28.0.0", @@ -1033,7 +1048,7 @@ dependencies = [ "sp-std 14.0.0", "sp-storage 19.0.0", "sp-transaction-pool", - "sp-version", + "sp-version 29.0.0", "staging-parachain-info", "staging-xcm", "staging-xcm-builder", @@ -1087,7 +1102,7 @@ dependencies = [ "parachains-common", "parity-scale-codec", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-runtime 31.0.1", "staging-xcm", "staging-xcm-builder", @@ -1703,6 +1718,17 @@ dependencies = [ "constant_time_eq 0.1.5", ] +[[package]] +name = "blake2b_simd" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" +dependencies = [ + "arrayref", + "arrayvec 0.5.2", + "constant_time_eq 0.1.5", +] + [[package]] name = "blake2b_simd" version = "1.0.2" @@ -1714,6 +1740,17 @@ dependencies = [ "constant_time_eq 0.3.0", ] +[[package]] +name = "blake2s_simd" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2" +dependencies = [ + "arrayref", + "arrayvec 0.5.2", + "constant_time_eq 0.1.5", +] + [[package]] name = "blake2s_simd" version = "1.0.1" @@ -1744,6 +1781,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ + "block-padding", "generic-array 0.14.7", ] @@ -1756,6 +1794,12 @@ dependencies = [ "generic-array 0.14.7", ] +[[package]] +name = "block-padding" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" + [[package]] name = "blocking" version = "1.3.1" @@ -1840,7 +1884,7 @@ dependencies = [ "frame-support", "frame-system", "polkadot-primitives", - "sp-api", + "sp-api 26.0.0", "sp-std 14.0.0", ] @@ -1852,7 +1896,7 @@ dependencies = [ "bp-messages", "bp-runtime", "frame-support", - "sp-api", + "sp-api 26.0.0", "sp-runtime 31.0.1", "sp-std 14.0.0", ] @@ -1865,7 +1909,7 @@ dependencies = [ "bp-messages", "bp-runtime", "frame-support", - "sp-api", + "sp-api 26.0.0", "sp-runtime 31.0.1", "sp-std 14.0.0", ] @@ -1880,7 +1924,7 @@ dependencies = [ "bp-xcm-bridge-hub", "frame-support", "parity-scale-codec", - "sp-api", + "sp-api 26.0.0", "sp-runtime 31.0.1", "sp-std 14.0.0", ] @@ -1895,7 +1939,7 @@ dependencies = [ "bp-xcm-bridge-hub", "frame-support", "parity-scale-codec", - "sp-api", + "sp-api 26.0.0", "sp-runtime 31.0.1", "sp-std 14.0.0", ] @@ -1927,7 +1971,7 @@ dependencies = [ "bp-polkadot-core", "bp-runtime", "frame-support", - "sp-api", + "sp-api 26.0.0", "sp-std 14.0.0", ] @@ -1972,7 +2016,7 @@ dependencies = [ "bp-polkadot-core", "bp-runtime", "frame-support", - "sp-api", + "sp-api 26.0.0", "sp-std 14.0.0", ] @@ -1988,7 +2032,7 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-runtime 31.0.1", "sp-std 14.0.0", ] @@ -2038,7 +2082,7 @@ dependencies = [ "bp-polkadot-core", "bp-runtime", "frame-support", - "sp-api", + "sp-api 26.0.0", "sp-std 14.0.0", ] @@ -2092,7 +2136,7 @@ dependencies = [ "bp-polkadot-core", "bp-runtime", "frame-support", - "sp-api", + "sp-api 26.0.0", "sp-std 14.0.0", ] @@ -2260,7 +2304,7 @@ dependencies = [ "snowbridge-runtime-common", "snowbridge-runtime-test-common", "snowbridge-system-runtime-api", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-consensus-aura", "sp-core 28.0.0", @@ -2274,7 +2318,7 @@ dependencies = [ "sp-std 14.0.0", "sp-storage 19.0.0", "sp-transaction-pool", - "sp-version", + "sp-version 29.0.0", "staging-parachain-info", "staging-xcm", "staging-xcm-builder", @@ -2446,7 +2490,7 @@ dependencies = [ "snowbridge-runtime-common", "snowbridge-runtime-test-common", "snowbridge-system-runtime-api", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-consensus-aura", "sp-core 28.0.0", @@ -2460,7 +2504,7 @@ dependencies = [ "sp-std 14.0.0", "sp-storage 19.0.0", "sp-transaction-pool", - "sp-version", + "sp-version 29.0.0", "staging-parachain-info", "staging-xcm", "staging-xcm-builder", @@ -2591,6 +2635,25 @@ dependencies = [ "ppv-lite86", ] +[[package]] +name = "calm_io" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ea0608700fe42d90ec17ad0f86335cf229b67df2e34e7f463e8241ce7b8fa5f" +dependencies = [ + "calmio_filters", +] + +[[package]] +name = "calmio_filters" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "846501f4575cd66766a40bb7ab6d8e960adc7eb49f753c8232bd8e0e09cf6ca2" +dependencies = [ + "quote 1.0.37", + "syn 1.0.109", +] + [[package]] name = "camino" version = "1.1.6" @@ -2788,6 +2851,17 @@ dependencies = [ "half", ] +[[package]] +name = "cid" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8709d481fb78b9808f34a1b4b4fadd08a15a0971052c18bc2b751faefaed595e" +dependencies = [ + "multibase 0.8.0", + "multihash 0.11.4", + "unsigned-varint 0.3.3", +] + [[package]] name = "cid" version = "0.9.0" @@ -2795,7 +2869,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9b68e3193982cd54187d71afdb2a271ad4cf8af157858e9cb911b91321de143" dependencies = [ "core2", - "multibase", + "multibase 0.9.1", "multihash 0.17.0", "serde", "unsigned-varint 0.7.2", @@ -2808,7 +2882,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd94671561e36e4e7de75f753f577edafb0e7c05d6e4547229fdf7938fbcd2c3" dependencies = [ "core2", - "multibase", + "multibase 0.9.1", "multihash 0.18.1", "serde", "unsigned-varint 0.7.2", @@ -3082,7 +3156,7 @@ dependencies = [ "polkadot-parachain-primitives", "polkadot-runtime-common", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-arithmetic 23.0.0", "sp-block-builder", "sp-consensus-aura", @@ -3095,7 +3169,7 @@ dependencies = [ "sp-session", "sp-storage 19.0.0", "sp-transaction-pool", - "sp-version", + "sp-version 29.0.0", "staging-parachain-info", "staging-xcm", "staging-xcm-builder", @@ -3200,6 +3274,42 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101" +[[package]] +name = "comparable" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb513ee8037bf08c5270ecefa48da249f4c58e57a71ccfce0a5b0877d2a20eb2" +dependencies = [ + "comparable_derive", + "comparable_helper", + "pretty_assertions", + "serde", +] + +[[package]] +name = "comparable_derive" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a54b9c40054eb8999c5d1d36fdc90e4e5f7ff0d1d9621706f360b3cbc8beb828" +dependencies = [ + "convert_case 0.4.0", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 1.0.109", +] + +[[package]] +name = "comparable_helper" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5437e327e861081c91270becff184859f706e3e50f5301a9d4dc8eb50752c3" +dependencies = [ + "convert_case 0.6.0", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 1.0.109", +] + [[package]] name = "concurrent-queue" version = "2.2.0" @@ -3340,7 +3450,7 @@ dependencies = [ "polkadot-runtime-common", "rococo-runtime-constants", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-consensus-aura", "sp-core 28.0.0", @@ -3351,7 +3461,7 @@ dependencies = [ "sp-session", "sp-storage 19.0.0", "sp-transaction-pool", - "sp-version", + "sp-version 29.0.0", "staging-parachain-info", "staging-xcm", "staging-xcm-builder", @@ -3367,6 +3477,21 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +[[package]] +name = "convert_case" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb4a24b1aaf0fd0ce8b45161144d6f42cd91677fd5940fd431183eb023b3a2b8" + +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "core-foundation" version = "0.9.4" @@ -3471,7 +3596,7 @@ dependencies = [ "rococo-runtime-constants", "scale-info", "serde", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-consensus-aura", "sp-core 28.0.0", @@ -3482,7 +3607,7 @@ dependencies = [ "sp-session", "sp-storage 19.0.0", "sp-transaction-pool", - "sp-version", + "sp-version 29.0.0", "staging-parachain-info", "staging-xcm", "staging-xcm-builder", @@ -3569,7 +3694,7 @@ dependencies = [ "polkadot-runtime-common", "scale-info", "serde", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-consensus-aura", "sp-core 28.0.0", @@ -3580,7 +3705,7 @@ dependencies = [ "sp-session", "sp-storage 19.0.0", "sp-transaction-pool", - "sp-version", + "sp-version 29.0.0", "staging-parachain-info", "staging-xcm", "staging-xcm-builder", @@ -3910,10 +4035,10 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "sc-client-api", - "sp-api", + "sp-api 26.0.0", "sp-consensus", "sp-core 28.0.0", - "sp-maybe-compressed-blob", + "sp-maybe-compressed-blob 11.0.0", "sp-runtime 31.0.1", "sp-state-machine 0.35.0", "sp-tracing 16.0.0", @@ -3947,7 +4072,7 @@ dependencies = [ "sc-telemetry", "sc-utils", "schnellru", - "sp-api", + "sp-api 26.0.0", "sp-application-crypto 30.0.0", "sp-block-builder", "sp-blockchain", @@ -3992,7 +4117,7 @@ dependencies = [ "sp-timestamp", "sp-tracing 16.0.0", "sp-trie 29.0.0", - "sp-version", + "sp-version 29.0.0", "substrate-prometheus-endpoint", "tracing", ] @@ -4022,7 +4147,7 @@ dependencies = [ "futures", "parking_lot 0.12.3", "sc-consensus", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-blockchain", "sp-consensus", @@ -4055,7 +4180,7 @@ dependencies = [ "rstest", "sc-cli", "sc-client-api", - "sp-api", + "sp-api 26.0.0", "sp-blockchain", "sp-consensus", "sp-core 28.0.0", @@ -4063,7 +4188,7 @@ dependencies = [ "sp-keystore 0.34.0", "sp-runtime 31.0.1", "sp-state-machine 0.35.0", - "sp-version", + "sp-version 29.0.0", "substrate-test-utils", "tokio", "tracing", @@ -4081,7 +4206,7 @@ dependencies = [ "cumulus-test-relay-sproof-builder", "parity-scale-codec", "sc-client-api", - "sp-api", + "sp-api 26.0.0", "sp-crypto-hashing 0.1.0", "sp-inherents", "sp-runtime 31.0.1", @@ -4115,13 +4240,13 @@ dependencies = [ "sc-client-api", "sc-consensus", "sc-utils", - "sp-api", + "sp-api 26.0.0", "sp-blockchain", "sp-consensus", - "sp-maybe-compressed-blob", + "sp-maybe-compressed-blob 11.0.0", "sp-runtime 31.0.1", "sp-tracing 16.0.0", - "sp-version", + "sp-version 29.0.0", "substrate-test-utils", "tokio", "tracing", @@ -4154,7 +4279,7 @@ dependencies = [ "sc-telemetry", "sc-transaction-pool", "sc-utils", - "sp-api", + "sp-api 26.0.0", "sp-blockchain", "sp-consensus", "sp-core 28.0.0", @@ -4239,7 +4364,7 @@ dependencies = [ "sp-std 14.0.0", "sp-tracing 16.0.0", "sp-trie 29.0.0", - "sp-version", + "sp-version 29.0.0", "staging-xcm", "staging-xcm-builder", "trie-db 0.29.1", @@ -4346,10 +4471,10 @@ dependencies = [ "polkadot-node-primitives", "polkadot-parachain-primitives", "polkadot-primitives", - "sc-executor", + "sc-executor 0.32.0", "sp-core 28.0.0", "sp-io 30.0.0", - "sp-maybe-compressed-blob", + "sp-maybe-compressed-blob 11.0.0", "tracing", "tracing-subscriber 0.3.18", ] @@ -4358,7 +4483,7 @@ dependencies = [ name = "cumulus-primitives-aura" version = "0.7.0" dependencies = [ - "sp-api", + "sp-api 26.0.0", "sp-consensus-aura", ] @@ -4371,7 +4496,7 @@ dependencies = [ "polkadot-parachain-primitives", "polkadot-primitives", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-runtime 31.0.1", "sp-trie 29.0.0", "staging-xcm", @@ -4465,7 +4590,7 @@ dependencies = [ "sc-sysinfo", "sc-telemetry", "sc-tracing", - "sp-api", + "sp-api 26.0.0", "sp-consensus", "sp-core 28.0.0", "sp-keyring", @@ -4484,10 +4609,10 @@ dependencies = [ "parity-scale-codec", "polkadot-overseer", "sc-client-api", - "sp-api", + "sp-api 26.0.0", "sp-blockchain", "sp-state-machine 0.35.0", - "sp-version", + "sp-version 29.0.0", "thiserror", ] @@ -4515,7 +4640,7 @@ dependencies = [ "sc-service", "sc-tracing", "sc-utils", - "sp-api", + "sp-api 26.0.0", "sp-blockchain", "sp-consensus", "sp-consensus-babe", @@ -4549,14 +4674,14 @@ dependencies = [ "serde_json", "smoldot 0.11.0", "smoldot-light 0.9.0", - "sp-api", + "sp-api 26.0.0", "sp-authority-discovery", "sp-consensus-babe", "sp-core 28.0.0", "sp-runtime 31.0.1", "sp-state-machine 0.35.0", "sp-storage 19.0.0", - "sp-version", + "sp-version 29.0.0", "thiserror", "tokio", "tokio-util", @@ -4584,10 +4709,10 @@ dependencies = [ "sc-block-builder", "sc-consensus", "sc-consensus-aura", - "sc-executor", - "sc-executor-common", + "sc-executor 0.32.0", + "sc-executor-common 0.29.0", "sc-service", - "sp-api", + "sp-api 26.0.0", "sp-application-crypto 30.0.0", "sp-blockchain", "sp-consensus-aura", @@ -4638,7 +4763,7 @@ dependencies = [ "pallet-transaction-payment", "parity-scale-codec", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-consensus-aura", "sp-core 28.0.0", @@ -4649,7 +4774,7 @@ dependencies = [ "sp-runtime 31.0.1", "sp-session", "sp-transaction-pool", - "sp-version", + "sp-version 29.0.0", "staging-parachain-info", "substrate-wasm-builder", ] @@ -4702,9 +4827,9 @@ dependencies = [ "sc-client-api", "sc-consensus", "sc-consensus-aura", - "sc-executor", - "sc-executor-common", - "sc-executor-wasmtime", + "sc-executor 0.32.0", + "sc-executor-common 0.29.0", + "sc-executor-wasmtime 0.29.0", "sc-network", "sc-service", "sc-telemetry", @@ -4713,7 +4838,7 @@ dependencies = [ "sc-transaction-pool-api", "serde", "serde_json", - "sp-api", + "sp-api 26.0.0", "sp-arithmetic 23.0.0", "sp-authority-discovery", "sp-blockchain", @@ -5077,7 +5202,7 @@ version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ - "convert_case", + "convert_case 0.4.0", "proc-macro2 1.0.86", "quote 1.0.37", "rustc_version 0.4.0", @@ -5243,6 +5368,15 @@ dependencies = [ "walkdir", ] +[[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + [[package]] name = "downcast" version = "0.11.0" @@ -6036,7 +6170,7 @@ dependencies = [ "rusty-fork", "scale-info", "serde", - "sp-api", + "sp-api 26.0.0", "sp-application-crypto 30.0.0", "sp-core 28.0.0", "sp-io 30.0.0", @@ -6073,12 +6207,12 @@ dependencies = [ "sc-cli", "sc-client-api", "sc-client-db", - "sc-executor", + "sc-executor 0.32.0", "sc-service", "sc-sysinfo", "serde", "serde_json", - "sp-api", + "sp-api 26.0.0", "sp-blockchain", "sp-core 28.0.0", "sp-database", @@ -6178,7 +6312,7 @@ dependencies = [ "sp-io 30.0.0", "sp-runtime 31.0.1", "sp-tracing 16.0.0", - "sp-version", + "sp-version 29.0.0", ] [[package]] @@ -6217,7 +6351,7 @@ dependencies = [ "merkleized-metadata", "parity-scale-codec", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-runtime 31.0.1", "sp-tracing 16.0.0", "sp-transaction-pool", @@ -6286,16 +6420,16 @@ dependencies = [ "serde", "serde_json", "smallvec", - "sp-api", + "sp-api 26.0.0", "sp-arithmetic 23.0.0", "sp-core 28.0.0", "sp-crypto-hashing 0.1.0", - "sp-crypto-hashing-proc-macro", + "sp-crypto-hashing-proc-macro 0.1.0", "sp-debug-derive 14.0.0", "sp-genesis-builder", "sp-inherents", "sp-io 30.0.0", - "sp-metadata-ir", + "sp-metadata-ir 0.6.0", "sp-runtime 31.0.1", "sp-staking", "sp-state-machine 0.35.0", @@ -6332,7 +6466,7 @@ dependencies = [ "sp-core 28.0.0", "sp-crypto-hashing 0.1.0", "sp-io 30.0.0", - "sp-metadata-ir", + "sp-metadata-ir 0.6.0", "sp-runtime 31.0.1", "static_assertions", "syn 2.0.65", @@ -6373,14 +6507,14 @@ dependencies = [ "rustversion", "scale-info", "serde", - "sp-api", + "sp-api 26.0.0", "sp-arithmetic 23.0.0", "sp-core 28.0.0", "sp-io 30.0.0", - "sp-metadata-ir", + "sp-metadata-ir 0.6.0", "sp-runtime 31.0.1", "sp-state-machine 0.35.0", - "sp-version", + "sp-version 29.0.0", "static_assertions", "trybuild", ] @@ -6395,7 +6529,7 @@ dependencies = [ "scale-info", "sp-core 28.0.0", "sp-runtime 31.0.1", - "sp-version", + "sp-version 29.0.0", ] [[package]] @@ -6436,7 +6570,7 @@ dependencies = [ "sp-io 30.0.0", "sp-runtime 31.0.1", "sp-std 14.0.0", - "sp-version", + "sp-version 29.0.0", "sp-weights 27.0.0", "substrate-test-runtime-client", ] @@ -6454,7 +6588,7 @@ dependencies = [ "sp-externalities 0.25.0", "sp-io 30.0.0", "sp-runtime 31.0.1", - "sp-version", + "sp-version 29.0.0", ] [[package]] @@ -6463,7 +6597,7 @@ version = "26.0.0" dependencies = [ "docify", "parity-scale-codec", - "sp-api", + "sp-api 26.0.0", ] [[package]] @@ -6472,7 +6606,7 @@ version = "0.34.0" dependencies = [ "frame-support", "parity-scale-codec", - "sp-api", + "sp-api 26.0.0", "sp-runtime 31.0.1", ] @@ -6813,7 +6947,7 @@ dependencies = [ "parachains-common", "parity-scale-codec", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-consensus-aura", "sp-core 28.0.0", @@ -6824,7 +6958,7 @@ dependencies = [ "sp-session", "sp-storage 19.0.0", "sp-transaction-pool", - "sp-version", + "sp-version 29.0.0", "staging-parachain-info", "staging-xcm", "staging-xcm-builder", @@ -7300,6 +7434,7 @@ dependencies = [ "tokio", "tokio-rustls 0.26.0", "tower-service", + "webpki-roots 0.26.3", ] [[package]] @@ -7628,7 +7763,30 @@ dependencies = [ "socket2 0.5.7", "widestring", "windows-sys 0.48.0", - "winreg", + "winreg 0.50.0", +] + +[[package]] +name = "ipfs-hasher" +version = "0.21.3" +source = "git+https://github.com/chevdor/subwasm?rev=v0.21.3#aa8acb6fdfb34144ac51ab95618a9b37fa251295" +dependencies = [ + "ipfs-unixfs", + "thiserror", +] + +[[package]] +name = "ipfs-unixfs" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67d1cf65363f3d01682283456651d1cea436019de5be7a974bb61716c940d44f" +dependencies = [ + "cid 0.5.1", + "either", + "filetime", + "multihash 0.11.4", + "quick-protobuf 0.7.0", + "sha2 0.9.9", ] [[package]] @@ -8526,7 +8684,7 @@ dependencies = [ "once_cell", "parking_lot 0.12.3", "pin-project", - "quick-protobuf", + "quick-protobuf 0.8.1", "rand", "rw-stream-sink", "smallvec", @@ -8567,7 +8725,7 @@ dependencies = [ "libp2p-swarm", "log", "lru 0.12.3", - "quick-protobuf", + "quick-protobuf 0.8.1", "quick-protobuf-codec", "smallvec", "thiserror", @@ -8584,7 +8742,7 @@ dependencies = [ "ed25519-dalek", "hkdf", "multihash 0.19.1", - "quick-protobuf", + "quick-protobuf 0.8.1", "rand", "sha2 0.10.8", "thiserror", @@ -8610,7 +8768,7 @@ dependencies = [ "libp2p-identity", "libp2p-swarm", "log", - "quick-protobuf", + "quick-protobuf 0.8.1", "quick-protobuf-codec", "rand", "sha2 0.10.8", @@ -8674,7 +8832,7 @@ dependencies = [ "multiaddr 0.18.1", "multihash 0.19.1", "once_cell", - "quick-protobuf", + "quick-protobuf 0.8.1", "rand", "sha2 0.10.8", "snow", @@ -8717,7 +8875,7 @@ dependencies = [ "libp2p-tls", "log", "parking_lot 0.12.3", - "quinn", + "quinn 0.10.2", "rand", "ring 0.16.20", "rustls 0.21.7", @@ -9088,6 +9246,12 @@ dependencies = [ "zeroize", ] +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + [[package]] name = "lock_api" version = "0.4.10" @@ -9492,7 +9656,7 @@ dependencies = [ "sc-block-builder", "sc-client-api", "sc-offchain", - "sp-api", + "sp-api 26.0.0", "sp-blockchain", "sp-consensus", "sp-consensus-beefy", @@ -9512,7 +9676,7 @@ dependencies = [ "parity-scale-codec", "serde", "serde_json", - "sp-api", + "sp-api 26.0.0", "sp-blockchain", "sp-core 28.0.0", "sp-mmr-primitives", @@ -9588,7 +9752,7 @@ dependencies = [ "byteorder", "data-encoding", "log", - "multibase", + "multibase 0.9.1", "multihash 0.17.0", "percent-encoding", "serde", @@ -9607,7 +9771,7 @@ dependencies = [ "byteorder", "data-encoding", "libp2p-identity", - "multibase", + "multibase 0.9.1", "multihash 0.19.1", "percent-encoding", "serde", @@ -9616,6 +9780,17 @@ dependencies = [ "url", ] +[[package]] +name = "multibase" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b78c60039650ff12e140ae867ef5299a58e19dded4d334c849dc7177083667e2" +dependencies = [ + "base-x", + "data-encoding", + "data-encoding-macro", +] + [[package]] name = "multibase" version = "0.9.1" @@ -9627,20 +9802,35 @@ dependencies = [ "data-encoding-macro", ] +[[package]] +name = "multihash" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567122ab6492f49b59def14ecc36e13e64dca4188196dd0cd41f9f3f979f3df6" +dependencies = [ + "blake2b_simd 0.5.11", + "blake2s_simd 0.5.11", + "digest 0.9.0", + "sha-1", + "sha2 0.9.9", + "sha3 0.9.1", + "unsigned-varint 0.5.1", +] + [[package]] name = "multihash" version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" dependencies = [ - "blake2b_simd", - "blake2s_simd", + "blake2b_simd 1.0.2", + "blake2s_simd 1.0.1", "blake3", "core2", "digest 0.10.7", "multihash-derive", "sha2 0.10.8", - "sha3", + "sha3 0.10.8", "unsigned-varint 0.7.2", ] @@ -9650,14 +9840,14 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815" dependencies = [ - "blake2b_simd", - "blake2s_simd", + "blake2b_simd 1.0.2", + "blake2s_simd 1.0.1", "blake3", "core2", "digest 0.10.7", "multihash-derive", "sha2 0.10.8", - "sha3", + "sha3 0.10.8", "unsigned-varint 0.7.2", ] @@ -9965,7 +10155,7 @@ dependencies = [ "sc-rpc", "sc-sync-state-rpc", "sc-transaction-pool-api", - "sp-api", + "sp-api 26.0.0", "sp-application-crypto 30.0.0", "sp-block-builder", "sp-blockchain", @@ -10023,9 +10213,9 @@ dependencies = [ "sc-client-api", "sc-client-db", "sc-consensus", - "sc-executor", + "sc-executor 0.32.0", "sc-service", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-blockchain", "sp-consensus", @@ -10453,7 +10643,7 @@ dependencies = [ "parity-scale-codec", "primitive-types", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-arithmetic 23.0.0", "sp-core 28.0.0", "sp-io 30.0.0", @@ -10765,7 +10955,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api", + "sp-api 26.0.0", "sp-consensus-beefy", "sp-core 28.0.0", "sp-io 30.0.0", @@ -10922,7 +11112,7 @@ dependencies = [ "parity-scale-codec", "pretty_assertions", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-arithmetic 23.0.0", "sp-core 28.0.0", "sp-io 30.0.0", @@ -11034,7 +11224,7 @@ dependencies = [ "scale-info", "serde", "smallvec", - "sp-api", + "sp-api 26.0.0", "sp-core 28.0.0", "sp-io 30.0.0", "sp-keystore 0.34.0", @@ -11086,7 +11276,7 @@ dependencies = [ "polkadot-runtime-parachains", "pretty_assertions", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-core 28.0.0", "sp-io 30.0.0", "sp-keystore 0.34.0", @@ -11392,7 +11582,7 @@ dependencies = [ "sp-core 28.0.0", "sp-io 30.0.0", "sp-runtime 31.0.1", - "sp-version", + "sp-version 29.0.0", ] [[package]] @@ -11645,13 +11835,13 @@ dependencies = [ "parity-scale-codec", "pretty_assertions", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-core 28.0.0", "sp-io 30.0.0", "sp-runtime 31.0.1", "sp-tracing 16.0.0", - "sp-version", + "sp-version 29.0.0", ] [[package]] @@ -11758,7 +11948,7 @@ version = "14.0.0" dependencies = [ "pallet-nfts", "parity-scale-codec", - "sp-api", + "sp-api 26.0.0", ] [[package]] @@ -11853,7 +12043,7 @@ version = "23.0.0" dependencies = [ "pallet-nomination-pools", "parity-scale-codec", - "sp-api", + "sp-api 26.0.0", ] [[package]] @@ -11960,7 +12150,7 @@ dependencies = [ "scale-info", "sp-core 28.0.0", "sp-io 30.0.0", - "sp-metadata-ir", + "sp-metadata-ir 0.6.0", "sp-runtime 31.0.1", ] @@ -12137,7 +12327,7 @@ dependencies = [ "rlp", "scale-info", "serde", - "sp-api", + "sp-api 26.0.0", "sp-core 28.0.0", "sp-io 30.0.0", "sp-keystore 0.34.0", @@ -12189,7 +12379,7 @@ dependencies = [ "polkadot-runtime-parachains", "pretty_assertions", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-core 28.0.0", "sp-io 30.0.0", "sp-keystore 0.34.0", @@ -12468,7 +12658,7 @@ name = "pallet-staking-runtime-api" version = "14.0.0" dependencies = [ "parity-scale-codec", - "sp-api", + "sp-api 26.0.0", "sp-staking", ] @@ -12506,7 +12696,7 @@ dependencies = [ "pallet-balances", "parity-scale-codec", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-core 28.0.0", "sp-io 30.0.0", "sp-runtime 31.0.1", @@ -12603,7 +12793,7 @@ dependencies = [ "jsonrpsee 0.24.3", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", - "sp-api", + "sp-api 26.0.0", "sp-blockchain", "sp-core 28.0.0", "sp-rpc", @@ -12617,7 +12807,7 @@ version = "28.0.0" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", - "sp-api", + "sp-api 26.0.0", "sp-runtime 31.0.1", "sp-weights 27.0.0", ] @@ -12741,7 +12931,7 @@ dependencies = [ "pallet-preimage", "parity-scale-codec", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-core 28.0.0", "sp-io 30.0.0", "sp-runtime 31.0.1", @@ -12871,7 +13061,7 @@ dependencies = [ "sc-cli", "sc-client-api", "sc-consensus", - "sc-executor", + "sc-executor 0.32.0", "sc-network", "sc-network-sync", "sc-offchain", @@ -12884,7 +13074,7 @@ dependencies = [ "sc-transaction-pool-api", "serde", "serde_json", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-blockchain", "sp-consensus-aura", @@ -12942,7 +13132,7 @@ dependencies = [ "scale-info", "serde_json", "smallvec", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-consensus-aura", "sp-core 28.0.0", @@ -12952,7 +13142,7 @@ dependencies = [ "sp-runtime 31.0.1", "sp-session", "sp-transaction-pool", - "sp-version", + "sp-version 29.0.0", "staging-parachain-info", "staging-xcm", "staging-xcm-builder", @@ -13303,7 +13493,7 @@ dependencies = [ "primitive-types", "scale-info", "smallvec", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-consensus-aura", "sp-core 28.0.0", @@ -13314,7 +13504,7 @@ dependencies = [ "sp-session", "sp-storage 19.0.0", "sp-transaction-pool", - "sp-version", + "sp-version 29.0.0", "staging-parachain-info", "staging-xcm", "staging-xcm-builder", @@ -13401,7 +13591,7 @@ dependencies = [ "rococo-runtime-constants", "scale-info", "serde", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-consensus-aura", "sp-core 28.0.0", @@ -13412,7 +13602,7 @@ dependencies = [ "sp-session", "sp-storage 19.0.0", "sp-transaction-pool", - "sp-version", + "sp-version 29.0.0", "staging-parachain-info", "staging-xcm", "staging-xcm-builder", @@ -13500,7 +13690,7 @@ dependencies = [ "polkadot-runtime-common", "scale-info", "serde", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-consensus-aura", "sp-core 28.0.0", @@ -13511,7 +13701,7 @@ dependencies = [ "sp-session", "sp-storage 19.0.0", "sp-transaction-pool", - "sp-version", + "sp-version 29.0.0", "staging-parachain-info", "staging-xcm", "staging-xcm-builder", @@ -13831,7 +14021,7 @@ dependencies = [ "pyroscope", "pyroscope_pprofrs", "sc-cli", - "sc-executor", + "sc-executor 0.32.0", "sc-service", "sc-storage-monitor", "sc-sysinfo", @@ -13839,7 +14029,7 @@ dependencies = [ "sp-core 28.0.0", "sp-io 30.0.0", "sp-keyring", - "sp-maybe-compressed-blob", + "sp-maybe-compressed-blob 11.0.0", "sp-runtime 31.0.1", "substrate-build-script-utils", "thiserror", @@ -14011,7 +14201,7 @@ dependencies = [ "rstest", "sp-core 28.0.0", "sp-keyring", - "sp-maybe-compressed-blob", + "sp-maybe-compressed-blob 11.0.0", "thiserror", "tracing-gum", ] @@ -14158,7 +14348,7 @@ dependencies = [ "sp-core 28.0.0", "sp-keyring", "sp-keystore 0.34.0", - "sp-maybe-compressed-blob", + "sp-maybe-compressed-blob 11.0.0", "tracing-gum", ] @@ -14323,7 +14513,7 @@ dependencies = [ "sc-sysinfo", "slotmap", "sp-core 28.0.0", - "sp-maybe-compressed-blob", + "sp-maybe-compressed-blob 11.0.0", "tempfile", "test-parachain-adder", "test-parachain-halt", @@ -14368,9 +14558,9 @@ dependencies = [ "parity-scale-codec", "polkadot-parachain-primitives", "polkadot-primitives", - "sc-executor", - "sc-executor-common", - "sc-executor-wasmtime", + "sc-executor 0.32.0", + "sc-executor-common 0.29.0", + "sc-executor-wasmtime 0.29.0", "seccompiler", "sp-core 28.0.0", "sp-crypto-hashing 0.1.0", @@ -14395,7 +14585,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-parachain-primitives", "polkadot-primitives", - "sp-maybe-compressed-blob", + "sp-maybe-compressed-blob 11.0.0", "tracing-gum", ] @@ -14414,9 +14604,9 @@ dependencies = [ "polkadot-primitives", "rayon", "rococo-runtime", - "sc-executor-common", - "sc-executor-wasmtime", - "sp-maybe-compressed-blob", + "sc-executor-common 0.29.0", + "sc-executor-wasmtime 0.29.0", + "sp-maybe-compressed-blob 11.0.0", "staging-tracking-allocator", "tikv-jemalloc-ctl", "tikv-jemallocator", @@ -14437,7 +14627,7 @@ dependencies = [ "polkadot-primitives", "polkadot-primitives-test-helpers", "schnellru", - "sp-api", + "sp-api 26.0.0", "sp-consensus-babe", "sp-core 28.0.0", "sp-keyring", @@ -14536,7 +14726,7 @@ dependencies = [ "sp-consensus-slots", "sp-core 28.0.0", "sp-keystore 0.34.0", - "sp-maybe-compressed-blob", + "sp-maybe-compressed-blob 11.0.0", "sp-runtime 31.0.1", "thiserror", "zstd 0.12.4", @@ -14592,7 +14782,7 @@ dependencies = [ "sc-network-types", "sc-transaction-pool-api", "smallvec", - "sp-api", + "sp-api 26.0.0", "sp-authority-discovery", "sp-blockchain", "sp-consensus-babe", @@ -14664,7 +14854,7 @@ dependencies = [ "polkadot-primitives-test-helpers", "prioritized-metered-channel", "sc-client-api", - "sp-api", + "sp-api 26.0.0", "sp-core 28.0.0", "tikv-jemalloc-ctl", "tracing-gum", @@ -14750,7 +14940,7 @@ dependencies = [ "sc-client-api", "sc-client-db", "sc-consensus", - "sc-executor", + "sc-executor 0.32.0", "sc-network", "sc-rpc", "sc-service", @@ -14760,7 +14950,7 @@ dependencies = [ "sc-transaction-pool", "serde", "serde_json", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-consensus-aura", "sp-core 28.0.0", @@ -14771,7 +14961,7 @@ dependencies = [ "sp-session", "sp-timestamp", "sp-transaction-pool", - "sp-version", + "sp-version 29.0.0", "sp-weights 27.0.0", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", @@ -14808,7 +14998,7 @@ dependencies = [ "polkadot-primitives-test-helpers", "scale-info", "serde", - "sp-api", + "sp-api 26.0.0", "sp-application-crypto 30.0.0", "sp-arithmetic 23.0.0", "sp-authority-discovery", @@ -14855,7 +15045,7 @@ dependencies = [ "sc-rpc-spec-v2", "sc-sync-state-rpc", "sc-transaction-pool-api", - "sp-api", + "sp-api 26.0.0", "sp-application-crypto 30.0.0", "sp-block-builder", "sp-blockchain", @@ -14907,7 +15097,7 @@ dependencies = [ "serde_derive", "serde_json", "slot-range-helper", - "sp-api", + "sp-api 26.0.0", "sp-core 28.0.0", "sp-inherents", "sp-io 30.0.0", @@ -14974,7 +15164,7 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-api", + "sp-api 26.0.0", "sp-application-crypto 30.0.0", "sp-arithmetic 23.0.0", "sp-core 28.0.0", @@ -15225,7 +15415,7 @@ dependencies = [ "polkadot-service", "polkadot-statement-distribution", "polkadot-statement-table", - "sc-allocator", + "sc-allocator 23.0.0", "sc-authority-discovery", "sc-basic-authorship", "sc-block-builder", @@ -15246,10 +15436,10 @@ dependencies = [ "sc-consensus-manual-seal", "sc-consensus-pow", "sc-consensus-slots", - "sc-executor", - "sc-executor-common", - "sc-executor-polkavm", - "sc-executor-wasmtime", + "sc-executor 0.32.0", + "sc-executor-common 0.29.0", + "sc-executor-polkavm 0.29.0", + "sc-executor-wasmtime 0.29.0", "sc-informant", "sc-keystore", "sc-mixnet", @@ -15295,8 +15485,8 @@ dependencies = [ "snowbridge-runtime-common", "snowbridge-runtime-test-common", "snowbridge-system-runtime-api", - "sp-api", - "sp-api-proc-macro", + "sp-api 26.0.0", + "sp-api-proc-macro 15.0.0", "sp-application-crypto 30.0.0", "sp-arithmetic 23.0.0", "sp-authority-discovery", @@ -15314,7 +15504,7 @@ dependencies = [ "sp-core-hashing-proc-macro", "sp-crypto-ec-utils 0.10.0", "sp-crypto-hashing 0.1.0", - "sp-crypto-hashing-proc-macro", + "sp-crypto-hashing-proc-macro 0.1.0", "sp-database", "sp-debug-derive 14.0.0", "sp-externalities 0.25.0", @@ -15323,8 +15513,8 @@ dependencies = [ "sp-io 30.0.0", "sp-keyring", "sp-keystore 0.34.0", - "sp-maybe-compressed-blob", - "sp-metadata-ir", + "sp-maybe-compressed-blob 11.0.0", + "sp-metadata-ir 0.6.0", "sp-mixnet", "sp-mmr-primitives", "sp-npos-elections", @@ -15345,8 +15535,8 @@ dependencies = [ "sp-transaction-pool", "sp-transaction-storage-proof", "sp-trie 29.0.0", - "sp-version", - "sp-version-proc-macro", + "sp-version 29.0.0", + "sp-version-proc-macro 13.0.0", "sp-wasm-interface 20.0.0", "sp-weights 27.0.0", "staging-chain-spec-builder", @@ -15432,7 +15622,7 @@ dependencies = [ "sc-consensus-grandpa", "sc-consensus-manual-seal", "sc-consensus-pow", - "sc-executor", + "sc-executor 0.32.0", "sc-network", "sc-rpc", "sc-rpc-api", @@ -15440,7 +15630,7 @@ dependencies = [ "scale-info", "simple-mermaid 0.1.1", "solochain-template-runtime", - "sp-api", + "sp-api 26.0.0", "sp-arithmetic 23.0.0", "sp-core 28.0.0", "sp-genesis-builder", @@ -15451,7 +15641,7 @@ dependencies = [ "sp-runtime-interface 24.0.0", "sp-std 14.0.0", "sp-tracing 16.0.0", - "sp-version", + "sp-version 29.0.0", "staging-chain-spec-builder", "staging-node-cli", "staging-parachain-info", @@ -15480,7 +15670,7 @@ dependencies = [ "pallet-examples", "parity-scale-codec", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-arithmetic 23.0.0", "sp-block-builder", "sp-consensus-aura", @@ -15493,7 +15683,7 @@ dependencies = [ "sp-session", "sp-storage 19.0.0", "sp-transaction-pool", - "sp-version", + "sp-version 29.0.0", ] [[package]] @@ -15574,7 +15764,7 @@ dependencies = [ "sc-consensus-beefy", "sc-consensus-grandpa", "sc-consensus-slots", - "sc-executor", + "sc-executor 0.32.0", "sc-keystore", "sc-network", "sc-network-common", @@ -15590,7 +15780,7 @@ dependencies = [ "serde", "serde_json", "serial_test", - "sp-api", + "sp-api 26.0.0", "sp-authority-discovery", "sp-block-builder", "sp-blockchain", @@ -15612,7 +15802,7 @@ dependencies = [ "sp-timestamp", "sp-tracing 16.0.0", "sp-transaction-pool", - "sp-version", + "sp-version 29.0.0", "sp-weights 27.0.0", "staging-xcm", "substrate-prometheus-endpoint", @@ -15758,7 +15948,7 @@ dependencies = [ "sc-consensus", "sc-offchain", "sc-service", - "sp-api", + "sp-api 26.0.0", "sp-blockchain", "sp-consensus", "sp-consensus-babe", @@ -15838,7 +16028,7 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-api", + "sp-api 26.0.0", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", @@ -15855,7 +16045,7 @@ dependencies = [ "sp-staking", "sp-transaction-pool", "sp-trie 29.0.0", - "sp-version", + "sp-version 29.0.0", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -15926,6 +16116,24 @@ dependencies = [ "westend-runtime", ] +[[package]] +name = "polkadot-zombienet-sdk-tests" +version = "0.1.0" +dependencies = [ + "anyhow", + "env_logger 0.11.3", + "log", + "parity-scale-codec", + "serde", + "serde_json", + "substrate-build-script-utils", + "subwasmlib", + "subxt", + "subxt-signer", + "tokio", + "zombienet-sdk", +] + [[package]] name = "polkavm" version = "0.9.3" @@ -16670,7 +16878,7 @@ dependencies = [ "log", "names", "prost 0.11.9", - "reqwest", + "reqwest 0.11.20", "thiserror", "url", "winapi", @@ -16710,6 +16918,15 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +[[package]] +name = "quick-protobuf" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e489d4a83c17ea69b0291630229b5d4c92a94a3bf0165f7f72f506e94cda8b4b" +dependencies = [ + "byteorder", +] + [[package]] name = "quick-protobuf" version = "0.8.1" @@ -16727,7 +16944,7 @@ checksum = "f8ededb1cd78531627244d51dd0c7139fbe736c7d57af0092a76f0ffb2f56e98" dependencies = [ "asynchronous-codec", "bytes", - "quick-protobuf", + "quick-protobuf 0.8.1", "thiserror", "unsigned-varint 0.7.2", ] @@ -16763,8 +16980,8 @@ dependencies = [ "bytes", "futures-io", "pin-project-lite", - "quinn-proto", - "quinn-udp", + "quinn-proto 0.10.6", + "quinn-udp 0.4.1", "rustc-hash 1.1.0", "rustls 0.21.7", "thiserror", @@ -16772,6 +16989,24 @@ dependencies = [ "tracing", ] +[[package]] +name = "quinn" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto 0.11.8", + "quinn-udp 0.5.4", + "rustc-hash 2.0.0", + "rustls 0.23.10", + "socket2 0.5.7", + "thiserror", + "tokio", + "tracing", +] + [[package]] name = "quinn-proto" version = "0.10.6" @@ -16789,6 +17024,23 @@ dependencies = [ "tracing", ] +[[package]] +name = "quinn-proto" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +dependencies = [ + "bytes", + "rand", + "ring 0.17.7", + "rustc-hash 2.0.0", + "rustls 0.23.10", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + [[package]] name = "quinn-udp" version = "0.4.1" @@ -16802,6 +17054,19 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "quinn-udp" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +dependencies = [ + "libc", + "once_cell", + "socket2 0.5.7", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "quote" version = "0.6.13" @@ -17158,7 +17423,7 @@ dependencies = [ "sp-runtime 31.0.1", "sp-std 14.0.0", "sp-trie 29.0.0", - "sp-version", + "sp-version 29.0.0", "staging-xcm", "thiserror", "tokio", @@ -17244,7 +17509,50 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "webpki-roots 0.25.2", - "winreg", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.3.1", + "hyper-rustls 0.27.2", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "quinn 0.11.5", + "rustls 0.23.10", + "rustls-pemfile 2.0.0", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-rustls 0.26.0", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots 0.26.3", + "winreg 0.52.0", ] [[package]] @@ -17387,7 +17695,7 @@ dependencies = [ "polkadot-parachain-primitives", "polkadot-runtime-common", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-consensus-aura", "sp-core 28.0.0", @@ -17397,7 +17705,7 @@ dependencies = [ "sp-runtime 31.0.1", "sp-session", "sp-transaction-pool", - "sp-version", + "sp-version 29.0.0", "staging-parachain-info", "staging-xcm", "staging-xcm-builder", @@ -17480,7 +17788,7 @@ dependencies = [ "serde_derive", "serde_json", "smallvec", - "sp-api", + "sp-api 26.0.0", "sp-arithmetic 23.0.0", "sp-authority-discovery", "sp-block-builder", @@ -17501,7 +17809,7 @@ dependencies = [ "sp-tracing 16.0.0", "sp-transaction-pool", "sp-trie 29.0.0", - "sp-version", + "sp-version 29.0.0", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -18000,6 +18308,18 @@ dependencies = [ "thiserror", ] +[[package]] +name = "sc-allocator" +version = "28.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3f01218e73ea57916be5f08987995ac802d6f4ede4ea5ce0242e468c590e4e2" +dependencies = [ + "log", + "sp-core 33.0.1", + "sp-wasm-interface 21.0.0", + "thiserror", +] + [[package]] name = "sc-authority-discovery" version = "0.34.0" @@ -18020,7 +18340,7 @@ dependencies = [ "sc-client-api", "sc-network", "sc-network-types", - "sp-api", + "sp-api 26.0.0", "sp-authority-discovery", "sp-blockchain", "sp-core 28.0.0", @@ -18047,7 +18367,7 @@ dependencies = [ "sc-telemetry", "sc-transaction-pool", "sc-transaction-pool-api", - "sp-api", + "sp-api 26.0.0", "sp-blockchain", "sp-consensus", "sp-core 28.0.0", @@ -18062,7 +18382,7 @@ name = "sc-block-builder" version = "0.33.0" dependencies = [ "parity-scale-codec", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-blockchain", "sp-core 28.0.0", @@ -18086,7 +18406,7 @@ dependencies = [ "regex", "sc-chain-spec-derive", "sc-client-api", - "sc-executor", + "sc-executor 0.32.0", "sc-network", "sc-telemetry", "serde", @@ -18152,7 +18472,7 @@ dependencies = [ "sp-panic-handler 13.0.0", "sp-runtime 31.0.1", "sp-tracing 16.0.0", - "sp-version", + "sp-version 29.0.0", "tempfile", "thiserror", "tokio", @@ -18167,10 +18487,10 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.3", - "sc-executor", + "sc-executor 0.32.0", "sc-transaction-pool-api", "sc-utils", - "sp-api", + "sp-api 26.0.0", "sp-blockchain", "sp-consensus", "sp-core 28.0.0", @@ -18233,7 +18553,7 @@ dependencies = [ "sc-network-types", "sc-utils", "serde", - "sp-api", + "sp-api 26.0.0", "sp-blockchain", "sp-consensus", "sp-core 28.0.0", @@ -18261,7 +18581,7 @@ dependencies = [ "sc-network", "sc-network-test", "sc-telemetry", - "sp-api", + "sp-api 26.0.0", "sp-application-crypto 30.0.0", "sp-block-builder", "sp-blockchain", @@ -18303,7 +18623,7 @@ dependencies = [ "sc-network-test", "sc-telemetry", "sc-transaction-pool-api", - "sp-api", + "sp-api 26.0.0", "sp-application-crypto 30.0.0", "sp-block-builder", "sp-blockchain", @@ -18338,7 +18658,7 @@ dependencies = [ "sc-transaction-pool-api", "serde", "serde_json", - "sp-api", + "sp-api 26.0.0", "sp-application-crypto 30.0.0", "sp-blockchain", "sp-consensus", @@ -18374,7 +18694,7 @@ dependencies = [ "sc-network-types", "sc-utils", "serde", - "sp-api", + "sp-api 26.0.0", "sp-application-crypto 30.0.0", "sp-arithmetic 23.0.0", "sp-blockchain", @@ -18462,7 +18782,7 @@ dependencies = [ "sc-utils", "serde", "serde_json", - "sp-api", + "sp-api 26.0.0", "sp-application-crypto 30.0.0", "sp-arithmetic 23.0.0", "sp-blockchain", @@ -18524,7 +18844,7 @@ dependencies = [ "sc-transaction-pool", "sc-transaction-pool-api", "serde", - "sp-api", + "sp-api 26.0.0", "sp-blockchain", "sp-consensus", "sp-consensus-aura", @@ -18554,7 +18874,7 @@ dependencies = [ "parking_lot 0.12.3", "sc-client-api", "sc-consensus", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-blockchain", "sp-consensus", @@ -18601,25 +18921,25 @@ dependencies = [ "parking_lot 0.12.3", "paste", "regex", - "sc-executor-common", - "sc-executor-polkavm", - "sc-executor-wasmtime", + "sc-executor-common 0.29.0", + "sc-executor-polkavm 0.29.0", + "sc-executor-wasmtime 0.29.0", "sc-runtime-test", "sc-tracing", "schnellru", - "sp-api", + "sp-api 26.0.0", "sp-core 28.0.0", "sp-crypto-hashing 0.1.0", "sp-externalities 0.25.0", "sp-io 30.0.0", - "sp-maybe-compressed-blob", + "sp-maybe-compressed-blob 11.0.0", "sp-panic-handler 13.0.0", "sp-runtime 31.0.1", "sp-runtime-interface 24.0.0", "sp-state-machine 0.35.0", "sp-tracing 16.0.0", "sp-trie 29.0.0", - "sp-version", + "sp-version 29.0.0", "sp-wasm-interface 20.0.0", "substrate-test-runtime", "tempfile", @@ -18629,27 +18949,77 @@ dependencies = [ ] [[package]] -name = "sc-executor-common" -version = "0.29.0" +name = "sc-executor" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "321e9431a3d5c95514b1ba775dd425efd4b18bd79dfdb6d8e397f0c96d6831e9" dependencies = [ - "polkavm 0.9.3", - "sc-allocator", - "sp-maybe-compressed-blob", + "parity-scale-codec", + "parking_lot 0.12.3", + "sc-executor-common 0.34.0", + "sc-executor-polkavm 0.31.0", + "sc-executor-wasmtime 0.34.0", + "schnellru", + "sp-api 32.0.0", + "sp-core 33.0.1", + "sp-externalities 0.28.0", + "sp-io 36.0.0", + "sp-panic-handler 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-runtime-interface 27.0.0", + "sp-trie 35.0.0", + "sp-version 35.0.0", + "sp-wasm-interface 21.0.0", + "tracing", +] + +[[package]] +name = "sc-executor-common" +version = "0.29.0" +dependencies = [ + "polkavm 0.9.3", + "sc-allocator 23.0.0", + "sp-maybe-compressed-blob 11.0.0", "sp-wasm-interface 20.0.0", "thiserror", "wasm-instrument", ] +[[package]] +name = "sc-executor-common" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aad16187c613f81feab35f0d6c12c15c1d88eea0794c886b5dca3495d26746de" +dependencies = [ + "polkavm 0.9.3", + "sc-allocator 28.0.0", + "sp-maybe-compressed-blob 11.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-wasm-interface 21.0.0", + "thiserror", + "wasm-instrument", +] + [[package]] name = "sc-executor-polkavm" version = "0.29.0" dependencies = [ "log", "polkavm 0.9.3", - "sc-executor-common", + "sc-executor-common 0.29.0", "sp-wasm-interface 20.0.0", ] +[[package]] +name = "sc-executor-polkavm" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db336a08ea53b6a89972a6ad6586e664c15db2add9d1cfb508afc768de387304" +dependencies = [ + "log", + "polkavm 0.9.3", + "sc-executor-common 0.34.0", + "sp-wasm-interface 21.0.0", +] + [[package]] name = "sc-executor-wasmtime" version = "0.29.0" @@ -18663,8 +19033,8 @@ dependencies = [ "parking_lot 0.12.3", "paste", "rustix 0.36.15", - "sc-allocator", - "sc-executor-common", + "sc-allocator 23.0.0", + "sc-executor-common 0.29.0", "sc-runtime-test", "sp-io 30.0.0", "sp-runtime-interface 24.0.0", @@ -18674,6 +19044,25 @@ dependencies = [ "wat", ] +[[package]] +name = "sc-executor-wasmtime" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b97b324b2737447b7b208e913fef4988d5c38ecc21f57c3dd33e3f1e1e3bb08" +dependencies = [ + "anyhow", + "cfg-if", + "libc", + "log", + "parking_lot 0.12.3", + "rustix 0.36.15", + "sc-allocator 28.0.0", + "sc-executor-common 0.34.0", + "sp-runtime-interface 27.0.0", + "sp-wasm-interface 21.0.0", + "wasmtime", +] + [[package]] name = "sc-informant" version = "0.33.0" @@ -18723,7 +19112,7 @@ dependencies = [ "sc-network", "sc-network-types", "sc-transaction-pool-api", - "sp-api", + "sp-api 26.0.0", "sp-consensus", "sp-core 28.0.0", "sp-keystore 0.34.0", @@ -19011,7 +19400,7 @@ dependencies = [ "sc-transaction-pool", "sc-transaction-pool-api", "sc-utils", - "sp-api", + "sp-api 26.0.0", "sp-consensus", "sp-core 28.0.0", "sp-externalities 0.25.0", @@ -19056,7 +19445,7 @@ dependencies = [ "sc-transaction-pool-api", "sc-utils", "serde_json", - "sp-api", + "sp-api 26.0.0", "sp-blockchain", "sp-consensus", "sp-core 28.0.0", @@ -19068,7 +19457,7 @@ dependencies = [ "sp-runtime 31.0.1", "sp-session", "sp-statement-store", - "sp-version", + "sp-version 29.0.0", "substrate-test-runtime-client", "tokio", ] @@ -19088,7 +19477,7 @@ dependencies = [ "sp-core 28.0.0", "sp-rpc", "sp-runtime 31.0.1", - "sp-version", + "sp-version 29.0.0", "thiserror", ] @@ -19141,15 +19530,15 @@ dependencies = [ "schnellru", "serde", "serde_json", - "sp-api", + "sp-api 26.0.0", "sp-blockchain", "sp-consensus", "sp-core 28.0.0", "sp-externalities 0.25.0", - "sp-maybe-compressed-blob", + "sp-maybe-compressed-blob 11.0.0", "sp-rpc", "sp-runtime 31.0.1", - "sp-version", + "sp-version 29.0.0", "substrate-test-runtime", "substrate-test-runtime-client", "substrate-test-runtime-transaction-pool", @@ -19188,7 +19577,7 @@ dependencies = [ "sc-client-api", "sc-client-db", "sc-consensus", - "sc-executor", + "sc-executor 0.32.0", "sc-informant", "sc-keystore", "sc-network", @@ -19209,7 +19598,7 @@ dependencies = [ "schnellru", "serde", "serde_json", - "sp-api", + "sp-api 26.0.0", "sp-blockchain", "sp-consensus", "sp-core 28.0.0", @@ -19222,7 +19611,7 @@ dependencies = [ "sp-transaction-pool", "sp-transaction-storage-proof", "sp-trie 29.0.0", - "sp-version", + "sp-version 29.0.0", "static_init", "substrate-prometheus-endpoint", "substrate-test-runtime", @@ -19249,12 +19638,12 @@ dependencies = [ "sc-client-api", "sc-client-db", "sc-consensus", - "sc-executor", + "sc-executor 0.32.0", "sc-network", "sc-network-sync", "sc-service", "sc-transaction-pool-api", - "sp-api", + "sp-api 26.0.0", "sp-blockchain", "sp-consensus", "sp-core 28.0.0", @@ -19289,7 +19678,7 @@ dependencies = [ "parking_lot 0.12.3", "sc-client-api", "sc-keystore", - "sp-api", + "sp-api 26.0.0", "sp-blockchain", "sp-core 28.0.0", "sp-runtime 31.0.1", @@ -19388,7 +19777,7 @@ dependencies = [ "sc-client-api", "sc-tracing-proc-macro", "serde", - "sp-api", + "sp-api 26.0.0", "sp-blockchain", "sp-core 28.0.0", "sp-rpc", @@ -19429,7 +19818,7 @@ dependencies = [ "sc-transaction-pool-api", "sc-utils", "serde", - "sp-api", + "sp-api 26.0.0", "sp-blockchain", "sp-consensus", "sp-core 28.0.0", @@ -19814,7 +20203,7 @@ dependencies = [ "parachains-common", "parity-scale-codec", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-consensus-aura", "sp-core 28.0.0", @@ -19824,7 +20213,7 @@ dependencies = [ "sp-runtime 31.0.1", "sp-session", "sp-transaction-pool", - "sp-version", + "sp-version 29.0.0", "staging-parachain-info", "substrate-wasm-builder", ] @@ -20090,6 +20479,18 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "sha3" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" +dependencies = [ + "block-buffer 0.9.0", + "digest 0.9.0", + "keccak", + "opaque-debug 0.3.0", +] + [[package]] name = "sha3" version = "0.10.8" @@ -20127,7 +20528,7 @@ dependencies = [ "parachains-common", "parity-scale-codec", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-consensus-aura", "sp-core 28.0.0", @@ -20137,7 +20538,7 @@ dependencies = [ "sp-runtime 31.0.1", "sp-session", "sp-transaction-pool", - "sp-version", + "sp-version 29.0.0", "staging-parachain-info", "staging-xcm", "staging-xcm-builder", @@ -20362,7 +20763,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "sha3", + "sha3 0.10.8", "siphasher 0.3.11", "slab", "smallvec", @@ -20417,7 +20818,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "sha3", + "sha3 0.10.8", "siphasher 1.0.1", "slab", "smallvec", @@ -20639,7 +21040,7 @@ dependencies = [ "parity-scale-codec", "snowbridge-core", "snowbridge-outbound-queue-merkle-tree", - "sp-api", + "sp-api 26.0.0", "sp-std 14.0.0", ] @@ -20839,7 +21240,7 @@ version = "0.2.0" dependencies = [ "parity-scale-codec", "snowbridge-core", - "sp-api", + "sp-api 26.0.0", "sp-std 14.0.0", "staging-xcm", ] @@ -20913,7 +21314,7 @@ dependencies = [ "sc-consensus", "sc-consensus-aura", "sc-consensus-grandpa", - "sc-executor", + "sc-executor 0.32.0", "sc-network", "sc-offchain", "sc-service", @@ -20922,7 +21323,7 @@ dependencies = [ "sc-transaction-pool-api", "serde_json", "solochain-template-runtime", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-blockchain", "sp-consensus-aura", @@ -20959,7 +21360,7 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-consensus-aura", "sp-consensus-grandpa", @@ -20971,7 +21372,7 @@ dependencies = [ "sp-session", "sp-storage 19.0.0", "sp-transaction-pool", - "sp-version", + "sp-version 29.0.0", "substrate-wasm-builder", ] @@ -20984,16 +21385,39 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-api-proc-macro", + "sp-api-proc-macro 15.0.0", "sp-core 28.0.0", "sp-externalities 0.25.0", - "sp-metadata-ir", + "sp-metadata-ir 0.6.0", "sp-runtime 31.0.1", "sp-runtime-interface 24.0.0", "sp-state-machine 0.35.0", "sp-test-primitives", "sp-trie 29.0.0", - "sp-version", + "sp-version 29.0.0", + "thiserror", +] + +[[package]] +name = "sp-api" +version = "32.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f84f09c4b928e814e07dede0ece91f1f6eae1bff946a0e5e4a76bed19a095f1" +dependencies = [ + "hash-db", + "log", + "parity-scale-codec", + "scale-info", + "sp-api-proc-macro 19.0.0", + "sp-core 33.0.1", + "sp-externalities 0.28.0", + "sp-metadata-ir 0.7.0", + "sp-runtime 37.0.0", + "sp-runtime-interface 27.0.0", + "sp-state-machine 0.41.0", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-trie 35.0.0", + "sp-version 35.0.0", "thiserror", ] @@ -21011,6 +21435,21 @@ dependencies = [ "syn 2.0.65", ] +[[package]] +name = "sp-api-proc-macro" +version = "19.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213a4bec1b18bd0750e7b81d11d8276c24f68b53cde83950b00b178ecc9ab24a" +dependencies = [ + "Inflector", + "blake2 0.10.6", + "expander", + "proc-macro-crate 3.1.0", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.65", +] + [[package]] name = "sp-api-test" version = "2.0.1" @@ -21022,13 +21461,13 @@ dependencies = [ "rustversion", "sc-block-builder", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-consensus", "sp-core 28.0.0", "sp-runtime 31.0.1", "sp-state-machine 0.35.0", "sp-tracing 16.0.0", - "sp-version", + "sp-version 29.0.0", "static_assertions", "substrate-test-runtime-client", "trybuild", @@ -21059,11 +21498,39 @@ dependencies = [ "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "sp-application-crypto" +version = "35.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57541120624a76379cc993cbb85064a5148957a92da032567e54bce7977f51fc" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 32.0.0", + "sp-io 35.0.0", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "sp-application-crypto" +version = "36.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "296282f718f15d4d812664415942665302a484d3495cf8d2e2ab3192b32d2c73" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 33.0.1", + "sp-io 36.0.0", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "sp-application-crypto-test" version = "2.0.0" dependencies = [ - "sp-api", + "sp-api 26.0.0", "sp-application-crypto 30.0.0", "sp-core 28.0.0", "sp-keystore 0.34.0", @@ -21102,6 +21569,22 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "sp-arithmetic" +version = "26.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46d0d0a4c591c421d3231ddd5e27d828618c24456d51445d21a1f79fcee97c23" +dependencies = [ + "docify", + "integer-sqrt", + "num-traits", + "parity-scale-codec", + "scale-info", + "serde", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "static_assertions", +] + [[package]] name = "sp-arithmetic-fuzzer" version = "2.0.0" @@ -21137,7 +21620,7 @@ version = "26.0.0" dependencies = [ "parity-scale-codec", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-application-crypto 30.0.0", "sp-runtime 31.0.1", ] @@ -21146,7 +21629,7 @@ dependencies = [ name = "sp-block-builder" version = "26.0.0" dependencies = [ - "sp-api", + "sp-api 26.0.0", "sp-inherents", "sp-runtime 31.0.1", ] @@ -21159,7 +21642,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", "schnellru", - "sp-api", + "sp-api 26.0.0", "sp-consensus", "sp-core 28.0.0", "sp-database", @@ -21191,7 +21674,7 @@ dependencies = [ "async-trait", "parity-scale-codec", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-application-crypto 30.0.0", "sp-consensus-slots", "sp-inherents", @@ -21207,7 +21690,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api", + "sp-api 26.0.0", "sp-application-crypto 30.0.0", "sp-consensus-slots", "sp-core 28.0.0", @@ -21225,7 +21708,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api", + "sp-api 26.0.0", "sp-application-crypto 30.0.0", "sp-core 28.0.0", "sp-crypto-hashing 0.1.0", @@ -21247,7 +21730,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api", + "sp-api 26.0.0", "sp-application-crypto 30.0.0", "sp-core 28.0.0", "sp-keystore 0.34.0", @@ -21259,7 +21742,7 @@ name = "sp-consensus-pow" version = "0.32.0" dependencies = [ "parity-scale-codec", - "sp-api", + "sp-api 26.0.0", "sp-core 28.0.0", "sp-runtime 31.0.1", ] @@ -21271,7 +21754,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api", + "sp-api 26.0.0", "sp-application-crypto 30.0.0", "sp-consensus-slots", "sp-core 28.0.0", @@ -21385,6 +21868,100 @@ dependencies = [ "zeroize", ] +[[package]] +name = "sp-core" +version = "32.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb2dac7e47c7ddbb61efe196d5cce99f6ea88926c961fa39909bfeae46fc5a7b" +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", + "itertools 0.10.5", + "k256", + "libsecp256k1", + "log", + "merlin", + "parity-bip39", + "parity-scale-codec", + "parking_lot 0.12.3", + "paste", + "primitive-types", + "rand", + "scale-info", + "schnorrkel 0.11.4", + "secp256k1", + "secrecy", + "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.28.0", + "sp-runtime-interface 27.0.0", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-storage 21.0.0", + "ss58-registry", + "substrate-bip39 0.6.0", + "thiserror", + "tracing", + "w3f-bls", + "zeroize", +] + +[[package]] +name = "sp-core" +version = "33.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3368e32f6fda6e20b8af51f94308d033ab70a021e87f6abbd3fed5aca942b745" +dependencies = [ + "array-bytes", + "bitflags 1.3.2", + "blake2 0.10.6", + "bounded-collections", + "bs58", + "dyn-clonable", + "ed25519-zebra 4.0.3", + "futures", + "hash-db", + "hash256-std-hasher", + "impl-serde", + "itertools 0.11.0", + "k256", + "libsecp256k1", + "log", + "merlin", + "parity-bip39", + "parity-scale-codec", + "parking_lot 0.12.3", + "paste", + "primitive-types", + "rand", + "scale-info", + "schnorrkel 0.11.4", + "secp256k1", + "secrecy", + "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.28.0", + "sp-runtime-interface 27.0.0", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-storage 21.0.0", + "ss58-registry", + "substrate-bip39 0.6.0", + "thiserror", + "tracing", + "w3f-bls", + "zeroize", +] + [[package]] name = "sp-core-fuzz" version = "0.0.0" @@ -21406,7 +21983,7 @@ dependencies = [ name = "sp-core-hashing-proc-macro" version = "15.0.0" dependencies = [ - "sp-crypto-hashing-proc-macro", + "sp-crypto-hashing-proc-macro 0.1.0", ] [[package]] @@ -21453,13 +22030,13 @@ dependencies = [ name = "sp-crypto-hashing" version = "0.1.0" dependencies = [ - "blake2b_simd", + "blake2b_simd 1.0.2", "byteorder", "criterion", "digest 0.10.7", "sha2 0.10.8", - "sha3", - "sp-crypto-hashing-proc-macro", + "sha3 0.10.8", + "sp-crypto-hashing-proc-macro 0.1.0", "twox-hash", ] @@ -21469,11 +22046,11 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc9927a7f81334ed5b8a98a4a978c81324d12bd9713ec76b5c68fd410174c5eb" dependencies = [ - "blake2b_simd", + "blake2b_simd 1.0.2", "byteorder", "digest 0.10.7", "sha2 0.10.8", - "sha3", + "sha3 0.10.8", "twox-hash", ] @@ -21486,6 +22063,17 @@ dependencies = [ "syn 2.0.65", ] +[[package]] +name = "sp-crypto-hashing-proc-macro" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b85d0f1f1e44bd8617eb2a48203ee854981229e3e79e6f468c7175d5fd37489b" +dependencies = [ + "quote 1.0.37", + "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 2.0.65", +] + [[package]] name = "sp-database" version = "10.0.0" @@ -21556,6 +22144,17 @@ dependencies = [ "sp-storage 20.0.0", ] +[[package]] +name = "sp-externalities" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33abaec4be69b1613796bbf430decbbcaaf978756379e2016e683a4d6379cd02" +dependencies = [ + "environmental", + "parity-scale-codec", + "sp-storage 21.0.0", +] + [[package]] name = "sp-genesis-builder" version = "0.8.0" @@ -21563,7 +22162,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde_json", - "sp-api", + "sp-api 26.0.0", "sp-runtime 31.0.1", ] @@ -21632,6 +22231,60 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "sp-io" +version = "35.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b64ab18a0e29def6511139a8c45a59c14a846105aab6f9cc653523bd3b81f55" +dependencies = [ + "bytes", + "ed25519-dalek", + "libsecp256k1", + "log", + "parity-scale-codec", + "polkavm-derive 0.9.1", + "rustversion", + "secp256k1", + "sp-core 32.0.0", + "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-externalities 0.28.0", + "sp-keystore 0.38.0", + "sp-runtime-interface 27.0.0", + "sp-state-machine 0.40.0", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-tracing 17.0.0", + "sp-trie 34.0.0", + "tracing", + "tracing-core", +] + +[[package]] +name = "sp-io" +version = "36.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7a31ce27358b73656a09b4933f09a700019d63afa15ede966f7c9893c1d4db5" +dependencies = [ + "bytes", + "ed25519-dalek", + "libsecp256k1", + "log", + "parity-scale-codec", + "polkavm-derive 0.9.1", + "rustversion", + "secp256k1", + "sp-core 33.0.1", + "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-externalities 0.28.0", + "sp-keystore 0.39.0", + "sp-runtime-interface 27.0.0", + "sp-state-machine 0.41.0", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-tracing 17.0.0", + "sp-trie 35.0.0", + "tracing", + "tracing-core", +] + [[package]] name = "sp-keyring" version = "31.0.0" @@ -21665,9 +22318,43 @@ dependencies = [ "sp-externalities 0.27.0", ] +[[package]] +name = "sp-keystore" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e6c7a7abd860a5211a356cf9d5fcabf0eb37d997985e5d722b6b33dcc815528" +dependencies = [ + "parity-scale-codec", + "parking_lot 0.12.3", + "sp-core 32.0.0", + "sp-externalities 0.28.0", +] + +[[package]] +name = "sp-keystore" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92a909528663a80829b95d582a20dd4c9acd6e575650dee2bcaf56f4740b305e" +dependencies = [ + "parity-scale-codec", + "parking_lot 0.12.3", + "sp-core 33.0.1", + "sp-externalities 0.28.0", +] + +[[package]] +name = "sp-maybe-compressed-blob" +version = "11.0.0" +dependencies = [ + "thiserror", + "zstd 0.12.4", +] + [[package]] name = "sp-maybe-compressed-blob" version = "11.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0c768c11afbe698a090386876911da4236af199cd38a5866748df4d8628aeff" dependencies = [ "thiserror", "zstd 0.12.4", @@ -21682,13 +22369,24 @@ dependencies = [ "scale-info", ] +[[package]] +name = "sp-metadata-ir" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a616fa51350b35326682a472ee8e6ba742fdacb18babac38ecd46b3e05ead869" +dependencies = [ + "frame-metadata 16.0.0", + "parity-scale-codec", + "scale-info", +] + [[package]] name = "sp-mixnet" version = "0.4.0" dependencies = [ "parity-scale-codec", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-application-crypto 30.0.0", ] @@ -21702,7 +22400,7 @@ dependencies = [ "polkadot-ckb-merkle-mountain-range", "scale-info", "serde", - "sp-api", + "sp-api 26.0.0", "sp-core 28.0.0", "sp-debug-derive 14.0.0", "sp-runtime 31.0.1", @@ -21738,7 +22436,7 @@ dependencies = [ name = "sp-offchain" version = "26.0.0" dependencies = [ - "sp-api", + "sp-api 26.0.0", "sp-core 28.0.0", "sp-runtime 31.0.1", ] @@ -21790,7 +22488,7 @@ dependencies = [ "serde", "serde_json", "simple-mermaid 0.1.1", - "sp-api", + "sp-api 26.0.0", "sp-application-crypto 30.0.0", "sp-arithmetic 23.0.0", "sp-core 28.0.0", @@ -21830,6 +22528,57 @@ dependencies = [ "sp-weights 30.0.0", ] +[[package]] +name = "sp-runtime" +version = "36.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6b85cb874b78ebb17307a910fc27edf259a0455ac5155d87eaed8754c037e07" +dependencies = [ + "docify", + "either", + "hash256-std-hasher", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "paste", + "rand", + "scale-info", + "serde", + "simple-mermaid 0.1.1", + "sp-application-crypto 35.0.0", + "sp-arithmetic 26.0.0", + "sp-core 32.0.0", + "sp-io 35.0.0", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-weights 31.0.0", +] + +[[package]] +name = "sp-runtime" +version = "37.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c2a6148bf0ba74999ecfea9b4c1ade544f0663e0baba19630bb7761b2142b19" +dependencies = [ + "docify", + "either", + "hash256-std-hasher", + "impl-trait-for-tuples", + "log", + "num-traits", + "parity-scale-codec", + "paste", + "rand", + "scale-info", + "serde", + "simple-mermaid 0.1.1", + "sp-application-crypto 36.0.0", + "sp-arithmetic 26.0.0", + "sp-core 33.0.1", + "sp-io 36.0.0", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-weights 31.0.0", +] + [[package]] name = "sp-runtime-interface" version = "17.0.0" @@ -21892,6 +22641,26 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "sp-runtime-interface" +version = "27.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "647db5e1dc481686628b41554e832df6ab400c4b43a6a54e54d3b0a71ca404aa" +dependencies = [ + "bytes", + "impl-trait-for-tuples", + "parity-scale-codec", + "polkavm-derive 0.9.1", + "primitive-types", + "sp-externalities 0.28.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 21.0.0", + "sp-tracing 17.0.0", + "sp-wasm-interface 21.0.0", + "static_assertions", +] + [[package]] name = "sp-runtime-interface-proc-macro" version = "11.0.0" @@ -21934,8 +22703,8 @@ dependencies = [ name = "sp-runtime-interface-test" version = "2.0.0" dependencies = [ - "sc-executor", - "sc-executor-common", + "sc-executor 0.32.0", + "sc-executor-common 0.29.0", "sp-io 30.0.0", "sp-runtime 31.0.1", "sp-runtime-interface 24.0.0", @@ -21973,7 +22742,7 @@ version = "27.0.0" dependencies = [ "parity-scale-codec", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-core 28.0.0", "sp-keystore 0.34.0", "sp-runtime 31.0.1", @@ -22018,9 +22787,52 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.38.0" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1eae0eac8034ba14437e772366336f579398a46d101de13dbb781ab1e35e67c5" +dependencies = [ + "hash-db", + "log", + "parity-scale-codec", + "parking_lot 0.12.3", + "rand", + "smallvec", + "sp-core 31.0.0", + "sp-externalities 0.27.0", + "sp-panic-handler 13.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)", + "sp-trie 32.0.0", + "thiserror", + "tracing", + "trie-db 0.28.0", +] + +[[package]] +name = "sp-state-machine" +version = "0.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18084cb996c27d5d99a88750e0a8eb4af6870a40df97872a5923e6d293d95fb9" +dependencies = [ + "hash-db", + "log", + "parity-scale-codec", + "parking_lot 0.12.3", + "rand", + "smallvec", + "sp-core 32.0.0", + "sp-externalities 0.28.0", + "sp-panic-handler 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-trie 34.0.0", + "thiserror", + "tracing", + "trie-db 0.29.1", +] + +[[package]] +name = "sp-state-machine" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eae0eac8034ba14437e772366336f579398a46d101de13dbb781ab1e35e67c5" +checksum = "6f6ac196ea92c4d0613c071e1a050765dbfa30107a990224a4aba02c7dbcd063" dependencies = [ "hash-db", "log", @@ -22028,14 +22840,13 @@ dependencies = [ "parking_lot 0.12.3", "rand", "smallvec", - "sp-core 31.0.0", - "sp-externalities 0.27.0", + "sp-core 33.0.1", + "sp-externalities 0.28.0", "sp-panic-handler 13.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)", - "sp-trie 32.0.0", + "sp-trie 35.0.0", "thiserror", "tracing", - "trie-db 0.28.0", + "trie-db 0.29.1", ] [[package]] @@ -22050,7 +22861,7 @@ dependencies = [ "rand", "scale-info", "sha2 0.10.8", - "sp-api", + "sp-api 26.0.0", "sp-application-crypto 30.0.0", "sp-core 28.0.0", "sp-crypto-hashing 0.1.0", @@ -22114,6 +22925,19 @@ dependencies = [ "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "sp-storage" +version = "21.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99c82989b3a4979a7e1ad848aad9f5d0b4388f1f454cc131766526601ab9e8f8" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "ref-cast", + "serde", + "sp-debug-derive 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "sp-test-primitives" version = "2.0.0" @@ -22172,11 +22996,23 @@ dependencies = [ "tracing-subscriber 0.2.25", ] +[[package]] +name = "sp-tracing" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90b3decf116db9f1dfaf1f1597096b043d0e12c952d3bcdc018c6d6b77deec7e" +dependencies = [ + "parity-scale-codec", + "tracing", + "tracing-core", + "tracing-subscriber 0.2.25", +] + [[package]] name = "sp-transaction-pool" version = "26.0.0" dependencies = [ - "sp-api", + "sp-api 26.0.0", "sp-runtime 31.0.1", ] @@ -22245,6 +23081,54 @@ dependencies = [ "trie-root", ] +[[package]] +name = "sp-trie" +version = "34.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87727eced997f14d0f79e3a5186a80e38a9de87f6e9dc0baea5ebf8b7f9d8b66" +dependencies = [ + "ahash 0.8.11", + "hash-db", + "lazy_static", + "memory-db", + "nohash-hasher", + "parity-scale-codec", + "parking_lot 0.12.3", + "rand", + "scale-info", + "schnellru", + "sp-core 32.0.0", + "sp-externalities 0.28.0", + "thiserror", + "tracing", + "trie-db 0.29.1", + "trie-root", +] + +[[package]] +name = "sp-trie" +version = "35.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a61ab0c3e003f457203702e4753aa5fe9e762380543fada44650b1217e4aa5a5" +dependencies = [ + "ahash 0.8.11", + "hash-db", + "lazy_static", + "memory-db", + "nohash-hasher", + "parity-scale-codec", + "parking_lot 0.12.3", + "rand", + "scale-info", + "schnellru", + "sp-core 33.0.1", + "sp-externalities 0.28.0", + "thiserror", + "tracing", + "trie-db 0.29.1", + "trie-root", +] + [[package]] name = "sp-version" version = "29.0.0" @@ -22254,10 +23138,28 @@ dependencies = [ "parity-wasm", "scale-info", "serde", - "sp-crypto-hashing-proc-macro", + "sp-crypto-hashing-proc-macro 0.1.0", "sp-runtime 31.0.1", "sp-std 14.0.0", - "sp-version-proc-macro", + "sp-version-proc-macro 13.0.0", + "thiserror", +] + +[[package]] +name = "sp-version" +version = "35.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ff74bf12b4f7d29387eb1caeec5553209a505f90a2511d2831143b970f89659" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "parity-wasm", + "scale-info", + "serde", + "sp-crypto-hashing-proc-macro 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-runtime 37.0.0", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-version-proc-macro 14.0.0", "thiserror", ] @@ -22269,7 +23171,19 @@ dependencies = [ "proc-macro-warning 1.0.0", "proc-macro2 1.0.86", "quote 1.0.37", - "sp-version", + "sp-version 29.0.0", + "syn 2.0.65", +] + +[[package]] +name = "sp-version-proc-macro" +version = "14.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aee8f6730641a65fcf0c8f9b1e448af4b3bb083d08058b47528188bccc7b7a7" +dependencies = [ + "parity-scale-codec", + "proc-macro2 1.0.86", + "quote 1.0.37", "syn 2.0.65", ] @@ -22311,6 +23225,19 @@ dependencies = [ "wasmtime", ] +[[package]] +name = "sp-wasm-interface" +version = "21.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b04b919e150b4736d85089d49327eab65507deb1485eec929af69daa2278eb3" +dependencies = [ + "anyhow", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "wasmtime", +] + [[package]] name = "sp-weights" version = "27.0.0" @@ -22341,6 +23268,21 @@ dependencies = [ "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "sp-weights" +version = "31.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93cdaf72a1dad537bbb130ba4d47307ebe5170405280ed1aa31fa712718a400e" +dependencies = [ + "bounded-collections", + "parity-scale-codec", + "scale-info", + "serde", + "smallvec", + "sp-arithmetic 26.0.0", + "sp-debug-derive 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "spin" version = "0.5.2" @@ -22731,6 +23673,17 @@ dependencies = [ "sc-cli", ] +[[package]] +name = "subrpcer" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a00780fcd4ebedf099da78a562744c6f17bda08d1223928c3104dd26081b44" +dependencies = [ + "affix", + "serde", + "serde_json", +] + [[package]] name = "substrate-bip39" version = "0.4.7" @@ -22757,6 +23710,19 @@ dependencies = [ "zeroize", ] +[[package]] +name = "substrate-bip39" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca58ffd742f693dc13d69bdbb2e642ae239e0053f6aab3b104252892f856700a" +dependencies = [ + "hmac 0.12.1", + "pbkdf2", + "schnorrkel 0.11.4", + "sha2 0.10.8", + "zeroize", +] + [[package]] name = "substrate-build-script-utils" version = "11.0.0" @@ -22778,6 +23744,23 @@ dependencies = [ "tokio", ] +[[package]] +name = "substrate-differ" +version = "0.21.3" +source = "git+https://github.com/chevdor/subwasm?rev=v0.21.3#aa8acb6fdfb34144ac51ab95618a9b37fa251295" +dependencies = [ + "comparable", + "document-features", + "frame-metadata 16.0.0", + "log", + "num-format", + "scale-info", + "serde", + "serde_json", + "thiserror", + "wasm-testbed", +] + [[package]] name = "substrate-frame-rpc-support" version = "29.0.0" @@ -22809,7 +23792,7 @@ dependencies = [ "sc-rpc-api", "sc-transaction-pool", "sc-transaction-pool-api", - "sp-api", + "sp-api 26.0.0", "sp-block-builder", "sp-blockchain", "sp-core 28.0.0", @@ -22890,6 +23873,22 @@ dependencies = [ "tokio", ] +[[package]] +name = "substrate-runtime-proposal-hash" +version = "0.21.3" +source = "git+https://github.com/chevdor/subwasm?rev=v0.21.3#aa8acb6fdfb34144ac51ab95618a9b37fa251295" +dependencies = [ + "blake2 0.10.6", + "frame-metadata 16.0.0", + "hex", + "parity-scale-codec", + "sp-core 32.0.0", + "sp-io 35.0.0", + "sp-runtime 36.0.0", + "sp-wasm-interface 21.0.0", + "thiserror", +] + [[package]] name = "substrate-state-trie-migration-rpc" version = "27.0.0" @@ -22918,7 +23917,7 @@ dependencies = [ "sc-client-api", "sc-client-db", "sc-consensus", - "sc-executor", + "sc-executor 0.32.0", "sc-offchain", "sc-service", "serde", @@ -22951,13 +23950,13 @@ dependencies = [ "parity-scale-codec", "sc-block-builder", "sc-chain-spec", - "sc-executor", - "sc-executor-common", + "sc-executor 0.32.0", + "sc-executor-common 0.29.0", "sc-service", "scale-info", "serde", "serde_json", - "sp-api", + "sp-api 26.0.0", "sp-application-crypto 30.0.0", "sp-block-builder", "sp-consensus", @@ -22978,7 +23977,7 @@ dependencies = [ "sp-tracing 16.0.0", "sp-transaction-pool", "sp-trie 29.0.0", - "sp-version", + "sp-version 29.0.0", "substrate-test-runtime-client", "substrate-wasm-builder", "tracing", @@ -22993,7 +23992,7 @@ dependencies = [ "sc-block-builder", "sc-client-api", "sc-consensus", - "sp-api", + "sp-api 26.0.0", "sp-blockchain", "sp-consensus", "sp-core 28.0.0", @@ -23042,12 +24041,12 @@ dependencies = [ "parity-scale-codec", "parity-wasm", "polkavm-linker 0.9.2", - "sc-executor", + "sc-executor 0.32.0", "sp-core 28.0.0", "sp-io 30.0.0", - "sp-maybe-compressed-blob", + "sp-maybe-compressed-blob 11.0.0", "sp-tracing 16.0.0", - "sp-version", + "sp-version 29.0.0", "strum 0.26.2", "tempfile", "toml 0.8.12", @@ -23073,6 +24072,32 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" +[[package]] +name = "subwasmlib" +version = "0.21.3" +source = "git+https://github.com/chevdor/subwasm?rev=v0.21.3#aa8acb6fdfb34144ac51ab95618a9b37fa251295" +dependencies = [ + "calm_io", + "frame-metadata 16.0.0", + "hex", + "ipfs-hasher", + "log", + "num-format", + "rand", + "reqwest 0.12.5", + "scale-info", + "semver 1.0.18", + "serde", + "serde_json", + "sp-version 35.0.0", + "substrate-differ", + "thiserror", + "url", + "uuid", + "wasm-loader", + "wasm-testbed", +] + [[package]] name = "subxt" version = "0.37.0" @@ -23362,6 +24387,12 @@ dependencies = [ "syn 2.0.65", ] +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + [[package]] name = "synstructure" version = "0.12.6" @@ -23956,7 +24987,7 @@ dependencies = [ "rustls-native-certs 0.6.3", "tokio", "tokio-rustls 0.24.1", - "tungstenite", + "tungstenite 0.20.1", ] [[package]] @@ -24439,6 +25470,28 @@ dependencies = [ "utf-8", ] +[[package]] +name = "tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.1.0", + "httparse", + "log", + "rand", + "rustls 0.22.4", + "rustls-native-certs 0.7.0", + "rustls-pki-types", + "sha1", + "thiserror", + "url", + "utf-8", +] + [[package]] name = "tuplex" version = "0.1.2" @@ -24548,6 +25601,18 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" +[[package]] +name = "unsigned-varint" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f67332660eb59a6f1eb24ff1220c9e8d01738a8503c6002e30bcfe4bd9f2b4a9" + +[[package]] +name = "unsigned-varint" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7fdeedbf205afadfe39ae559b75c3240f24e257d0ca27e85f85cb82aa19ac35" + [[package]] name = "unsigned-varint" version = "0.7.2" @@ -24582,6 +25647,24 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" +[[package]] +name = "ureq" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" +dependencies = [ + "base64 0.22.1", + "flate2", + "log", + "once_cell", + "rustls 0.23.10", + "rustls-pki-types", + "serde", + "serde_json", + "url", + "webpki-roots 0.26.3", +] + [[package]] name = "url" version = "2.5.2" @@ -24700,7 +25783,7 @@ dependencies = [ "rand_chacha", "rand_core 0.6.4", "sha2 0.10.8", - "sha3", + "sha3 0.10.8", "thiserror", "zeroize", ] @@ -24856,6 +25939,25 @@ dependencies = [ "parity-wasm", ] +[[package]] +name = "wasm-loader" +version = "0.21.3" +source = "git+https://github.com/chevdor/subwasm?rev=v0.21.3#aa8acb6fdfb34144ac51ab95618a9b37fa251295" +dependencies = [ + "array-bytes", + "log", + "multibase 0.9.1", + "multihash 0.19.1", + "serde", + "serde_json", + "sp-maybe-compressed-blob 11.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "subrpcer", + "thiserror", + "tungstenite 0.21.0", + "ureq", + "url", +] + [[package]] name = "wasm-opt" version = "0.116.0" @@ -24896,6 +25998,29 @@ dependencies = [ "cxx-build", ] +[[package]] +name = "wasm-testbed" +version = "0.21.3" +source = "git+https://github.com/chevdor/subwasm?rev=v0.21.3#aa8acb6fdfb34144ac51ab95618a9b37fa251295" +dependencies = [ + "frame-metadata 16.0.0", + "hex", + "log", + "parity-scale-codec", + "sc-executor 0.38.0", + "sc-executor-common 0.34.0", + "scale-info", + "sp-core 33.0.1", + "sp-io 36.0.0", + "sp-runtime 37.0.0", + "sp-state-machine 0.41.0", + "sp-version 35.0.0", + "sp-wasm-interface 21.0.0", + "substrate-runtime-proposal-hash", + "thiserror", + "wasm-loader", +] + [[package]] name = "wasm-timer" version = "0.2.5" @@ -25351,7 +26476,7 @@ dependencies = [ "serde_derive", "serde_json", "smallvec", - "sp-api", + "sp-api 26.0.0", "sp-application-crypto 30.0.0", "sp-arithmetic 23.0.0", "sp-authority-discovery", @@ -25372,7 +26497,7 @@ dependencies = [ "sp-storage 19.0.0", "sp-tracing 16.0.0", "sp-transaction-pool", - "sp-version", + "sp-version 29.0.0", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -25732,6 +26857,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "wyz" version = "0.5.1" @@ -25904,7 +27039,7 @@ dependencies = [ "pallet-xcm", "parity-scale-codec", "scale-info", - "sp-api", + "sp-api 26.0.0", "sp-io 30.0.0", "sp-tracing 16.0.0", "sp-weights 27.0.0", @@ -26087,7 +27222,7 @@ dependencies = [ "futures-util", "lazy_static", "parity-scale-codec", - "reqwest", + "reqwest 0.11.20", "serde", "serde_json", "thiserror", @@ -26131,7 +27266,7 @@ dependencies = [ "multiaddr 0.18.1", "rand", "regex", - "reqwest", + "reqwest 0.11.20", "serde", "serde_json", "sha2 0.10.8", @@ -26174,7 +27309,7 @@ dependencies = [ "kube", "nix 0.27.1", "regex", - "reqwest", + "reqwest 0.11.20", "serde", "serde_json", "serde_yaml", @@ -26219,7 +27354,7 @@ dependencies = [ "nix 0.27.1", "rand", "regex", - "reqwest", + "reqwest 0.11.20", "thiserror", "tokio", "tracing", diff --git a/Cargo.toml b/Cargo.toml index a3c89a74bd68..463cf82a1de7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -236,6 +236,7 @@ members = [ "polkadot/xcm/xcm-simulator", "polkadot/xcm/xcm-simulator/example", "polkadot/xcm/xcm-simulator/fuzzer", + "polkadot/zombienet-sdk-tests", "substrate/bin/node/bench", "substrate/bin/node/cli", "substrate/bin/node/inspect", diff --git a/polkadot/zombienet-sdk-tests/Cargo.toml b/polkadot/zombienet-sdk-tests/Cargo.toml new file mode 100644 index 000000000000..3374ad572b9f --- /dev/null +++ b/polkadot/zombienet-sdk-tests/Cargo.toml @@ -0,0 +1,27 @@ +[package] +name = "polkadot-zombienet-sdk-tests" +version = "0.1.0" +description = "Zomebienet-sdk tests." +authors.workspace = true +edition.workspace = true +license.workspace = true +publish = false + +[dependencies] +env_logger = "0.11.2" +log = "0.4" +subxt = { version = "0.37", features = ["substrate-compat"] } +subxt-signer = { version = "0.37" } +tokio = { version = "1.36.0", features = ["rt-multi-thread"] } +anyhow = "1.0.81" +zombienet-sdk = "0.2.6" +serde = "1.0.197" +serde_json = "1.0.114" +parity-scale-codec = { version = "3.6.9", features = ["derive"] } + +[features] +zombie-metadata = [] + +[build-dependencies] +substrate-build-script-utils = { workspace = true, default-features = true } +subwasmlib = { git = "https://github.com/chevdor/subwasm", rev = "v0.21.3" } diff --git a/polkadot/zombienet-sdk-tests/build.rs b/polkadot/zombienet-sdk-tests/build.rs new file mode 100644 index 000000000000..240d86386af2 --- /dev/null +++ b/polkadot/zombienet-sdk-tests/build.rs @@ -0,0 +1,151 @@ +// Copyright (C) Parity Technologies (UK) Ltd. +// SPDX-License-Identifier: Apache-2.0 + +use std::{ + env, fs, path, + path::{Path, PathBuf}, + process::Command, +}; + +use subwasmlib::{source::Source, OutputFormat, Subwasm}; + +macro_rules! debug_output { + ($($tokens: tt)*) => { + if env::var("ZOMBIE_METADATA_BUILD_DEBUG").is_ok() { + println!("cargo:warning={}", format!($($tokens)*)) + } + } +} + +fn replace_dashes(k: &str) -> String { + k.replace('-', "_") +} + +fn make_env_key(k: &str) -> String { + replace_dashes(&k.to_ascii_uppercase()) +} + +fn find_wasm(chain: &str) -> Option { + const PROFILES: [&str; 2] = ["release", "testnet"]; + let manifest_path = env::var("CARGO_WORKSPACE_ROOT_DIR").unwrap(); + let manifest_path = manifest_path.strip_suffix('/').unwrap(); + debug_output!("manifest_path is : {}", manifest_path); + let package = format!("{chain}-runtime"); + let profile = PROFILES.into_iter().find(|p| { + let full_path = format!( + "{}/target/{}/wbuild/{}/{}.wasm", + manifest_path, + p, + &package, + replace_dashes(&package) + ); + debug_output!("checking wasm at : {}", full_path); + matches!(path::PathBuf::from(&full_path).try_exists(), Ok(true)) + }); + + debug_output!("profile is : {:?}", profile); + profile.map(|profile| { + PathBuf::from(&format!( + "{}/target/{}/wbuild/{}/{}.wasm", + manifest_path, + profile, + &package, + replace_dashes(&package) + )) + }) +} + +// based on https://gist.github.com/s0me0ne-unkn0wn/bbd83fe32ce10327086adbf13e750eec +fn build_wasm(chain: &str) -> PathBuf { + let package = format!("{chain}-runtime"); + + let cargo = env::var("CARGO").unwrap(); + let target = env::var("TARGET").unwrap(); + let out_dir = env::var("OUT_DIR").unwrap(); + let target_dir = format!("{}/runtimes", out_dir); + let args = vec![ + "build", + "-p", + &package, + "--profile", + "release", + "--target", + &target, + "--target-dir", + &target_dir, + ]; + debug_output!("building metadata with args: {}", args.join(" ")); + Command::new(cargo) + .env_remove("SKIP_WASM_BUILD") // force build to get the metadata + .args(&args) + .status() + .unwrap(); + + let wasm_path = &format!( + "{target_dir}/{target}/release/wbuild/{}/{}.wasm", + &package, + replace_dashes(&package) + ); + PathBuf::from(wasm_path) +} + +fn generate_metadata_file(wasm_path: &Path, output_path: &Path) { + let source = Source::from_options(Some(wasm_path.to_path_buf()), None, None, None).unwrap(); + let subwasm = Subwasm::new(&source.try_into().unwrap()).unwrap(); + let mut output_file = std::fs::File::create(output_path).unwrap(); + subwasm.write_metadata(OutputFormat::Scale, None, &mut output_file).unwrap(); +} + +fn fetch_metadata_file(chain: &str, output_path: &Path) { + // First check if we have an explicit path to use + let env_key = format!("{}_METADATA_FILE", make_env_key(chain)); + + if let Ok(path_to_use) = env::var(env_key) { + debug_output!("metadata file to use (from env): {}\n", path_to_use); + let metadata_file = PathBuf::from(&path_to_use); + fs::copy(metadata_file, output_path).unwrap(); + } else if let Some(exisiting_wasm) = find_wasm(chain) { + debug_output!("exisiting wasm: {:?}", exisiting_wasm); + // generate metadata + generate_metadata_file(&exisiting_wasm, output_path); + } else { + // build runtime + let wasm_path = build_wasm(chain); + debug_output!("created wasm: {:?}", wasm_path); + // genetate metadata + generate_metadata_file(&wasm_path, output_path); + } +} + +fn main() { + if env::var("CARGO_FEATURE_ZOMBIE_METADATA").is_err() { + debug_output!("zombie-metadata feature not enabled, not need to check metadata files."); + return; + } + + // Ensure we have the needed metadata files in place to run zombienet tests + let manifest_path = env::var("CARGO_MANIFEST_DIR").unwrap(); + const METADATA_DIR: &str = "metadata-files"; + const CHAINS: [&str; 2] = ["rococo", "coretime-rococo"]; + + let metadata_path = format!("{manifest_path}/{METADATA_DIR}"); + + for chain in CHAINS { + let full_path = format!("{metadata_path}/{chain}-local.scale"); + let output_path = path::PathBuf::from(&full_path); + + match output_path.try_exists() { + Ok(true) => { + debug_output!("got: {}", full_path); + }, + _ => { + debug_output!("needs: {}", full_path); + fetch_metadata_file(chain, &output_path); + }, + }; + } + + substrate_build_script_utils::generate_cargo_keys(); + substrate_build_script_utils::rerun_if_git_head_changed(); + println!("cargo:rerun-if-changed={}", metadata_path); +} diff --git a/polkadot/zombienet-sdk-tests/metadata-files/.gitkeep b/polkadot/zombienet-sdk-tests/metadata-files/.gitkeep new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/polkadot/zombienet-sdk-tests/src/lib.rs b/polkadot/zombienet-sdk-tests/src/lib.rs new file mode 100644 index 000000000000..fe0aa995d77a --- /dev/null +++ b/polkadot/zombienet-sdk-tests/src/lib.rs @@ -0,0 +1,2 @@ +// Copyright (C) Parity Technologies (UK) Ltd. +// SPDX-License-Identifier: Apache-2.0 diff --git a/polkadot/zombienet-sdk-tests/tests/lib.rs b/polkadot/zombienet-sdk-tests/tests/lib.rs new file mode 100644 index 000000000000..74cdc0765600 --- /dev/null +++ b/polkadot/zombienet-sdk-tests/tests/lib.rs @@ -0,0 +1,4 @@ +// Copyright (C) Parity Technologies (UK) Ltd. +// SPDX-License-Identifier: Apache-2.0 + +mod smoke; diff --git a/polkadot/zombienet-sdk-tests/tests/smoke/coretime_revenue.rs b/polkadot/zombienet-sdk-tests/tests/smoke/coretime_revenue.rs new file mode 100644 index 000000000000..7880dc782d05 --- /dev/null +++ b/polkadot/zombienet-sdk-tests/tests/smoke/coretime_revenue.rs @@ -0,0 +1,505 @@ +// Copyright (C) Parity Technologies (UK) Ltd. +// SPDX-License-Identifier: Apache-2.0 + +//! Binaries for this test should be built with `fast-runtime` feature enabled: +//! `cargo build -r -F fast-runtime -p polkadot-parachain-bin && \` +//! `cargo build -r -F fast-runtime --bin polkadot --bin polkadot-execute-worker --bin +//! polkadot-prepare-worker` +//! +//! Running with normal runtimes is possible but would take ages. Running fast relay runtime with +//! 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, + }, + xcm::{VersionedAssets, VersionedLocation}, +}; +use serde_json::json; +use std::{fmt::Display, sync::Arc}; +use subxt::{events::StaticEvent, utils::AccountId32, OnlineClient, PolkadotConfig}; +use subxt_signer::sr25519::dev; +use tokio::sync::RwLock; +use zombienet_sdk::NetworkConfigBuilder; + +use coretime_rococo::{ + self as coretime_api, + broker::events as broker_events, + runtime_types::{ + pallet_broker::types::{ConfigRecord as BrokerConfigRecord, Finality as BrokerFinality}, + sp_arithmetic::per_things::Perbill, + }, +}; + +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; + +// On-demand coretime base fee (set at the genesis) +const ON_DEMAND_BASE_FEE: u128 = 50_000_000; + +async fn get_total_issuance( + relay: OnlineClient, + coretime: OnlineClient, +) -> (u128, u128) { + ( + relay + .storage() + .at_latest() + .await + .unwrap() + .fetch(&rococo_api::storage().balances().total_issuance()) + .await + .unwrap() + .unwrap(), + coretime + .storage() + .at_latest() + .await + .unwrap() + .fetch(&coretime_api::storage().balances().total_issuance()) + .await + .unwrap() + .unwrap(), + ) +} + +async fn assert_total_issuance( + relay: OnlineClient, + coretime: OnlineClient, + ti: (u128, u128), +) { + let actual_ti = get_total_issuance(relay, coretime).await; + log::debug!("Asserting total issuance: actual: {actual_ti:?}, expected: {ti:?}"); + assert_eq!(ti, actual_ti); +} + +type ParaEvents = Arc)>>>; + +macro_rules! trace_event { + ($event:ident : $mod:ident => $($ev:ident),*) => { + match $event.variant_name() { + $( + stringify!($ev) => + log::trace!("{:#?}", $event.as_event::<$mod::$ev>().unwrap().unwrap()), + )* + _ => () + } + }; +} + +async fn para_watcher(api: OnlineClient, events: ParaEvents) +where + ::Number: Display, +{ + let mut blocks_sub = api.blocks().subscribe_finalized().await.unwrap(); + + log::debug!("Starting parachain watcher"); + while let Some(block) = blocks_sub.next().await { + let block = block.unwrap(); + log::debug!("Finalized parachain block {}", block.number()); + + for event in block.events().await.unwrap().iter() { + let event = event.unwrap(); + log::debug!("Got event: {} :: {}", event.pallet_name(), event.variant_name()); + { + events.write().await.push((block.number().into(), event.clone())); + } + + if event.pallet_name() == "Broker" { + trace_event!(event: broker_events => + Purchased, SaleInitialized, HistoryInitialized, CoreAssigned, Pooled, + ClaimsReady, RevenueClaimBegun, RevenueClaimItem, RevenueClaimPaid + ); + } + } + } +} + +async fn wait_for_para_event bool + Copy>( + events: ParaEvents, + pallet: &'static str, + variant: &'static str, + predicate: P, +) -> E { + loop { + let mut events = events.write().await; + if let Some(entry) = events.iter().find(|&e| { + e.1.pallet_name() == pallet && + e.1.variant_name() == variant && + predicate(&e.1.as_event::().unwrap().unwrap()) + }) { + let entry = entry.clone(); + events.retain(|e| e.0 > entry.0); + return entry.1.as_event::().unwrap().unwrap(); + } + drop(events); + tokio::time::sleep(std::time::Duration::from_secs(6)).await; + } +} + +async fn ti_watcher(api: OnlineClient, prefix: &'static str) +where + ::Number: Display, +{ + let mut blocks_sub = api.blocks().subscribe_finalized().await.unwrap(); + + let mut issuance = 0i128; + + log::debug!("Starting parachain watcher"); + while let Some(block) = blocks_sub.next().await { + let block = block.unwrap(); + + let ti = api + .storage() + .at(block.reference()) + .fetch(&rococo_api::storage().balances().total_issuance()) + .await + .unwrap() + .unwrap() as i128; + + let diff = ti - issuance; + if diff != 0 { + log::info!("{} #{} issuance {} ({:+})", prefix, block.number(), ti, diff); + } + issuance = ti; + } +} + +#[tokio::test(flavor = "multi_thread")] +async fn coretime_revenue_test() -> Result<(), anyhow::Error> { + env_logger::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| { + r.with_chain("rococo-local") + .with_default_command("polkadot") + .with_default_image(images.polkadot.as_str()) + .with_genesis_overrides( + json!({ "configuration": { "config": { "scheduler_params": { "on_demand_base_fee": ON_DEMAND_BASE_FEE }}}}), + ) + .with_node(|node| node.with_name("alice")) + .with_node(|node| node.with_name("bob")) + .with_node(|node| node.with_name("charlie")) + }) + .with_parachain(|p| { + p.with_id(1005) + .with_default_command("polkadot-parachain") + .with_default_image(images.cumulus.as_str()) + .with_chain("coretime-rococo-local") + .with_collator(|n| n.with_name("coretime")) + }) + .build() + .map_err(|e| { + let errs = e.into_iter().map(|e| e.to_string()).collect::>().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("alice")?; + let para_node = network.get_node("coretime")?; + + let relay_client: OnlineClient = relay_node.wait_client().await?; + let para_client: OnlineClient = para_node.wait_client().await?; + + // Get total issuance on both sides + let mut total_issuance = get_total_issuance(relay_client.clone(), para_client.clone()).await; + log::info!("Reference total issuance: {total_issuance:?}"); + + // Prepare everything + let alice = dev::alice(); + let alice_acc = AccountId32(alice.public_key().0); + + let bob = dev::bob(); + + let para_events: ParaEvents = Arc::new(RwLock::new(Vec::new())); + let p_api = para_node.wait_client().await?; + let p_events = para_events.clone(); + + let _subscriber = tokio::spawn(async move { + para_watcher(p_api, p_events).await; + }); + + let api: OnlineClient = para_node.wait_client().await?; + let _s1 = tokio::spawn(async move { + ti_watcher(api, "PARA").await; + }); + let api: OnlineClient = relay_node.wait_client().await?; + let _s2 = tokio::spawn(async move { + ti_watcher(api, "RELAY").await; + }); + + log::info!("Initiating teleport from RC's account of Alice to PC's one"); + + // Teleport some Alice's tokens to the Coretime chain. Although her account is pre-funded on + // the PC, that is still neccessary to bootstrap RC's `CheckedAccount`. + relay_client + .tx() + .sign_and_submit_default( + &rococo_api::tx().xcm_pallet().teleport_assets( + VersionedLocation::V4(Location { + parents: 0, + interior: Junctions::X1([Junction::Parachain(1005)]), + }), + VersionedLocation::V4(Location { + parents: 0, + interior: Junctions::X1([Junction::AccountId32 { + network: None, + id: alice.public_key().0, + }]), + }), + VersionedAssets::V4(Assets(vec![Asset { + id: AssetId(Location { parents: 0, interior: Junctions::Here }), + fun: Fungibility::Fungible(1_500_000_000), + }])), + 0, + ), + &alice, + ) + .await?; + + wait_for_para_event( + para_events.clone(), + "Balances", + "Minted", + |e: &coretime_api::balances::events::Minted| e.who == alice_acc, + ) + .await; + + // RC's total issuance doen't change, but PC's one increases after the teleport. + + total_issuance.1 += 1_500_000_000; + assert_total_issuance(relay_client.clone(), para_client.clone(), total_issuance).await; + + log::info!("Initializing broker and starting sales"); + + // Initialize broker and start sales + + para_client + .tx() + .sign_and_submit_default( + &coretime_api::tx().sudo().sudo(CoretimeRuntimeCall::Utility( + CoretimeUtilityCall::batch { + calls: vec![ + CoretimeRuntimeCall::Broker(CoretimeBrokerCall::configure { + config: BrokerConfigRecord { + advance_notice: 5, + interlude_length: 1, + leadin_length: 1, + region_length: 1, + ideal_bulk_proportion: Perbill(100), + limit_cores_offered: None, + renewal_bump: Perbill(10), + contribution_timeout: 5, + }, + }), + CoretimeRuntimeCall::Broker(CoretimeBrokerCall::set_lease { + task: 1005, + until: 1000, + }), + CoretimeRuntimeCall::Broker(CoretimeBrokerCall::start_sales { + end_price: 45_000_000, + extra_cores: 2, + }), + ], + }, + )), + &alice, + ) + .await?; + + log::info!("Waiting for a full-length sale to begin"); + + // Skip the first sale completeley as it may be a short one. Also, `request_code_count` requires + // two session boundaries to propagate. Given that the `fast-runtime` session is 10 blocks and + // the timeslice is 20 blocks, we should be just in time. + + let _: coretime_api::broker::events::SaleInitialized = + wait_for_para_event(para_events.clone(), "Broker", "SaleInitialized", |_| true).await; + log::info!("Skipped short sale"); + + let sale: coretime_api::broker::events::SaleInitialized = + wait_for_para_event(para_events.clone(), "Broker", "SaleInitialized", |_| true).await; + log::info!("{:?}", sale); + + // Alice buys a region + + log::info!("Alice is going to buy a region"); + + para_client + .tx() + .sign_and_submit_default(&coretime_api::tx().broker().purchase(1_000_000_000), &alice) + .await?; + + let purchase = wait_for_para_event( + para_events.clone(), + "Broker", + "Purchased", + |e: &broker_events::Purchased| e.who == alice_acc, + ) + .await; + + let region_begin = purchase.region_id.begin; + + // Somewhere below this point, the revenue from this sale will be teleported to the RC and burnt + // on both chains. Let's account that but not assert just yet. + + total_issuance.0 -= purchase.price; + total_issuance.1 -= purchase.price; + + // Alice pools the region + + log::info!("Alice is going to put the region into the pool"); + + para_client + .tx() + .sign_and_submit_default( + &coretime_api::tx().broker().pool( + purchase.region_id, + alice_acc.clone(), + BrokerFinality::Final, + ), + &alice, + ) + .await?; + + let pooled = wait_for_para_event( + para_events.clone(), + "Broker", + "Pooled", + |e: &broker_events::Pooled| e.region_id.begin == region_begin, + ) + .await; + + // Wait until the beginning of the timeslice where the region belongs to + + log::info!("Waiting for the region to begin"); + + let hist = wait_for_para_event( + para_events.clone(), + "Broker", + "HistoryInitialized", + |e: &broker_events::HistoryInitialized| e.when == pooled.region_id.begin, + ) + .await; + + // Alice's private contribution should be there + + assert!(hist.private_pool_size > 0); + + // Bob places an order to buy insta coretime as RC + + log::info!("Bob is going to buy an on-demand core"); + + let r = relay_client + .tx() + .sign_and_submit_then_watch_default( + &rococo_api::tx() + .on_demand_assignment_provider() + .place_order_allow_death(100_000_000, primitives::Id(100)), + &bob, + ) + .await? + .wait_for_finalized_success() + .await?; + + let order = r + .find_first::()? + .unwrap(); + + // As there's no spot traffic, Bob will only pay base fee + + assert_eq!(order.spot_price, ON_DEMAND_BASE_FEE); + + // Somewhere below this point, revenue is generated and is teleported to the PC (that happens + // once a timeslice so we're not ready to assert it yet, let's just account). That checks out + // tokens from the RC and mints them on the PC. + + total_issuance.1 += ON_DEMAND_BASE_FEE; + + // As soon as the PC receives the tokens, it divides them half by half into system and private + // contributions (we have 3 cores, one is leased to Coretime itself, one is pooled by the + // system, and one is pooled by Alice). + + // Now we're waiting for the moment when Alice may claim her revenue + + log::info!("Waiting for Alice's revenue to be ready to claim"); + + let claims_ready = wait_for_para_event( + para_events.clone(), + "Broker", + "ClaimsReady", + |e: &broker_events::ClaimsReady| e.when == pooled.region_id.begin, + ) + .await; + + // The revenue should be half of the spot price, which is equal to the base fee. + + assert_eq!(claims_ready.private_payout, ON_DEMAND_BASE_FEE / 2); + + // By this moment, we're sure that revenue was received by the PC and can assert the total + // issuance + + assert_total_issuance(relay_client.clone(), para_client.clone(), total_issuance).await; + + // Alice claims her revenue + + log::info!("Alice is going to claim her revenue"); + + para_client + .tx() + .sign_and_submit_default( + &coretime_api::tx().broker().claim_revenue(pooled.region_id, pooled.duration), + &alice, + ) + .await?; + + let claim_paid = wait_for_para_event( + para_events.clone(), + "Broker", + "RevenueClaimPaid", + |e: &broker_events::RevenueClaimPaid| e.who == alice_acc, + ) + .await; + + log::info!("Revenue claimed, waiting for 2 timeslices until the system revenue is burnt"); + + assert_eq!(claim_paid.amount, ON_DEMAND_BASE_FEE / 2); + + // As for the system revenue, it is teleported back to the RC and burnt there. Those burns are + // batched and are processed once a timeslice, after a new one starts. So we have to wait for + // two timeslice boundaries to pass to be sure the teleport has already happened somewhere in + // between. + + let _: coretime_api::broker::events::SaleInitialized = + wait_for_para_event(para_events.clone(), "Broker", "SaleInitialized", |_| true).await; + + total_issuance.0 -= ON_DEMAND_BASE_FEE / 2; + total_issuance.1 -= ON_DEMAND_BASE_FEE / 2; + + let _: coretime_api::broker::events::SaleInitialized = + wait_for_para_event(para_events.clone(), "Broker", "SaleInitialized", |_| true).await; + + assert_total_issuance(relay_client.clone(), para_client.clone(), total_issuance).await; + + log::info!("Test finished successfuly"); + + Ok(()) +} diff --git a/polkadot/zombienet-sdk-tests/tests/smoke/mod.rs b/polkadot/zombienet-sdk-tests/tests/smoke/mod.rs new file mode 100644 index 000000000000..a3fe15382674 --- /dev/null +++ b/polkadot/zombienet-sdk-tests/tests/smoke/mod.rs @@ -0,0 +1,5 @@ +// Copyright (C) Parity Technologies (UK) Ltd. +// SPDX-License-Identifier: Apache-2.0 + +#[cfg(feature = "zombie-metadata")] +mod coretime_revenue;