From 0dfb858b3809ec84fca11d5ed22c4b334b2e10f5 Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Mon, 22 Jan 2024 17:27:00 +0400 Subject: [PATCH 01/29] feat: update all deps to polkadot v1.1.0 --- Cargo.lock | 6701 +++++++++++++++++++++++++++---------------- Cargo.toml | 288 +- rust-toolchain.toml | 2 +- 3 files changed, 4338 insertions(+), 2653 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e693930b78..71a940d713 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -188,6 +188,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + [[package]] name = "always-assert" version = "0.1.3" @@ -220,16 +226,15 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] @@ -259,12 +264,12 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -282,12 +287,211 @@ dependencies = [ "num-traits", ] +[[package]] +name = "aquamarine" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1da02abba9f9063d786eab1509833ebb2fac0f966862ca59439c76b9c566760" +dependencies = [ + "include_dir", + "itertools 0.10.5", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "arc-swap" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +[[package]] +name = "ark-bls12-381" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c775f0d12169cba7aae4caeb547bb6a50781c7449a8aa53793827c9ec4abf488" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", +] + +[[package]] +name = "ark-ec" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" +dependencies = [ + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", + "itertools 0.10.5", + "num-traits", + "zeroize", +] + +[[package]] +name = "ark-ed-on-bls12-381-bandersnatch" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9cde0f2aa063a2a5c28d39b47761aa102bda7c13c84fc118a61b87c7b2f785c" +dependencies = [ + "ark-bls12-381", + "ark-ec", + "ark-ff", + "ark-std", +] + +[[package]] +name = "ark-ff" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" +dependencies = [ + "ark-ff-asm", + "ark-ff-macros", + "ark-serialize", + "ark-std", + "derivative", + "digest 0.10.7", + "itertools 0.10.5", + "num-bigint", + "num-traits", + "paste", + "rustc_version 0.4.0", + "zeroize", +] + +[[package]] +name = "ark-ff-asm" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" +dependencies = [ + "num-bigint", + "num-traits", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-poly" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" +dependencies = [ + "ark-ff", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", +] + +[[package]] +name = "ark-scale" +version = "0.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49b08346a3e38e2be792ef53ee168623c9244d968ff00cd70fb9932f6fe36393" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", + "parity-scale-codec", +] + +[[package]] +name = "ark-scale" +version = "0.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f69c00b3b529be29528a6f2fd5fa7b1790f8bed81b9cdca17e326538545a179" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", + "parity-scale-codec", + "scale-info", +] + +[[package]] +name = "ark-secret-scalar" +version = "0.0.2" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", + "ark-transcript", + "digest 0.10.7", + "rand_core 0.6.4", + "zeroize", +] + +[[package]] +name = "ark-serialize" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" +dependencies = [ + "ark-serialize-derive", + "ark-std", + "digest 0.10.7", + "num-bigint", +] + +[[package]] +name = "ark-serialize-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-std" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + +[[package]] +name = "ark-transcript" +version = "0.0.2" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +dependencies = [ + "ark-ff", + "ark-serialize", + "ark-std", + "digest 0.10.7", + "rand_core 0.6.4", + "sha3", +] + [[package]] name = "array-bytes" version = "4.2.0" @@ -315,6 +519,15 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +[[package]] +name = "arrayvec" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" +dependencies = [ + "nodrop", +] + [[package]] name = "arrayvec" version = "0.5.2" @@ -340,7 +553,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.23", + "time", ] [[package]] @@ -356,7 +569,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.23", + "time", ] [[package]] @@ -407,7 +620,7 @@ dependencies = [ "num_enum 0.5.11", "parity-scale-codec", "scale-info", - "sp-runtime", + "sp-runtime 24.0.0", ] [[package]] @@ -441,9 +654,9 @@ dependencies = [ "fp-evm", "fp-rpc", "fp-storage", - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-benchmarking-cli", - "frame-system", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-try-runtime", "futures 0.3.28", "jsonrpsee", @@ -461,7 +674,7 @@ dependencies = [ "pallet-transaction-payment-rpc", "parity-scale-codec", "polkadot-cli", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "polkadot-service", @@ -488,22 +701,22 @@ dependencies = [ "serde_json", "shibuya-runtime", "shiden-runtime", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-aura", - "sp-core", - "sp-inherents", - "sp-io", + "sp-core 21.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-io 23.0.0", "sp-keyring", - "sp-keystore", + "sp-keystore 0.27.0", "sp-offchain", - "sp-runtime", + "sp-runtime 24.0.0", "sp-session", "sp-timestamp", "sp-transaction-pool", - "sp-trie", + "sp-trie 22.0.0", "substrate-build-script-utils", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", @@ -519,8 +732,8 @@ dependencies = [ "ethereum", "ethereum-types", "fp-evm", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "impl-trait-for-tuples", "log", "orml-traits", @@ -531,14 +744,14 @@ dependencies = [ "pallet-xc-asset-config", "parity-scale-codec", "scale-info", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "sp-arithmetic 16.0.0", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", ] [[package]] @@ -557,10 +770,10 @@ dependencies = [ "cumulus-primitives-utility", "fp-rpc", "fp-self-contained", - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-executive", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -580,7 +793,7 @@ dependencies = [ "pallet-collator-selection", "pallet-collective", "pallet-contracts", - "pallet-contracts-primitives", + "pallet-contracts-primitives 24.0.0", "pallet-dapps-staking", "pallet-dynamic-evm-base-fee", "pallet-ethereum", @@ -611,42 +824,42 @@ dependencies = [ "pallet-xcm", "parachain-info", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "precompile-utils", "scale-info", "smallvec 1.11.0", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-block-builder", "sp-consensus-aura", - "sp-core", - "sp-inherents", - "sp-io", + "sp-core 21.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-io 23.0.0", "sp-offchain", - "sp-runtime", - "sp-runtime-interface", + "sp-runtime 24.0.0", + "sp-runtime-interface 17.0.0", "sp-session", - "sp-std", + "sp-std 8.0.0", "sp-transaction-pool", - "sp-version", + "sp-version 22.0.0", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] name = "astar-test-utils" version = "0.1.0" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "pallet-contracts", - "pallet-contracts-primitives", + "pallet-contracts-primitives 24.0.0", "parity-scale-codec", "scale-info", - "sp-runtime", + "sp-runtime 24.0.0", ] [[package]] @@ -654,9 +867,9 @@ name = "astar-xcm-benchmarks" version = "0.1.0" dependencies = [ "astar-primitives", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "pallet-assets", "pallet-balances", @@ -664,13 +877,13 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", ] [[package]] @@ -680,8 +893,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +dependencies = [ + "concurrent-queue", + "event-listener 4.0.3", + "event-listener-strategy", "futures-core", + "pin-project-lite 0.2.13", +] + +[[package]] +name = "async-executor" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" +dependencies = [ + "async-lock 2.7.0", + "async-task", + "concurrent-queue", + "fastrand 2.0.0", + "futures-lite 1.13.0", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock 2.7.0", + "autocfg", + "blocking", + "futures-lite 1.13.0", ] [[package]] @@ -690,27 +942,85 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", + "async-lock 2.7.0", "autocfg", "cfg-if", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "log", "parking", - "polling", + "polling 2.8.0", "rustix 0.37.23", "slab", "socket2 0.4.9", "waker-fn", ] +[[package]] +name = "async-io" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb41eb19024a91746eba0773aa5e16036045bbf45733766661099e182ea6a744" +dependencies = [ + "async-lock 3.3.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.1.0", + "parking", + "polling 3.3.2", + "rustix 0.38.25", + "slab", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "async-lock" version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" dependencies = [ - "event-listener", + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +dependencies = [ + "event-listener 4.0.3", + "event-listener-strategy", + "pin-project-lite 0.2.13", +] + +[[package]] +name = "async-net" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0434b1ed18ce1cf5769b8ac540e33f01fa9471058b5e89da9e06f3c882a8c12f" +dependencies = [ + "async-io 1.13.0", + "blocking", + "futures-lite 1.13.0", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.7.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.25", + "windows-sys 0.48.0", ] [[package]] @@ -721,9 +1031,33 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", +] + +[[package]] +name = "async-signal" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +dependencies = [ + "async-io 2.3.0", + "async-lock 2.7.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.25", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", ] +[[package]] +name = "async-task" +version = "4.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" + [[package]] name = "async-trait" version = "0.1.73" @@ -732,7 +1066,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -759,6 +1093,12 @@ dependencies = [ "pin-project-lite 0.2.13", ] +[[package]] +name = "atomic-take" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8ab6b55fe97976e46f91ddbed8d147d966475dc29b2032757ba47e02376fbc3" + [[package]] name = "atomic-waker" version = "1.1.1" @@ -809,6 +1149,28 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "bandersnatch_vrfs" +version = "0.0.1" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +dependencies = [ + "ark-bls12-381", + "ark-ec", + "ark-ed-on-bls12-381-bandersnatch", + "ark-ff", + "ark-scale 0.0.12", + "ark-serialize", + "ark-std", + "dleq_vrf", + "fflonk", + "merlin 3.0.0", + "rand_chacha 0.3.1", + "rand_core 0.6.4", + "ring 0.1.0", + "sha2 0.10.7", + "zeroize", +] + [[package]] name = "base-x" version = "0.2.11" @@ -872,7 +1234,7 @@ dependencies = [ [[package]] name = "binary-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "hash-db 0.16.0", "log", @@ -905,9 +1267,24 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.32", + "syn 2.0.48", +] + +[[package]] +name = "bip39" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f" +dependencies = [ + "bitcoin_hashes", ] +[[package]] +name = "bitcoin_hashes" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4" + [[package]] name = "bitflags" version = "1.3.2" @@ -916,9 +1293,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "bitvec" @@ -941,6 +1318,16 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "blake2-rfc" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" +dependencies = [ + "arrayvec 0.4.12", + "constant_time_eq 0.1.5", +] + [[package]] name = "blake2b_simd" version = "1.0.1" @@ -1032,6 +1419,22 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" +[[package]] +name = "blocking" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +dependencies = [ + "async-channel 2.1.1", + "async-lock 3.3.0", + "async-task", + "fastrand 2.0.0", + "futures-io", + "futures-lite 2.1.0", + "piper", + "tracing", +] + [[package]] name = "bounded-collections" version = "0.1.8" @@ -1203,11 +1606,12 @@ checksum = "fd6c0e7b807d60291f42f33f58480c0bfafe28ed08286446f45e463728cf9c1c" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -1232,9 +1636,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.3" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c" +checksum = "6100bc57b6209840798d95cb2775684849d332f7bd788db2a8c8caf7ef82a41a" dependencies = [ "smallvec 1.11.0", ] @@ -1253,53 +1657,51 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chacha20" -version = "0.8.2" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ "cfg-if", - "cipher 0.3.0", + "cipher 0.4.4", "cpufeatures", - "zeroize", ] [[package]] name = "chacha20poly1305" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" +checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ - "aead 0.4.3", + "aead 0.5.2", "chacha20", - "cipher 0.3.0", + "cipher 0.4.4", "poly1305", "zeroize", ] [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets 0.48.1", ] [[package]] name = "cid" -version = "0.8.6" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ed9c8b2d17acb8110c46f1da5bf4a696d745e1474a16db0cd2b49cd0249bf2" +checksum = "b9b68e3193982cd54187d71afdb2a271ad4cf8af157858e9cb911b91321de143" dependencies = [ "core2", "multibase", - "multihash 0.16.3", + "multihash", "serde", "unsigned-varint", ] @@ -1330,6 +1732,7 @@ checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ "crypto-common", "inout", + "zeroize", ] [[package]] @@ -1354,20 +1757,19 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.11" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d" +checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.3.11" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b" +checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" dependencies = [ "anstream", "anstyle", @@ -1377,21 +1779,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "coarsetime" @@ -1475,15 +1877,35 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "comfy-table" -version = "6.2.0" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e959d788268e3bf9d35ace83e81b124190378e4c91c9067524675e33394b8ba" +checksum = "7c64043d6c7b7a4c58e39e7efccfdea7b93d885a795d0c054a69dbbf4dd52686" dependencies = [ - "strum 0.24.1", - "strum_macros 0.24.3", + "strum 0.25.0", + "strum_macros 0.25.2", "unicode-width", ] +[[package]] +name = "common" +version = "0.1.0" +source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "fflonk", + "merlin 3.0.0", +] + +[[package]] +name = "common-path" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101" + [[package]] name = "concurrent-queue" version = "2.2.0" @@ -1524,6 +1946,32 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6340df57935414636969091153f35f68d9f00bbc8fb4a9c6054706c213e6c6bc" +[[package]] +name = "const-random" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom 0.2.10", + "once_cell", + "tiny-keccak", +] + +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + [[package]] name = "constant_time_eq" version = "0.2.6" @@ -1686,7 +2134,7 @@ dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", - "itertools", + "itertools 0.10.5", "log", "smallvec 1.11.0", "wasmparser", @@ -1852,22 +2300,23 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "clap", "parity-scale-codec", "sc-chain-spec", "sc-cli", + "sc-client-api", "sc-service", - "sp-core", - "sp-runtime", + "sp-core 21.0.0", + "sp-runtime 24.0.0", "url", ] [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", @@ -1880,46 +2329,50 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "sc-client-api", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-consensus", - "sp-core", - "sp-runtime", + "sp-core 21.0.0", + "sp-runtime 24.0.0", "tracing", ] [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "cumulus-client-collator", "cumulus-client-consensus-common", "cumulus-client-consensus-proposer", + "cumulus-primitives-aura", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", "cumulus-relay-chain-interface", "futures 0.3.28", "parity-scale-codec", "polkadot-node-primitives", + "polkadot-node-subsystem", "polkadot-overseer", "polkadot-primitives", "sc-client-api", "sc-consensus", "sc-consensus-aura", + "sc-consensus-babe", "sc-consensus-slots", "sc-telemetry", - "sp-api", - "sp-application-crypto", + "schnellru", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-application-crypto 23.0.0", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-aura", - "sp-core", - "sp-inherents", - "sp-keystore", - "sp-runtime", - "sp-state-machine", + "sp-core 21.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-keystore 0.27.0", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", "sp-timestamp", "substrate-prometheus-endpoint", "tracing", @@ -1928,7 +2381,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "cumulus-client-pov-recovery", @@ -1941,12 +2394,15 @@ dependencies = [ "polkadot-primitives", "sc-client-api", "sc-consensus", + "sc-consensus-babe", "schnellru", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-runtime", - "sp-trie", + "sp-consensus-slots", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-timestamp", + "sp-trie 22.0.0", "substrate-prometheus-endpoint", "tracing", ] @@ -1954,22 +2410,22 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-proposer" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "anyhow", "async-trait", "cumulus-primitives-parachain-inherent", "sp-consensus", - "sp-inherents", - "sp-runtime", - "sp-state-machine", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", "thiserror", ] [[package]] name = "cumulus-client-consensus-relay-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -1978,13 +2434,13 @@ dependencies = [ "futures 0.3.28", "parking_lot 0.12.1", "sc-consensus", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-inherents", - "sp-runtime", + "sp-core 21.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-runtime 24.0.0", "substrate-prometheus-endpoint", "tracing", ] @@ -1992,7 +2448,7 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "cumulus-relay-chain-interface", @@ -2001,21 +2457,21 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "polkadot-node-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "sc-client-api", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-runtime", - "sp-state-machine", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", "tracing", ] [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2032,14 +2488,14 @@ dependencies = [ "sc-consensus", "sp-consensus", "sp-maybe-compressed-blob", - "sp-runtime", + "sp-runtime 24.0.0", "tracing", ] [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", @@ -2063,144 +2519,162 @@ dependencies = [ "sc-telemetry", "sc-transaction-pool", "sc-utils", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-runtime", + "sp-core 21.0.0", + "sp-runtime 24.0.0", "sp-transaction-pool", ] [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support", - "frame-system", + "cumulus-pallet-parachain-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "pallet-aura", + "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto", + "sp-application-crypto 23.0.0", "sp-consensus-aura", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "cumulus-primitives-core", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", - "xcm", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "staging-xcm", ] [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "bytes", "cumulus-pallet-parachain-system-proc-macro", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", "environmental", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "impl-trait-for-tuples", "log", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "scale-info", - "sp-core", - "sp-externalities", - "sp-inherents", - "sp-io", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", - "sp-version", - "xcm", + "sp-core 21.0.0", + "sp-externalities 0.19.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", + "sp-std 8.0.0", + "sp-trie 22.0.0", + "sp-version 22.0.0", + "staging-xcm", + "trie-db", ] [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "cumulus-primitives-core", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", - "xcm", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "staging-xcm", ] [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "cumulus-primitives-core", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "parity-scale-codec", "polkadot-runtime-common", "rand_chacha 0.3.1", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", - "xcm", - "xcm-executor", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "staging-xcm", + "staging-xcm-executor", +] + +[[package]] +name = "cumulus-primitives-aura" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-primitives", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-consensus-aura", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "scale-info", - "sp-api", - "sp-runtime", - "sp-std", - "sp-trie", - "xcm", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "sp-trie 22.0.0", + "staging-xcm", ] [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2209,52 +2683,52 @@ dependencies = [ "parity-scale-codec", "sc-client-api", "scale-info", - "sp-api", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-storage", - "sp-trie", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-core 21.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", + "sp-std 8.0.0", + "sp-storage 13.0.0", + "sp-trie 22.0.0", "tracing", ] [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "cumulus-primitives-core", "futures 0.3.28", "parity-scale-codec", - "sp-inherents", - "sp-std", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-std 8.0.0", "sp-timestamp", ] [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "cumulus-primitives-core", - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "parity-scale-codec", "polkadot-runtime-common", - "sp-io", - "sp-runtime", - "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", ] [[package]] name = "cumulus-relay-chain-inprocess-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2262,24 +2736,23 @@ dependencies = [ "futures 0.3.28", "futures-timer", "polkadot-cli", - "polkadot-client", "polkadot-service", "sc-cli", "sc-client-api", "sc-sysinfo", "sc-telemetry", "sc-tracing", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-consensus", - "sp-core", - "sp-runtime", - "sp-state-machine", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", ] [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2288,16 +2761,16 @@ dependencies = [ "parity-scale-codec", "polkadot-overseer", "sc-client-api", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-blockchain", - "sp-state-machine", + "sp-state-machine 0.28.0", "thiserror", ] [[package]] name = "cumulus-relay-chain-minimal-node" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "array-bytes 6.1.0", "async-trait", @@ -2305,7 +2778,6 @@ dependencies = [ "cumulus-relay-chain-interface", "cumulus-relay-chain-rpc-interface", "futures 0.3.28", - "lru 0.9.0", "polkadot-availability-recovery", "polkadot-collator-protocol", "polkadot-core-primitives", @@ -2317,47 +2789,53 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "sc-authority-discovery", - "sc-client-api", "sc-network", "sc-network-common", "sc-service", "sc-tracing", "sc-utils", - "sp-api", - "sp-blockchain", + "schnellru", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-consensus", "sp-consensus-babe", - "sp-runtime", - "tokio", + "sp-runtime 24.0.0", "tracing", ] [[package]] name = "cumulus-relay-chain-rpc-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", + "either", "futures 0.3.28", "futures-timer", "jsonrpsee", - "lru 0.9.0", "parity-scale-codec", + "pin-project", "polkadot-overseer", + "rand 0.8.5", "sc-client-api", "sc-rpc-api", "sc-service", + "schnellru", "serde", "serde_json", - "sp-api", + "smoldot", + "smoldot-light", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-authority-discovery", "sp-consensus-babe", - "sp-core", - "sp-state-machine", - "sp-storage", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", + "sp-storage 13.0.0", + "thiserror", "tokio", + "tokio-util", "tracing", "url", ] @@ -2365,14 +2843,15 @@ dependencies = [ [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", "polkadot-primitives", - "sp-runtime", - "sp-state-machine", - "sp-std", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", + "sp-std 8.0.0", + "sp-trie 22.0.0", ] [[package]] @@ -2403,18 +2882,45 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-rc.1" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d4ba9852b42210c7538b75484f9daa0655e9a3ac04f693747bb0f02cf3cfe16" +checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" dependencies = [ "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", "fiat-crypto", - "packed_simd_2", - "platforms 3.0.2", + "platforms", + "rustc_version 0.4.0", "subtle", "zeroize", ] +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "curve25519-dalek-ng" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8" +dependencies = [ + "byteorder", + "digest 0.9.0", + "rand_core 0.6.4", + "subtle-ng", + "zeroize", +] + [[package]] name = "cxx" version = "1.0.100" @@ -2439,7 +2945,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -2456,7 +2962,7 @@ checksum = "81b2dab6991c7ab1572fea8cb049db819b1aeea1e2dac74c0869f244d9f21a7c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -2464,8 +2970,8 @@ name = "dapp-staking-v3-runtime-api" version = "0.0.1-alpha" dependencies = [ "astar-primitives", - "sp-api", - "sp-std", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-std 8.0.0", ] [[package]] @@ -2735,7 +3241,51 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", +] + +[[package]] +name = "dleq_vrf" +version = "0.0.2" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-scale 0.0.10", + "ark-secret-scalar", + "ark-serialize", + "ark-std", + "ark-transcript", + "arrayvec 0.7.4", + "rand_core 0.6.4", + "zeroize", +] + +[[package]] +name = "docify" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cc4fd38aaa9fb98ac70794c82a00360d1e165a87fbf96a8a91f9dfc602aaee2" +dependencies = [ + "docify_macros", +] + +[[package]] +name = "docify_macros" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63fa215f3a0d40fb2a221b3aa90d8e1fbb8379785a990cb60d62ac71ebdc6460" +dependencies = [ + "common-path", + "derive-syn-parse", + "once_cell", + "proc-macro2", + "quote", + "regex", + "syn 2.0.48", + "termcolor", + "toml 0.8.2", + "walkdir", ] [[package]] @@ -2785,9 +3335,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.11" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" +checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" [[package]] name = "ecdsa" @@ -2824,6 +3374,16 @@ dependencies = [ "signature 1.6.4", ] +[[package]] +name = "ed25519" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" +dependencies = [ + "pkcs8 0.10.2", + "signature 2.1.0", +] + [[package]] name = "ed25519-dalek" version = "1.0.1" @@ -2831,13 +3391,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ "curve25519-dalek 3.2.0", - "ed25519", - "rand 0.7.3", - "serde", + "ed25519 1.5.3", "sha2 0.9.9", "zeroize", ] +[[package]] +name = "ed25519-dalek" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" +dependencies = [ + "curve25519-dalek 4.1.1", + "ed25519 2.2.3", + "rand_core 0.6.4", + "serde", + "sha2 0.10.7", + "subtle", + "zeroize", +] + [[package]] name = "ed25519-zebra" version = "3.1.0" @@ -2852,11 +3425,26 @@ dependencies = [ "zeroize", ] +[[package]] +name = "ed25519-zebra" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9" +dependencies = [ + "curve25519-dalek 4.1.1", + "ed25519 2.2.3", + "hashbrown 0.14.0", + "hex", + "rand_core 0.6.4", + "sha2 0.10.7", + "zeroize", +] + [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "elliptic-curve" @@ -2962,18 +3550,18 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] name = "enumn" -version = "0.1.10" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9838a970f5de399d3070ae1739e131986b2f5dcc223c7423ca0927e3a878522" +checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -3186,7 +3774,7 @@ dependencies = [ "regex", "serde", "serde_json", - "syn 2.0.32", + "syn 2.0.48", "toml 0.7.6", "walkdir", ] @@ -3204,7 +3792,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -3230,7 +3818,7 @@ dependencies = [ "serde", "serde_json", "strum 0.25.0", - "syn 2.0.32", + "syn 2.0.48", "tempfile", "thiserror", "tiny-keccak", @@ -3340,6 +3928,38 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite 0.2.13", +] + +[[package]] +name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite 0.2.13", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.3", + "pin-project-lite 0.2.13", +] + [[package]] name = "evm" version = "0.39.1" @@ -3405,7 +4025,7 @@ dependencies = [ "evm-gasometer", "evm-runtime", "parity-scale-codec", - "sp-runtime-interface", + "sp-runtime-interface 17.0.0", ] [[package]] @@ -3464,7 +4084,7 @@ dependencies = [ "fs-err", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -3528,35 +4148,48 @@ checksum = "f5aa1e3ae159e592ad222dc90c5acbad632b527779ba88486abe92782ab268bd" dependencies = [ "expander 0.0.4", "indexmap 1.9.3", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", "thiserror", ] +[[package]] +name = "fc-api" +version = "1.0.0-dev" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" +dependencies = [ + "async-trait", + "fp-storage", + "parity-scale-codec", + "sp-core 21.0.0", + "sp-runtime 24.0.0", +] + [[package]] name = "fc-consensus" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" dependencies = [ "async-trait", "fp-consensus", "fp-rpc", "sc-consensus", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-block-builder", "sp-consensus", - "sp-runtime", + "sp-runtime 24.0.0", "thiserror", ] [[package]] name = "fc-db" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" dependencies = [ "async-trait", + "fc-api", "fp-storage", "kvdb-rocksdb", "log", @@ -3566,15 +4199,15 @@ dependencies = [ "sc-client-db", "smallvec 1.11.0", "sp-blockchain", - "sp-core", + "sp-core 21.0.0", "sp-database", - "sp-runtime", + "sp-runtime 24.0.0", ] [[package]] name = "fc-mapping-sync" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" dependencies = [ "fc-db", "fc-storage", @@ -3586,25 +4219,24 @@ dependencies = [ "parking_lot 0.12.1", "sc-client-api", "sc-utils", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-blockchain", "sp-consensus", - "sp-runtime", + "sp-runtime 24.0.0", ] [[package]] name = "fc-rpc" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" dependencies = [ "ethereum", "ethereum-types", "evm", - "fc-db", + "fc-api", "fc-mapping-sync", "fc-rpc-core", "fc-storage", - "fp-ethereum", "fp-evm", "fp-rpc", "fp-storage", @@ -3613,13 +4245,13 @@ dependencies = [ "jsonrpsee", "libsecp256k1", "log", - "lru 0.8.1", "pallet-evm", "parity-scale-codec", "prometheus", "rand 0.8.5", "rlp", "sc-client-api", + "sc-consensus-aura", "sc-network", "sc-network-common", "sc-network-sync", @@ -3628,24 +4260,29 @@ dependencies = [ "sc-transaction-pool", "sc-transaction-pool-api", "sc-utils", + "schnellru", "serde", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-io", - "sp-runtime", - "sp-state-machine", - "sp-storage", + "sp-consensus-aura", + "sp-core 21.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", + "sp-storage 13.0.0", + "sp-timestamp", "substrate-prometheus-endpoint", + "thiserror", "tokio", ] [[package]] name = "fc-rpc-core" version = "1.1.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" dependencies = [ "ethereum", "ethereum-types", @@ -3658,7 +4295,7 @@ dependencies = [ [[package]] name = "fc-storage" version = "1.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" dependencies = [ "ethereum", "ethereum-types", @@ -3666,11 +4303,11 @@ dependencies = [ "fp-storage", "parity-scale-codec", "sc-client-api", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-blockchain", - "sp-io", - "sp-runtime", - "sp-storage", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-storage 13.0.0", ] [[package]] @@ -3702,11 +4339,24 @@ dependencies = [ "subtle", ] +[[package]] +name = "fflonk" +version = "0.1.0" +source = "git+https://github.com/w3f/fflonk#1e854f35e9a65d08b11a86291405cdc95baa0a35" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "merlin 3.0.0", +] + [[package]] name = "fiat-crypto" -version = "0.1.20" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" +checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" [[package]] name = "file-per-thread-logger" @@ -3793,7 +4443,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "parity-scale-codec", ] @@ -3810,7 +4460,7 @@ dependencies = [ [[package]] name = "fp-account" version = "1.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" dependencies = [ "hex", "impl-serde", @@ -3819,87 +4469,87 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-runtime-interface", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-runtime-interface 17.0.0", + "sp-std 8.0.0", ] [[package]] name = "fp-consensus" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" dependencies = [ "ethereum", "parity-scale-codec", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "fp-ethereum" version = "1.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" dependencies = [ "ethereum", "ethereum-types", "fp-evm", - "frame-support", - "num_enum 0.6.1", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "parity-scale-codec", - "sp-std", + "sp-std 8.0.0", ] [[package]] name = "fp-evm" version = "3.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" dependencies = [ "evm", - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "num_enum 0.7.0", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "fp-rpc" version = "3.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" dependencies = [ "ethereum", "ethereum-types", "fp-evm", "parity-scale-codec", "scale-info", - "sp-api", - "sp-core", - "sp-runtime", - "sp-state-machine", - "sp-std", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", + "sp-std 8.0.0", ] [[package]] name = "fp-self-contained" version = "1.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "parity-scale-codec", "scale-info", "serde", - "sp-runtime", + "sp-runtime 24.0.0", ] [[package]] name = "fp-storage" version = "2.0.0" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" dependencies = [ "parity-scale-codec", "serde", @@ -3916,42 +4566,67 @@ name = "frame-benchmarking" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" dependencies = [ - "frame-support", - "frame-support-procedural", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", + "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", + "linregress", + "log", + "parity-scale-codec", + "paste", + "scale-info", + "serde", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-runtime-interface 7.0.0", + "sp-std 5.0.0", + "sp-storage 7.0.0", + "static_assertions", +] + +[[package]] +name = "frame-benchmarking" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "linregress", "log", "parity-scale-codec", "paste", "scale-info", "serde", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-io", - "sp-runtime", - "sp-runtime-interface", - "sp-std", - "sp-storage", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-application-crypto 23.0.0", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-runtime-interface 17.0.0", + "sp-std 8.0.0", + "sp-storage 13.0.0", "static_assertions", ] [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "Inflector", - "array-bytes 4.2.0", + "array-bytes 6.1.0", "chrono", "clap", "comfy-table", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "gethostname", "handlebars", - "itertools", + "itertools 0.10.5", "lazy_static", "linked-hash-map", "log", @@ -3967,18 +4642,19 @@ dependencies = [ "sc-sysinfo", "serde", "serde_json", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-blockchain", - "sp-core", + "sp-core 21.0.0", "sp-database", - "sp-externalities", - "sp-inherents", - "sp-keystore", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-storage", - "sp-trie", + "sp-externalities 0.19.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-io 23.0.0", + "sp-keystore 0.27.0", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", + "sp-storage 13.0.0", + "sp-trie 22.0.0", + "sp-wasm-interface 14.0.0", "thiserror", "thousands", ] @@ -3986,46 +4662,47 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "frame-election-provider-solution-type", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "parity-scale-codec", "scale-info", - "sp-arithmetic", - "sp-core", + "sp-arithmetic 16.0.0", + "sp-core 21.0.0", "sp-npos-elections", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-try-runtime", + "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "sp-tracing", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "sp-tracing 10.0.0", ] [[package]] @@ -4040,10 +4717,22 @@ dependencies = [ "serde", ] +[[package]] +name = "frame-metadata" +version = "16.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cf1549fba25a6fcac22785b61698317d958e96cac72a59102ea45b9ae64692" +dependencies = [ + "cfg-if", + "parity-scale-codec", + "scale-info", + "serde", +] + [[package]] name = "frame-remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-recursion", "futures 0.3.28", @@ -4052,9 +4741,10 @@ dependencies = [ "log", "parity-scale-codec", "serde", - "sp-core", - "sp-io", - "sp-runtime", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", "spinners", "substrate-rpc-client", "tokio", @@ -4068,8 +4758,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e dependencies = [ "bitflags 1.3.2", "environmental", - "frame-metadata", - "frame-support-procedural", + "frame-metadata 15.1.0", + "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", "impl-trait-for-tuples", "k256", "log", @@ -4079,48 +4769,118 @@ dependencies = [ "scale-info", "serde", "smallvec 1.11.0", - "sp-api", - "sp-arithmetic", - "sp-core", - "sp-core-hashing-proc-macro", - "sp-debug-derive", - "sp-inherents", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-state-machine", - "sp-std", - "sp-tracing", - "sp-weights", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", + "sp-core-hashing-proc-macro 5.0.0", + "sp-debug-derive 5.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", + "sp-state-machine 0.13.0", + "sp-std 5.0.0", + "sp-tracing 6.0.0", + "sp-weights 4.0.0", "tt-call", ] [[package]] -name = "frame-support-procedural" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "Inflector", - "cfg-expr", - "derive-syn-parse", - "frame-support-procedural-tools", - "itertools", - "proc-macro-warning", - "proc-macro2", - "quote", - "syn 2.0.32", -] - -[[package]] -name = "frame-support-procedural-tools" +name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support-procedural-tools-derive", - "proc-macro-crate", + "aquamarine", + "bitflags 1.3.2", + "docify", + "environmental", + "frame-metadata 16.0.0", + "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "impl-trait-for-tuples", + "k256", + "log", + "macro_magic", + "parity-scale-codec", + "paste", + "scale-info", + "serde", + "serde_json", + "smallvec 1.11.0", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-arithmetic 16.0.0", + "sp-core 21.0.0", + "sp-core-hashing-proc-macro 9.0.0", + "sp-debug-derive 8.0.0", + "sp-genesis-builder", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-io 23.0.0", + "sp-metadata-ir 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-runtime 24.0.0", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-state-machine 0.28.0", + "sp-std 8.0.0", + "sp-tracing 10.0.0", + "sp-weights 20.0.0", + "static_assertions", + "tt-call", +] + +[[package]] +name = "frame-support-procedural" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +dependencies = [ + "Inflector", + "cfg-expr", + "derive-syn-parse", + "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", + "itertools 0.10.5", + "proc-macro-warning 0.3.1", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "frame-support-procedural" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "Inflector", + "cfg-expr", + "derive-syn-parse", + "expander 2.0.0", + "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "itertools 0.10.5", + "macro_magic", + "proc-macro-warning 0.4.2", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "frame-support-procedural-tools" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +dependencies = [ + "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "frame-support-procedural-tools" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -4130,7 +4890,17 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", +] + +[[package]] +name = "frame-support-procedural-tools-derive" +version = "3.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", ] [[package]] @@ -4139,53 +4909,72 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" dependencies = [ "cfg-if", - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", + "log", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", + "sp-version 5.0.0", + "sp-weights 4.0.0", +] + +[[package]] +name = "frame-system" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "cfg-if", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "sp-version", - "sp-weights", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "sp-version 22.0.0", + "sp-weights 20.0.0", ] [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "parity-scale-codec", "scale-info", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "parity-scale-codec", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", ] [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "parity-scale-codec", - "sp-api", - "sp-runtime", - "sp-std", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -4210,7 +4999,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" dependencies = [ - "rustix 0.38.3", + "rustix 0.38.25", "windows-sys 0.48.0", ] @@ -4290,6 +5079,16 @@ dependencies = [ "waker-fn", ] +[[package]] +name = "futures-lite" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +dependencies = [ + "futures-core", + "pin-project-lite 0.2.13", +] + [[package]] name = "futures-locks" version = "0.7.1" @@ -4308,7 +5107,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -4585,6 +5384,11 @@ name = "hashbrown" version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +dependencies = [ + "ahash 0.8.3", + "allocator-api2", + "serde", +] [[package]] name = "hashers" @@ -4763,18 +5567,19 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.2" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ + "futures-util", "http", "hyper", "log", - "rustls 0.20.8", + "rustls 0.21.10", "rustls-native-certs", "tokio", "tokio-rustls", - "webpki-roots", + "webpki-roots 0.25.3", ] [[package]] @@ -4843,7 +5648,7 @@ version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9465340214b296cd17a0009acdb890d6160010b8adf8f78a00d0d7ab270f79f" dependencies = [ - "async-io", + "async-io 1.13.0", "core-foundation", "fnv", "futures 0.3.28", @@ -4894,6 +5699,25 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "include_dir" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" +dependencies = [ + "include_dir_macros", +] + +[[package]] +name = "include_dir_macros" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" +dependencies = [ + "proc-macro2", + "quote", +] + [[package]] name = "indenter" version = "0.3.3" @@ -4983,14 +5807,14 @@ dependencies = [ "astar-test-utils", "env_logger 0.10.0", "fp-evm", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "hex", "libsecp256k1", "pallet-assets", "pallet-balances", "pallet-contracts", - "pallet-contracts-primitives", + "pallet-contracts-primitives 24.0.0", "pallet-dapp-staking-v3", "pallet-dapps-staking", "pallet-ethereum-checked", @@ -5006,9 +5830,9 @@ dependencies = [ "sha3", "shibuya-runtime", "shiden-runtime", - "sp-core", - "sp-io", - "sp-runtime", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", "unified-accounts-chain-extension-types", ] @@ -5073,10 +5897,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.2", - "rustix 0.38.3", + "rustix 0.38.25", "windows-sys 0.48.0", ] +[[package]] +name = "is_executable" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8" +dependencies = [ + "winapi", +] + [[package]] name = "itertools" version = "0.10.5" @@ -5086,6 +5919,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.8" @@ -5112,9 +5954,9 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e" +checksum = "367a292944c07385839818bb71c8d76611138e2dedb0677d035b8da21d29c78b" dependencies = [ "jsonrpsee-core", "jsonrpsee-http-client", @@ -5127,9 +5969,9 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965de52763f2004bc91ac5bcec504192440f0b568a5d621c59d9dbd6f886c3fb" +checksum = "c8b3815d9f5d5de348e5f162b316dc9cdf4548305ebb15b4eb9328e66cf27d7a" dependencies = [ "futures-util", "http", @@ -5143,18 +5985,18 @@ dependencies = [ "tokio-rustls", "tokio-util", "tracing", - "webpki-roots", + "webpki-roots 0.25.3", ] [[package]] name = "jsonrpsee-core" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e70b4439a751a5de7dd5ed55eacff78ebf4ffe0fc009cb1ebb11417f5b536b" +checksum = "2b5dde66c53d6dcdc8caea1874a45632ec0fcf5b437789f1e45766a1512ce803" dependencies = [ "anyhow", "arrayvec 0.7.4", - "async-lock", + "async-lock 2.7.0", "async-trait", "beef", "futures-channel", @@ -5176,9 +6018,9 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc345b0a43c6bc49b947ebeb936e886a419ee3d894421790c969cc56040542ad" +checksum = "7e5f9fabdd5d79344728521bb65e3106b49ec405a78b66fbff073b72b389fa43" dependencies = [ "async-trait", "hyper", @@ -5195,12 +6037,12 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baa6da1e4199c10d7b1d0a6e5e8bd8e55f351163b6f4b3cbb044672a69bd4c1c" +checksum = "44e8ab85614a08792b9bff6c8feee23be78c98d0182d4c622c05256ab553892a" dependencies = [ "heck", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -5208,9 +6050,9 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb69dad85df79527c019659a992498d03f8495390496da2f07e6c24c2b356fc" +checksum = "cf4d945a6008c9b03db3354fb3c83ee02d2faa9f2e755ec1dfb69c3551b8f4ba" dependencies = [ "futures-channel", "futures-util", @@ -5230,9 +6072,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bd522fe1ce3702fd94812965d7bb7a3364b1c9aba743944c5a00529aae80f8c" +checksum = "245ba8e5aa633dd1c1e4fae72bce06e71f42d34c14a2767c6b4d173b57bee5e5" dependencies = [ "anyhow", "beef", @@ -5244,9 +6086,9 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b83daeecfc6517cfe210df24e570fb06213533dfb990318fae781f4c7119dd9" +checksum = "4e1b3975ed5d73f456478681a417128597acd6a2487855fdb7b4a3d4d195bf5e" dependencies = [ "http", "jsonrpsee-client-transport", @@ -5262,7 +6104,7 @@ checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ "base64 0.21.2", "pem", - "ring", + "ring 0.16.20", "serde", "serde_json", "simple_asn1", @@ -5291,117 +6133,18 @@ dependencies = [ "cpufeatures", ] -[[package]] -name = "kusama-runtime" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" -dependencies = [ - "bitvec", - "frame-benchmarking", - "frame-election-provider-support", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "frame-try-runtime", - "hex-literal", - "kusama-runtime-constants", - "log", - "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", - "pallet-bags-list", - "pallet-balances", - "pallet-bounties", - "pallet-child-bounties", - "pallet-collective", - "pallet-conviction-voting", - "pallet-democracy", - "pallet-election-provider-multi-phase", - "pallet-election-provider-support-benchmarking", - "pallet-elections-phragmen", - "pallet-fast-unstake", - "pallet-grandpa", - "pallet-identity", - "pallet-im-online", - "pallet-indices", - "pallet-membership", - "pallet-message-queue", - "pallet-multisig", - "pallet-nis", - "pallet-nomination-pools", - "pallet-nomination-pools-benchmarking", - "pallet-nomination-pools-runtime-api", - "pallet-offences", - "pallet-offences-benchmarking", - "pallet-preimage", - "pallet-proxy", - "pallet-ranked-collective", - "pallet-recovery", - "pallet-referenda", - "pallet-scheduler", - "pallet-session", - "pallet-session-benchmarking", - "pallet-society", - "pallet-staking", - "pallet-staking-runtime-api", - "pallet-timestamp", - "pallet-tips", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-treasury", - "pallet-utility", - "pallet-vesting", - "pallet-whitelist", - "pallet-xcm", - "pallet-xcm-benchmarks", - "parity-scale-codec", - "polkadot-primitives", - "polkadot-runtime-common", - "polkadot-runtime-parachains", - "rustc-hex", - "scale-info", - "serde", - "serde_derive", - "smallvec 1.11.0", - "sp-api", - "sp-arithmetic", - "sp-authority-discovery", - "sp-block-builder", - "sp-consensus-babe", - "sp-consensus-beefy", - "sp-core", - "sp-inherents", - "sp-io", - "sp-mmr-primitives", - "sp-npos-elections", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "sp-transaction-pool", - "sp-version", - "static_assertions", - "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", -] - [[package]] name = "kusama-runtime-constants" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "polkadot-primitives", "polkadot-runtime-common", "smallvec 1.11.0", - "sp-core", - "sp-runtime", - "sp-weights", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-weights 20.0.0", ] [[package]] @@ -5437,6 +6180,17 @@ dependencies = [ "smallvec 1.11.0", ] +[[package]] +name = "landlock" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520baa32708c4e957d2fc3a186bc5bd8d26637c33137f399ddfc202adb240068" +dependencies = [ + "enumflags2", + "libc", + "thiserror", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -5454,9 +6208,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" [[package]] name = "libloading" @@ -5468,12 +6222,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "libm" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" - [[package]] name = "libm" version = "0.2.7" @@ -5552,7 +6300,7 @@ dependencies = [ "libp2p-identity", "log", "multiaddr", - "multihash 0.17.0", + "multihash", "multistream-select", "once_cell", "parking_lot 0.12.1", @@ -5604,15 +6352,15 @@ dependencies = [ [[package]] name = "libp2p-identity" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e2d584751cecb2aabaa56106be6be91338a60a0f4e420cf2af639204f596fc1" +checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce" dependencies = [ "bs58 0.4.0", - "ed25519-dalek", + "ed25519-dalek 2.1.0", "log", "multiaddr", - "multihash 0.17.0", + "multihash", "quick-protobuf", "rand 0.8.5", "sha2 0.10.7", @@ -5820,7 +6568,7 @@ dependencies = [ "libp2p-core", "libp2p-identity", "rcgen 0.10.0", - "ring", + "ring 0.16.20", "rustls 0.20.8", "thiserror", "webpki 0.22.0", @@ -5859,7 +6607,7 @@ dependencies = [ "libp2p-identity", "libp2p-noise", "log", - "multihash 0.17.0", + "multihash", "quick-protobuf", "quick-protobuf-codec", "rand 0.8.5", @@ -5889,7 +6637,7 @@ dependencies = [ "rw-stream-sink", "soketto", "url", - "webpki-roots", + "webpki-roots 0.22.6", ] [[package]] @@ -6026,9 +6774,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.3" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "local-runtime" @@ -6039,10 +6787,10 @@ dependencies = [ "dapp-staking-v3-runtime-api", "fp-rpc", "fp-self-contained", - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-executive", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -6060,7 +6808,7 @@ dependencies = [ "pallet-chain-extension-xvm", "pallet-collective", "pallet-contracts", - "pallet-contracts-primitives", + "pallet-contracts-primitives 24.0.0", "pallet-dapp-staking-migration", "pallet-dapp-staking-v3", "pallet-dapps-staking", @@ -6102,19 +6850,19 @@ dependencies = [ "precompile-utils", "scale-info", "smallvec 1.11.0", - "sp-api", - "sp-arithmetic", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-arithmetic 16.0.0", "sp-block-builder", "sp-consensus-aura", - "sp-core", - "sp-inherents", - "sp-io", + "sp-core 21.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-io 23.0.0", "sp-offchain", - "sp-runtime", + "sp-runtime 24.0.0", "sp-session", - "sp-std", + "sp-std 8.0.0", "sp-transaction-pool", - "sp-version", + "sp-version 22.0.0", "substrate-wasm-builder", ] @@ -6130,36 +6878,24 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" - -[[package]] -name = "lru" -version = "0.8.1" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" -dependencies = [ - "hashbrown 0.12.3", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e7d46de488603ffdd5f30afbc64fbba2378214a2c3a2fb83abf3d33126df17" +checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" dependencies = [ "hashbrown 0.13.2", ] [[package]] name = "lru" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" -dependencies = [ - "hashbrown 0.13.2", -] +checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" [[package]] name = "lru-cache" @@ -6200,12 +6936,60 @@ dependencies = [ ] [[package]] -name = "macrotest" -version = "1.0.9" +name = "macro_magic" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7489ae0986ce45414b7b3122c2e316661343ecf396b206e3e15f07c846616f10" +checksum = "aee866bfee30d2d7e83835a4574aad5b45adba4cc807f2a3bbba974e5d4383c9" dependencies = [ - "diff", + "macro_magic_core", + "macro_magic_macros", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "macro_magic_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e766a20fd9c72bab3e1e64ed63f36bd08410e75803813df210d1ce297d7ad00" +dependencies = [ + "const-random", + "derive-syn-parse", + "macro_magic_core_macros", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "macro_magic_core_macros" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d710e1214dffbab3b5dacb21475dde7d6ed84c69ff722b3a47a782668d44fbac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "macro_magic_macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fb85ec1620619edf2984a7693497d4ec88a9665d8b87e942856884c92dbf2a" +dependencies = [ + "macro_magic_core", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "macrotest" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7489ae0986ce45414b7b3122c2e316661343ecf396b206e3e15f07c846616f10" +dependencies = [ + "diff", "glob", "prettyplease 0.1.25", "serde", @@ -6344,6 +7128,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "merlin" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" +dependencies = [ + "byteorder", + "keccak", + "rand_core 0.6.4", + "zeroize", +] + [[package]] name = "mick-jaeger" version = "0.1.8" @@ -6390,36 +7186,36 @@ dependencies = [ [[package]] name = "mmr-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "futures 0.3.28", "log", "parity-scale-codec", "sc-client-api", "sc-offchain", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-blockchain", "sp-consensus", "sp-consensus-beefy", - "sp-core", + "sp-core 21.0.0", "sp-mmr-primitives", - "sp-runtime", + "sp-runtime 24.0.0", ] [[package]] name = "mmr-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "anyhow", "jsonrpsee", "parity-scale-codec", "serde", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-blockchain", - "sp-core", + "sp-core 21.0.0", "sp-mmr-primitives", - "sp-runtime", + "sp-runtime 24.0.0", ] [[package]] @@ -6460,7 +7256,7 @@ dependencies = [ "parity-scale-codec", "serde", "serde_json", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -6476,10 +7272,10 @@ dependencies = [ "moonbeam-primitives-ext", "pallet-evm", "parity-scale-codec", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -6489,9 +7285,9 @@ dependencies = [ "ethereum-types", "evm-tracing-events", "parity-scale-codec", - "sp-externalities", - "sp-runtime-interface", - "sp-std", + "sp-externalities 0.19.0", + "sp-runtime-interface 17.0.0", + "sp-std 8.0.0", ] [[package]] @@ -6505,7 +7301,7 @@ dependencies = [ "moonbeam-rpc-core-types", "serde", "serde_json", - "sp-core", + "sp-core 21.0.0", ] [[package]] @@ -6562,12 +7358,12 @@ dependencies = [ "moonbeam-rpc-primitives-debug", "sc-client-api", "sc-utils", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-block-builder", "sp-blockchain", - "sp-core", - "sp-io", - "sp-runtime", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", "tokio", ] @@ -6582,11 +7378,11 @@ dependencies = [ "parity-scale-codec", "serde", "serde_json", - "sp-api", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -6596,10 +7392,10 @@ dependencies = [ "ethereum", "parity-scale-codec", "scale-info", - "sp-api", - "sp-io", - "sp-runtime", - "sp-std", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -6624,12 +7420,12 @@ dependencies = [ "sc-utils", "serde", "sha3", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-block-builder", "sp-blockchain", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", "sp-transaction-pool", "tokio", "tracing", @@ -6641,7 +7437,7 @@ version = "0.6.0" dependencies = [ "ethereum-types", "fc-rpc", - "frame-system", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "jsonrpsee", "moonbeam-rpc-core-txpool", "moonbeam-rpc-primitives-txpool", @@ -6650,11 +7446,11 @@ dependencies = [ "sc-transaction-pool-api", "serde", "sha3", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-blockchain", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -6668,7 +7464,7 @@ dependencies = [ "data-encoding", "log", "multibase", - "multihash 0.17.0", + "multihash", "percent-encoding", "serde", "static_assertions", @@ -6689,9 +7485,9 @@ dependencies = [ [[package]] name = "multihash" -version = "0.16.3" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c346cf9999c631f002d8f977c4eaeaa0e6386f16007202308d0b3757522c2cc" +checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" dependencies = [ "blake2b_simd", "blake2s_simd", @@ -6704,26 +7500,13 @@ dependencies = [ "unsigned-varint", ] -[[package]] -name = "multihash" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" -dependencies = [ - "core2", - "digest 0.10.7", - "multihash-derive", - "sha2 0.10.7", - "unsigned-varint", -] - [[package]] name = "multihash-derive" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2", "quote", @@ -6871,6 +7654,12 @@ dependencies = [ "memoffset 0.6.5", ] +[[package]] +name = "no-std-net" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" + [[package]] name = "nodrop" version = "0.1.14" @@ -7004,15 +7793,6 @@ dependencies = [ "num_enum_derive 0.5.11", ] -[[package]] -name = "num_enum" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" -dependencies = [ - "num_enum_derive 0.6.1", -] - [[package]] name = "num_enum" version = "0.7.0" @@ -7028,34 +7808,22 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", ] -[[package]] -name = "num_enum_derive" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.32", -] - [[package]] name = "num_enum_derive" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56ea360eafe1022f7cc56cd7b869ed57330fb2453d0c7831d99b74c65d2f5597" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -7176,9 +7944,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2871aadd82a2c216ee68a69837a526dfe788ecbe74c4c5038a6acdbff6653066" dependencies = [ "expander 0.0.6", - "itertools", + "itertools 0.10.5", "petgraph", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -7196,69 +7964,72 @@ dependencies = [ [[package]] name = "orml-traits" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.43#28a2e6f0df9540d91db4018c7ecebb8bfc217a2a" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.1.0#b3694e631df7f1ca16b1973122937753fcdee9d4" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "impl-trait-for-tuples", "num-traits", "orml-utilities", "parity-scale-codec", + "paste", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "xcm", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "staging-xcm", ] [[package]] name = "orml-utilities" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.43#28a2e6f0df9540d91db4018c7ecebb8bfc217a2a" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.1.0#b3694e631df7f1ca16b1973122937753fcdee9d4" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "parity-scale-codec", "scale-info", "serde", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "orml-xcm-support" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.43#28a2e6f0df9540d91db4018c7ecebb8bfc217a2a" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.1.0#b3694e631df7f1ca16b1973122937753fcdee9d4" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "orml-traits", "parity-scale-codec", - "sp-runtime", - "sp-std", - "xcm", - "xcm-executor", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "staging-xcm", + "staging-xcm-executor", ] [[package]] name = "orml-xtokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.43#28a2e6f0df9540d91db4018c7ecebb8bfc217a2a" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.1.0#b3694e631df7f1ca16b1973122937753fcdee9d4" dependencies = [ "cumulus-primitives-core", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "log", "orml-traits", "orml-xcm-support", "pallet-xcm", "parity-scale-codec", "scale-info", "serde", - "sp-io", - "sp-runtime", - "sp-std", - "xcm", - "xcm-executor", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "staging-xcm", + "staging-xcm-executor", ] [[package]] @@ -7283,164 +8054,159 @@ dependencies = [ "sha2 0.10.7", ] -[[package]] -name = "packed_simd_2" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" -dependencies = [ - "cfg-if", - "libm 0.1.4", -] - [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "log", "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto", + "sp-application-crypto 23.0.0", "sp-consensus-aura", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto", + "sp-application-crypto 23.0.0", "sp-authority-discovery", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "pallet-authorship", "pallet-session", "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto", + "sp-application-crypto 23.0.0", "sp-consensus-babe", - "sp-core", - "sp-io", - "sp-runtime", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", "sp-session", - "sp-staking", - "sp-std", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-std 8.0.0", ] [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", + "aquamarine", + "docify", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-election-provider-support", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "pallet-balances", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "sp-tracing", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "sp-tracing 10.0.0", ] [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "log", "pallet-authorship", "pallet-session", "parity-scale-codec", "scale-info", "serde", "sp-consensus-beefy", - "sp-runtime", + "sp-runtime 24.0.0", "sp-session", - "sp-staking", - "sp-std", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-std 8.0.0", ] [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "array-bytes 4.2.0", + "array-bytes 6.1.0", "binary-merkle-tree", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "pallet-beefy", "pallet-mmr", @@ -7448,12 +8214,13 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-consensus-beefy", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", + "sp-std 8.0.0", ] [[package]] @@ -7461,36 +8228,36 @@ name = "pallet-block-rewards-hybrid" version = "0.1.0" dependencies = [ "astar-primitives", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "pallet-balances", "pallet-timestamp", "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-core", - "sp-runtime", - "sp-std", + "sp-arithmetic 16.0.0", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -7499,21 +8266,21 @@ version = "0.1.0" dependencies = [ "assets-chain-extension-types", "env_logger 0.9.3", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "num-traits", "pallet-assets", "pallet-balances", "pallet-contracts", - "pallet-contracts-primitives", + "pallet-contracts-primitives 24.0.0", "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -7521,19 +8288,19 @@ name = "pallet-chain-extension-unified-accounts" version = "0.1.0" dependencies = [ "astar-primitives", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "num-traits", "pallet-contracts", - "pallet-contracts-primitives", + "pallet-contracts-primitives 24.0.0", "pallet-evm", "pallet-unified-accounts", "parity-scale-codec", "scale-info", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", "unified-accounts-chain-extension-types", ] @@ -7542,47 +8309,47 @@ name = "pallet-chain-extension-xvm" version = "0.1.1" dependencies = [ "astar-primitives", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "num-traits", "pallet-contracts", - "pallet-contracts-primitives", + "pallet-contracts-primitives 24.0.0", "pallet-unified-accounts", "parity-scale-codec", "scale-info", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", "xvm-chain-extension-types", ] [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "pallet-bounties", "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-collator-selection" version = "3.3.2" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "pallet-aura", "pallet-authorship", @@ -7594,29 +8361,29 @@ dependencies = [ "scale-info", "serde", "sp-consensus-aura", - "sp-core", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-std", - "sp-tracing", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-std 8.0.0", + "sp-tracing 10.0.0", ] [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -7626,12 +8393,12 @@ source = "git+https://github.com/AstarNetwork/substrate?branch=astar-polkadot-v0 dependencies = [ "bitflags 1.3.2", "environmental", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", "impl-trait-for-tuples", "log", - "pallet-contracts-primitives", + "pallet-contracts-primitives 7.0.0", "pallet-contracts-proc-macro", "parity-scale-codec", "rand 0.8.5", @@ -7639,11 +8406,11 @@ dependencies = [ "scale-info", "serde", "smallvec 1.11.0", - "sp-api", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "wasm-instrument 0.4.0", "wasmi 0.28.0", "wasmparser-nostd", @@ -7657,9 +8424,22 @@ dependencies = [ "bitflags 1.3.2", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", - "sp-weights", + "sp-runtime 7.0.0", + "sp-std 5.0.0", + "sp-weights 4.0.0", +] + +[[package]] +name = "pallet-contracts-primitives" +version = "24.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "bitflags 1.3.2", + "parity-scale-codec", + "scale-info", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "sp-weights 20.0.0", ] [[package]] @@ -7669,24 +8449,24 @@ source = "git+https://github.com/AstarNetwork/substrate?branch=astar-polkadot-v0 dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] name = "pallet-conviction-voting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "assert_matches", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "parity-scale-codec", "scale-info", "serde", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -7694,19 +8474,19 @@ name = "pallet-dapp-staking-migration" version = "1.0.0" dependencies = [ "astar-primitives", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "pallet-balances", "pallet-dapp-staking-v3", "pallet-dapps-staking", "parity-scale-codec", "scale-info", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-arithmetic 16.0.0", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -7715,20 +8495,20 @@ version = "0.0.1-alpha" dependencies = [ "assert_matches", "astar-primitives", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "num-traits", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-arithmetic 16.0.0", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -7737,9 +8517,9 @@ version = "3.10.0" dependencies = [ "assert_matches", "astar-primitives", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "num-traits", "pallet-balances", "pallet-session", @@ -7747,30 +8527,30 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-std", + "sp-arithmetic 16.0.0", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-std 8.0.0", ] [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -7778,77 +8558,79 @@ name = "pallet-dynamic-evm-base-fee" version = "0.1.0" dependencies = [ "fp-evm", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "num-traits", "pallet-balances", "pallet-timestamp", "pallet-transaction-payment", "parity-scale-codec", "scale-info", - "sp-core", - "sp-runtime", + "sp-core 21.0.0", + "sp-runtime 24.0.0", ] [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-election-provider-support", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "pallet-election-provider-support-benchmarking", "parity-scale-codec", "rand 0.8.5", "scale-info", - "sp-arithmetic", - "sp-core", - "sp-io", + "sp-arithmetic 16.0.0", + "sp-core 21.0.0", + "sp-io 23.0.0", "sp-npos-elections", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-std 8.0.0", "strum 0.24.1", ] [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-election-provider-support", - "frame-system", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "parity-scale-codec", "sp-npos-elections", - "sp-runtime", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", + "sp-core 21.0.0", + "sp-io 23.0.0", "sp-npos-elections", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-std 8.0.0", ] [[package]] name = "pallet-ethereum" version = "4.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" dependencies = [ "ethereum", "ethereum-types", @@ -7858,14 +8640,14 @@ dependencies = [ "fp-evm", "fp-rpc", "fp-storage", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "pallet-evm", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -7877,9 +8659,9 @@ dependencies = [ "ethereum-types", "fp-ethereum", "fp-evm", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "hex", "pallet-balances", "pallet-ethereum", @@ -7887,23 +8669,24 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-evm" version = "6.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" dependencies = [ "environmental", "evm", "fp-account", "fp-evm", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "hash-db 0.16.0", "hex", "hex-literal", "impl-trait-for-tuples", @@ -7911,21 +8694,22 @@ dependencies = [ "parity-scale-codec", "rlp", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-evm-chain-id" version = "1.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "parity-scale-codec", "scale-info", + "sp-runtime 24.0.0", ] [[package]] @@ -7934,8 +8718,8 @@ version = "0.5.2" dependencies = [ "derive_more", "fp-evm", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "num_enum 0.5.11", "pallet-assets", @@ -7948,16 +8732,16 @@ dependencies = [ "serde", "sha3", "slices", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-evm-precompile-blake2" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" dependencies = [ "fp-evm", ] @@ -7965,10 +8749,10 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-bn128" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" dependencies = [ "fp-evm", - "sp-core", + "sp-core 21.0.0", "substrate-bn", ] @@ -7980,8 +8764,8 @@ dependencies = [ "astar-primitives", "derive_more", "fp-evm", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "num_enum 0.5.11", "pallet-balances", @@ -7993,11 +8777,11 @@ dependencies = [ "scale-info", "serde", "sha3", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-arithmetic 16.0.0", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -8006,8 +8790,8 @@ version = "3.6.3" dependencies = [ "derive_more", "fp-evm", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "num_enum 0.5.11", "pallet-balances", @@ -8019,35 +8803,37 @@ dependencies = [ "scale-info", "serde", "sha3", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-evm-precompile-dispatch" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" dependencies = [ "fp-evm", - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "pallet-evm", + "parity-scale-codec", + "sp-runtime 24.0.0", ] [[package]] name = "pallet-evm-precompile-ed25519" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" dependencies = [ - "ed25519-dalek", + "ed25519-dalek 2.1.0", "fp-evm", ] [[package]] name = "pallet-evm-precompile-modexp" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" dependencies = [ "fp-evm", "num", @@ -8056,7 +8842,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-sha3fips" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" dependencies = [ "fp-evm", "tiny-keccak", @@ -8065,11 +8851,11 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-simple" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" dependencies = [ "fp-evm", "ripemd", - "sp-io", + "sp-io 23.0.0", ] [[package]] @@ -8078,8 +8864,8 @@ version = "1.2.1" dependencies = [ "derive_more", "fp-evm", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "hex-literal", "log", "num_enum 0.5.11", @@ -8090,10 +8876,10 @@ dependencies = [ "precompile-utils", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -8103,8 +8889,8 @@ dependencies = [ "assert_matches", "derive_more", "fp-evm", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "hex-literal", "log", "num_enum 0.5.11", @@ -8115,10 +8901,10 @@ dependencies = [ "precompile-utils", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -8129,8 +8915,8 @@ dependencies = [ "derive_more", "ethers", "fp-evm", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "hex", "hex-literal", "libsecp256k1", @@ -8144,10 +8930,10 @@ dependencies = [ "precompile-utils", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -8158,8 +8944,8 @@ dependencies = [ "astar-primitives", "derive_more", "fp-evm", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "hex-literal", "log", "num_enum 0.5.11", @@ -8176,13 +8962,13 @@ dependencies = [ "precompile-utils", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", ] [[package]] @@ -8192,8 +8978,8 @@ dependencies = [ "astar-primitives", "derive_more", "fp-evm", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "hex", "hex-literal", "log", @@ -8205,104 +8991,105 @@ dependencies = [ "precompile-utils", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", + "docify", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-election-provider-support", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-std", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-std 8.0.0", ] [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "pallet-authorship", "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto", + "sp-application-crypto 23.0.0", "sp-consensus-grandpa", - "sp-core", - "sp-io", - "sp-runtime", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", "sp-session", - "sp-staking", - "sp-std", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-std 8.0.0", ] [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "enumflags2", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "pallet-authorship", "parity-scale-codec", "scale-info", - "sp-application-crypto", - "sp-core", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-std", + "sp-application-crypto 23.0.0", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-std 8.0.0", ] [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", + "sp-core 21.0.0", + "sp-io 23.0.0", "sp-keyring", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -8310,192 +9097,195 @@ name = "pallet-inflation" version = "0.1.0" dependencies = [ "astar-primitives", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-insecure-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "parity-scale-codec", "safe-mix", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-message-queue" version = "7.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "parity-scale-codec", "scale-info", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "sp-weights", + "sp-arithmetic 16.0.0", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "sp-weights 20.0.0", ] [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", + "sp-core 21.0.0", + "sp-io 23.0.0", "sp-mmr-primitives", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-nis" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "parity-scale-codec", "scale-info", - "sp-arithmetic", - "sp-core", - "sp-runtime", - "sp-std", + "sp-arithmetic 16.0.0", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", + "pallet-balances", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-std 8.0.0", + "sp-tracing 10.0.0", ] [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-election-provider-support", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "pallet-bags-list", "pallet-nomination-pools", "pallet-staking", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-runtime-interface", - "sp-staking", - "sp-std", + "sp-runtime 24.0.0", + "sp-runtime-interface 17.0.0", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-std 8.0.0", ] [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "pallet-nomination-pools", "parity-scale-codec", - "sp-api", - "sp-std", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-std 8.0.0", ] [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-runtime", - "sp-staking", - "sp-std", + "sp-runtime 24.0.0", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-std 8.0.0", ] [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-election-provider-support", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "pallet-babe", "pallet-balances", @@ -8506,172 +9296,179 @@ dependencies = [ "pallet-staking", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-staking", - "sp-std", + "sp-runtime 24.0.0", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-std 8.0.0", ] [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-ranked-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "parity-scale-codec", "scale-info", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-arithmetic 16.0.0", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-referenda" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "assert_matches", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-io", - "sp-runtime", - "sp-std", + "sp-arithmetic 16.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "docify", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", - "sp-weights", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "sp-weights 20.0.0", ] [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "impl-trait-for-tuples", "log", "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", "sp-session", - "sp-staking", - "sp-std", - "sp-trie", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-state-machine 0.28.0", + "sp-std 8.0.0", + "sp-trie 22.0.0", ] [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "pallet-session", "pallet-staking", + "parity-scale-codec", "rand 0.8.5", - "sp-runtime", + "sp-runtime 24.0.0", "sp-session", - "sp-std", + "sp-std 8.0.0", ] [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "log", "parity-scale-codec", "rand_chacha 0.2.2", "scale-info", - "sp-runtime", - "sp-std", + "sp-arithmetic 16.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-election-provider-support", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "pallet-authorship", "pallet-session", @@ -8679,57 +9476,57 @@ dependencies = [ "rand_chacha 0.2.2", "scale-info", "serde", - "sp-application-crypto", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-std", + "sp-application-crypto 23.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-std 8.0.0", ] [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "log", - "sp-arithmetic", + "sp-arithmetic 16.0.0", ] [[package]] name = "pallet-staking-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "parity-scale-codec", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", ] [[package]] name = "pallet-state-trie-migration" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -8737,131 +9534,132 @@ name = "pallet-static-price-provider" version = "0.1.0" dependencies = [ "astar-primitives", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-core", - "sp-runtime", - "sp-std", + "sp-arithmetic 16.0.0", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "parity-scale-codec", "scale-info", - "sp-inherents", - "sp-io", - "sp-runtime", - "sp-std", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "sp-storage 13.0.0", "sp-timestamp", ] [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "pallet-treasury", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-blockchain", - "sp-core", + "sp-core 21.0.0", "sp-rpc", - "sp-runtime", - "sp-weights", + "sp-runtime 24.0.0", + "sp-weights 20.0.0", ] [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", - "sp-api", - "sp-runtime", - "sp-weights", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-runtime 24.0.0", + "sp-weights 20.0.0", ] [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "impl-trait-for-tuples", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -8870,9 +9668,9 @@ version = "0.1.0" dependencies = [ "astar-primitives", "ethers", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "hex", "libsecp256k1", "log", @@ -8883,116 +9681,116 @@ dependencies = [ "parity-scale-codec", "precompile-utils", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-whitelist" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "parity-scale-codec", "scale-info", - "sp-api", - "sp-runtime", - "sp-std", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "pallet-xc-asset-config" version = "1.3.0" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "pallet-balances", "pallet-timestamp", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "xcm", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "staging-xcm", ] [[package]] name = "pallet-xcm" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "bounded-collections", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "xcm", - "xcm-executor", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "staging-xcm", + "staging-xcm-executor", ] [[package]] name = "pallet-xcm-benchmarks" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", ] [[package]] @@ -9002,43 +9800,45 @@ dependencies = [ "astar-primitives", "environmental", "fp-evm", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "hex", "log", "pallet-balances", "pallet-contracts", - "pallet-contracts-primitives", + "pallet-contracts-primitives 24.0.0", "pallet-evm", "pallet-insecure-randomness-collective-flip", "pallet-timestamp", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.43#b8999fce0f61fb757f9e57e326cda48e70137019" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "cumulus-primitives-core", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "parity-scale-codec", "scale-info", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "parity-db" -version = "0.4.9" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dab3ac198341b2f0fec6e7f8a6eeed07a41201d98a124260611598c142e76df" +checksum = "592a28a24b09c9dc20ac8afaa6839abc417c720afe42c12e1e4a9d6aa2508d2e" dependencies = [ "blake2", "crc32fast", @@ -9052,13 +9852,14 @@ dependencies = [ "rand 0.8.5", "siphasher", "snap", + "winapi", ] [[package]] name = "parity-scale-codec" -version = "3.6.3" +version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "756d439303e94fae44f288ba881ad29670c65b0c4b0e05674ca81061bb65f2c5" +checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe" dependencies = [ "arrayvec 0.7.4", "bitvec", @@ -9071,11 +9872,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.3" +version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d884d78fcf214d70b1e239fcd1c6e5e95aa3be1881918da2e488cc946c7a476" +checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 2.0.1", "proc-macro2", "quote", "syn 1.0.109", @@ -9247,7 +10048,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -9283,22 +10084,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -9319,6 +10120,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.0", + "futures-io", +] + [[package]] name = "pkcs8" version = "0.9.0" @@ -9345,12 +10157,6 @@ version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" -[[package]] -name = "platforms" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" - [[package]] name = "platforms" version = "3.0.2" @@ -9359,15 +10165,17 @@ checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" [[package]] name = "polkadot-approval-distribution" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "futures 0.3.28", + "futures-timer", "polkadot-node-jaeger", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", + "polkadot-node-subsystem-util", "polkadot-primitives", "rand 0.8.5", "tracing-gum", @@ -9375,10 +10183,12 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ + "always-assert", "futures 0.3.28", + "futures-timer", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -9389,13 +10199,12 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "derive_more", "fatality", "futures 0.3.28", - "lru 0.9.0", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -9404,20 +10213,20 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "rand 0.8.5", - "sp-core", - "sp-keystore", + "schnellru", + "sp-core 21.0.0", + "sp-keystore 0.27.0", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-availability-recovery" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "fatality", "futures 0.3.28", - "lru 0.9.0", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -9427,21 +10236,20 @@ dependencies = [ "polkadot-primitives", "rand 0.8.5", "sc-network", + "schnellru", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-cli" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.1.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "clap", "frame-benchmarking-cli", "futures 0.3.28", "log", - "polkadot-client", - "polkadot-node-core-pvf-worker", "polkadot-node-metrics", "polkadot-performance-test", "polkadot-service", @@ -9451,8 +10259,8 @@ dependencies = [ "sc-storage-monitor", "sc-sysinfo", "sc-tracing", - "sp-core", - "sp-io", + "sp-core 21.0.0", + "sp-io 23.0.0", "sp-keyring", "sp-maybe-compressed-blob", "substrate-build-script-utils", @@ -9460,54 +10268,11 @@ dependencies = [ "try-runtime-cli", ] -[[package]] -name = "polkadot-client" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" -dependencies = [ - "async-trait", - "frame-benchmarking", - "frame-benchmarking-cli", - "frame-system", - "frame-system-rpc-runtime-api", - "futures 0.3.28", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "polkadot-core-primitives", - "polkadot-node-core-parachains-inherent", - "polkadot-primitives", - "polkadot-runtime", - "polkadot-runtime-common", - "sc-client-api", - "sc-consensus", - "sc-executor", - "sc-service", - "sp-api", - "sp-authority-discovery", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-consensus-beefy", - "sp-consensus-grandpa", - "sp-core", - "sp-inherents", - "sp-keyring", - "sp-mmr-primitives", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-storage", - "sp-timestamp", - "sp-transaction-pool", -] - [[package]] name = "polkadot-collator-protocol" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "always-assert", "bitvec", "fatality", "futures 0.3.28", @@ -9517,36 +10282,36 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-core", - "sp-keystore", - "sp-runtime", + "sp-core 21.0.0", + "sp-keystore 0.27.0", + "sp-runtime 24.0.0", "thiserror", + "tokio-util", "tracing-gum", ] [[package]] name = "polkadot-core-primitives" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "parity-scale-codec", "scale-info", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "polkadot-dispute-distribution" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "derive_more", "fatality", "futures 0.3.28", "futures-timer", "indexmap 1.9.3", - "lru 0.9.0", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -9555,30 +10320,31 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "sc-network", - "sp-application-crypto", - "sp-keystore", + "schnellru", + "sp-application-crypto 23.0.0", + "sp-keystore 0.27.0", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-erasure-coding" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", "polkadot-primitives", "reed-solomon-novelpoly", - "sp-core", - "sp-trie", + "sp-core 21.0.0", + "sp-trie 22.0.0", "thiserror", ] [[package]] name = "polkadot-gossip-support" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "futures 0.3.28", "futures-timer", @@ -9589,16 +10355,17 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "sc-network", - "sp-application-crypto", - "sp-core", - "sp-keystore", + "sc-network-common", + "sp-application-crypto 23.0.0", + "sp-core 21.0.0", + "sp-keystore 0.27.0", "tracing-gum", ] [[package]] name = "polkadot-network-bridge" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "always-assert", "async-trait", @@ -9620,8 +10387,8 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "futures 0.3.28", "parity-scale-codec", @@ -9630,7 +10397,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-core", + "sp-core 21.0.0", "sp-maybe-compressed-blob", "thiserror", "tracing-gum", @@ -9638,16 +10405,15 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "bitvec", "derive_more", "futures 0.3.28", "futures-timer", "kvdb", - "lru 0.9.0", - "merlin", + "merlin 2.0.1", "parity-scale-codec", "polkadot-node-jaeger", "polkadot-node-primitives", @@ -9656,19 +10422,20 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "sc-keystore", - "schnorrkel", - "sp-application-crypto", + "schnellru", + "schnorrkel 0.9.1", + "sp-application-crypto 23.0.0", "sp-consensus", "sp-consensus-slots", - "sp-runtime", + "sp-runtime 24.0.0", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-av-store" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "bitvec", "futures 0.3.28", @@ -9676,6 +10443,7 @@ dependencies = [ "kvdb", "parity-scale-codec", "polkadot-erasure-coding", + "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -9688,8 +10456,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "bitvec", "fatality", @@ -9700,21 +10468,21 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-statement-table", - "sp-keystore", + "sp-keystore 0.27.0", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "futures 0.3.28", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-keystore", + "sp-keystore 0.27.0", "thiserror", "tracing-gum", "wasm-timer", @@ -9722,8 +10490,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "futures 0.3.28", @@ -9734,7 +10502,8 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-parachain", + "polkadot-overseer", + "polkadot-parachain-primitives", "polkadot-primitives", "sp-maybe-compressed-blob", "tracing-gum", @@ -9742,8 +10511,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "futures 0.3.28", "polkadot-node-metrics", @@ -9757,8 +10526,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "futures 0.3.28", "futures-timer", @@ -9774,27 +10543,27 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "fatality", "futures 0.3.28", "kvdb", - "lru 0.9.0", "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", "sc-keystore", + "schnellru", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "futures 0.3.28", @@ -9803,15 +10572,32 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "sp-blockchain", - "sp-inherents", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "thiserror", + "tracing-gum", +] + +[[package]] +name = "polkadot-node-core-prospective-parachains" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "bitvec", + "fatality", + "futures 0.3.28", + "parity-scale-codec", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "bitvec", "fatality", @@ -9821,15 +10607,14 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand 0.8.5", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-pvf" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "always-assert", "futures 0.3.28", @@ -9838,25 +10623,26 @@ dependencies = [ "parity-scale-codec", "pin-project", "polkadot-core-primitives", + "polkadot-node-core-pvf-common", "polkadot-node-metrics", "polkadot-node-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "rand 0.8.5", "slotmap", - "sp-core", + "sp-core 21.0.0", "sp-maybe-compressed-blob", - "sp-tracing", - "sp-wasm-interface", + "sp-wasm-interface 14.0.0", "substrate-build-script-utils", + "tempfile", "tokio", "tracing-gum", ] [[package]] name = "polkadot-node-core-pvf-checker" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "futures 0.3.28", "polkadot-node-primitives", @@ -9864,35 +10650,52 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-overseer", "polkadot-primitives", - "sp-keystore", + "sp-keystore 0.27.0", "thiserror", "tracing-gum", ] [[package]] -name = "polkadot-node-core-pvf-worker" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +name = "polkadot-node-core-pvf-common" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "assert_matches", "cpu-time", "futures 0.3.28", + "landlock", "libc", "parity-scale-codec", - "polkadot-node-core-pvf", - "polkadot-parachain", + "polkadot-parachain-primitives", + "polkadot-primitives", + "sc-executor", + "sc-executor-common", + "sc-executor-wasmtime", + "sp-core 21.0.0", + "sp-externalities 0.19.0", + "sp-io 23.0.0", + "sp-tracing 10.0.0", + "tokio", + "tracing-gum", +] + +[[package]] +name = "polkadot-node-core-pvf-prepare-worker" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "futures 0.3.28", + "libc", + "parity-scale-codec", + "polkadot-node-core-pvf-common", + "polkadot-parachain-primitives", "polkadot-primitives", "rayon", "sc-executor", "sc-executor-common", "sc-executor-wasmtime", - "sp-core", - "sp-externalities", - "sp-io", + "sp-io 23.0.0", "sp-maybe-compressed-blob", - "sp-tracing", - "substrate-build-script-utils", - "tempfile", + "sp-tracing 10.0.0", "tikv-jemalloc-ctl", "tokio", "tracing-gum", @@ -9900,23 +10703,23 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "futures 0.3.28", - "lru 0.9.0", "polkadot-node-metrics", "polkadot-node-subsystem", "polkadot-node-subsystem-types", "polkadot-primitives", + "schnellru", "sp-consensus-babe", "tracing-gum", ] [[package]] name = "polkadot-node-jaeger" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "lazy_static", "log", @@ -9926,17 +10729,17 @@ dependencies = [ "polkadot-node-primitives", "polkadot-primitives", "sc-network", - "sp-core", + "sp-core 21.0.0", "thiserror", "tokio", ] [[package]] name = "polkadot-node-metrics" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "bs58 0.4.0", + "bs58 0.5.0", "futures 0.3.28", "futures-timer", "log", @@ -9952,11 +10755,12 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "async-channel", + "async-channel 1.9.0", "async-trait", + "bitvec", "derive_more", "fatality", "futures 0.3.28", @@ -9975,30 +10779,30 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "bounded-vec", "futures 0.3.28", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", - "schnorrkel", + "schnorrkel 0.9.1", "serde", - "sp-application-crypto", + "sp-application-crypto 23.0.0", "sp-consensus-babe", - "sp-core", - "sp-keystore", + "sp-core 21.0.0", + "sp-keystore 0.27.0", "sp-maybe-compressed-blob", - "sp-runtime", + "sp-runtime 24.0.0", "thiserror", - "zstd 0.11.2+zstd.1.5.2", + "zstd 0.12.4", ] [[package]] name = "polkadot-node-subsystem" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -10007,8 +10811,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "derive_more", @@ -10020,8 +10824,9 @@ dependencies = [ "polkadot-primitives", "polkadot-statement-table", "sc-network", + "sc-transaction-pool-api", "smallvec 1.11.0", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-authority-discovery", "sp-consensus-babe", "substrate-prometheus-endpoint", @@ -10030,17 +10835,16 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "derive_more", "fatality", "futures 0.3.28", "futures-channel", - "itertools", + "itertools 0.10.5", "kvdb", - "lru 0.9.0", "parity-db", "parity-scale-codec", "parking_lot 0.11.2", @@ -10054,22 +10858,22 @@ dependencies = [ "polkadot-primitives", "prioritized-metered-channel", "rand 0.8.5", - "sp-application-crypto", - "sp-core", - "sp-keystore", + "schnellru", + "sp-application-crypto 23.0.0", + "sp-core 21.0.0", + "sp-keystore 0.27.0", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-overseer" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "futures 0.3.28", "futures-timer", - "lru 0.9.0", "orchestra", "parking_lot 0.12.1", "polkadot-node-metrics", @@ -10078,77 +10882,78 @@ dependencies = [ "polkadot-node-subsystem-types", "polkadot-primitives", "sc-client-api", - "sp-api", - "sp-core", + "schnellru", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-core 21.0.0", "tikv-jemalloc-ctl", "tracing-gum", ] [[package]] -name = "polkadot-parachain" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +name = "polkadot-parachain-primitives" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "bounded-collections", "derive_more", - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "parity-scale-codec", "polkadot-core-primitives", "scale-info", "serde", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "polkadot-performance-test" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "env_logger 0.9.3", - "kusama-runtime", "log", "polkadot-erasure-coding", - "polkadot-node-core-pvf-worker", + "polkadot-node-core-pvf-prepare-worker", "polkadot-node-primitives", "polkadot-primitives", "quote", "sc-executor-common", "sp-maybe-compressed-blob", + "staging-kusama-runtime", "thiserror", ] [[package]] name = "polkadot-primitives" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "bitvec", "hex-literal", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "scale-info", "serde", - "sp-api", - "sp-application-crypto", - "sp-arithmetic", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-application-crypto 23.0.0", + "sp-arithmetic 16.0.0", "sp-authority-discovery", "sp-consensus-slots", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keystore", - "sp-runtime", - "sp-staking", - "sp-std", + "sp-core 21.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-io 23.0.0", + "sp-keystore 0.27.0", + "sp-runtime 24.0.0", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-std 8.0.0", ] [[package]] name = "polkadot-rpc" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "jsonrpsee", "mmr-rpc", @@ -10166,28 +10971,28 @@ dependencies = [ "sc-rpc", "sc-sync-state-rpc", "sc-transaction-pool-api", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-keystore", - "sp-runtime", + "sp-keystore 0.27.0", + "sp-runtime 24.0.0", "substrate-frame-rpc-system", "substrate-state-trie-migration-rpc", ] [[package]] name = "polkadot-runtime" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "bitvec", - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-election-provider-support", "frame-executive", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -10237,6 +11042,7 @@ dependencies = [ "pallet-vesting", "pallet-whitelist", "pallet-xcm", + "pallet-xcm-benchmarks", "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", @@ -10247,41 +11053,42 @@ dependencies = [ "serde", "serde_derive", "smallvec 1.11.0", - "sp-api", - "sp-arithmetic", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-arithmetic 16.0.0", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", "sp-consensus-beefy", - "sp-core", - "sp-inherents", - "sp-io", + "sp-core 21.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-io 23.0.0", "sp-mmr-primitives", "sp-npos-elections", "sp-offchain", - "sp-runtime", + "sp-runtime 24.0.0", "sp-session", - "sp-staking", - "sp-std", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-std 8.0.0", + "sp-storage 13.0.0", "sp-transaction-pool", - "sp-version", + "sp-version 22.0.0", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "static_assertions", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] name = "polkadot-runtime-common" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "bitvec", - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-election-provider-support", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "impl-trait-for-tuples", "libsecp256k1", "log", @@ -10305,56 +11112,58 @@ dependencies = [ "serde", "serde_derive", "slot-range-helper", - "sp-api", - "sp-core", - "sp-inherents", - "sp-io", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-core 21.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-io 23.0.0", "sp-npos-elections", - "sp-runtime", + "sp-runtime 24.0.0", "sp-session", - "sp-staking", - "sp-std", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-std 8.0.0", + "staging-xcm", "static_assertions", - "xcm", ] [[package]] name = "polkadot-runtime-constants" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "polkadot-primitives", "polkadot-runtime-common", "smallvec 1.11.0", - "sp-core", - "sp-runtime", - "sp-weights", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-weights 20.0.0", ] [[package]] name = "polkadot-runtime-metrics" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "bs58 0.4.0", + "bs58 0.5.0", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "parity-scale-codec", "polkadot-primitives", - "sp-std", - "sp-tracing", + "sp-std 8.0.0", + "sp-tracing 10.0.0", ] [[package]] name = "polkadot-runtime-parachains" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "bitflags 1.3.2", "bitvec", "derive_more", - "frame-benchmarking", - "frame-support", - "frame-system", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "impl-trait-for-tuples", "log", "pallet-authority-discovery", "pallet-authorship", @@ -10366,7 +11175,7 @@ dependencies = [ "pallet-timestamp", "pallet-vesting", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-metrics", "rand 0.8.5", @@ -10374,49 +11183,52 @@ dependencies = [ "rustc-hex", "scale-info", "serde", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keystore", - "sp-runtime", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-application-crypto 23.0.0", + "sp-core 21.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-io 23.0.0", + "sp-keystore 0.27.0", + "sp-runtime 24.0.0", "sp-session", - "sp-staking", - "sp-std", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-std 8.0.0", + "staging-xcm", + "staging-xcm-executor", "static_assertions", - "xcm", - "xcm-executor", ] [[package]] name = "polkadot-service" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-benchmarking-cli", - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-system-rpc-runtime-api", "futures 0.3.28", "hex-literal", - "kusama-runtime", + "is_executable", "kvdb", "kvdb-rocksdb", "log", - "lru 0.9.0", "mmr-gadget", "pallet-babe", "pallet-im-online", "pallet-staking", + "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "parity-db", + "parity-scale-codec", "polkadot-approval-distribution", "polkadot-availability-bitfield-distribution", "polkadot-availability-distribution", "polkadot-availability-recovery", - "polkadot-client", "polkadot-collator-protocol", + "polkadot-core-primitives", "polkadot-dispute-distribution", "polkadot-gossip-support", "polkadot-network-bridge", @@ -10430,7 +11242,9 @@ dependencies = [ "polkadot-node-core-chain-selection", "polkadot-node-core-dispute-coordinator", "polkadot-node-core-parachains-inherent", + "polkadot-node-core-prospective-parachains", "polkadot-node-core-provisioner", + "polkadot-node-core-pvf", "polkadot-node-core-pvf-checker", "polkadot-node-core-runtime-api", "polkadot-node-network-protocol", @@ -10439,11 +11253,11 @@ dependencies = [ "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-overseer", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-rpc", "polkadot-runtime", - "polkadot-runtime-constants", + "polkadot-runtime-common", "polkadot-runtime-parachains", "polkadot-statement-distribution", "rococo-runtime", @@ -10469,9 +11283,11 @@ dependencies = [ "sc-sysinfo", "sc-telemetry", "sc-transaction-pool", + "sc-transaction-pool-api", + "schnellru", "serde", "serde_json", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-authority-discovery", "sp-block-builder", "sp-blockchain", @@ -10479,19 +11295,22 @@ dependencies = [ "sp-consensus-babe", "sp-consensus-beefy", "sp-consensus-grandpa", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keystore", + "sp-core 21.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-io 23.0.0", + "sp-keyring", + "sp-keystore 0.27.0", "sp-mmr-primitives", "sp-offchain", - "sp-runtime", + "sp-runtime 24.0.0", "sp-session", - "sp-state-machine", - "sp-storage", + "sp-state-machine 0.28.0", + "sp-storage 13.0.0", "sp-timestamp", "sp-transaction-pool", - "sp-trie", + "sp-version 22.0.0", + "sp-weights 20.0.0", + "staging-kusama-runtime", "substrate-prometheus-endpoint", "thiserror", "tracing-gum", @@ -10500,33 +11319,36 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "arrayvec 0.5.2", + "arrayvec 0.7.4", + "bitvec", "fatality", "futures 0.3.28", + "futures-timer", "indexmap 1.9.3", "parity-scale-codec", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", + "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-keystore", - "sp-staking", + "sp-keystore 0.27.0", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-statement-table" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "parity-scale-codec", "polkadot-primitives", - "sp-core", + "sp-core 21.0.0", ] [[package]] @@ -10545,15 +11367,29 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "polling" +version = "3.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "545c980a3880efd47b2e262f6a4bb6daad6555cf3367aa9c4e52895f69537a41" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite 0.2.13", + "rustix 0.38.25", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "poly1305" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ "cpufeatures", "opaque-debug 0.3.0", - "universal-hash 0.4.1", + "universal-hash 0.5.1", ] [[package]] @@ -10600,8 +11436,8 @@ dependencies = [ "environmental", "evm", "fp-evm", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "hex", "hex-literal", "impl-trait-for-tuples", @@ -10613,11 +11449,11 @@ dependencies = [ "scale-info", "serde", "similar-asserts", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "xcm", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "staging-xcm", ] [[package]] @@ -10626,14 +11462,14 @@ version = "0.1.0" dependencies = [ "case", "fp-evm", - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "macrotest", "num_enum 0.5.11", "prettyplease 0.2.15", "proc-macro2", "quote", - "sp-core-hashing", - "sp-std", + "sp-core-hashing 9.0.0", + "sp-std 8.0.0", "syn 1.0.109", "trybuild", ] @@ -10646,7 +11482,7 @@ checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ "difflib", "float-cmp", - "itertools", + "itertools 0.10.5", "normalize-line-endings", "predicates-core", "regex", @@ -10685,7 +11521,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -10725,7 +11561,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.12", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" +dependencies = [ + "toml_datetime", + "toml_edit 0.20.2", ] [[package]] @@ -10760,14 +11606,25 @@ checksum = "0e99670bafb56b9a106419397343bdbc8b8742c3cc449fec6345f86173f47cd4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", +] + +[[package]] +name = "proc-macro-warning" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", ] [[package]] name = "proc-macro2" -version = "1.0.64" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -10827,7 +11684,7 @@ checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", "heck", - "itertools", + "itertools 0.10.5", "lazy_static", "log", "multimap", @@ -10848,7 +11705,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", "syn 1.0.109", @@ -10919,7 +11776,7 @@ checksum = "c956be1b23f4261676aed05a0046e204e8a6836e50203902683a718af0797989" dependencies = [ "bytes", "rand 0.8.5", - "ring", + "ring 0.16.20", "rustc-hash", "rustls 0.20.8", "slab", @@ -10931,9 +11788,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.29" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -11059,8 +11916,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" dependencies = [ "pem", - "ring", - "time 0.3.23", + "ring 0.16.20", + "time", "x509-parser 0.13.2", "yasna", ] @@ -11072,8 +11929,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", - "ring", - "time 0.3.23", + "ring 0.16.20", + "time", "yasna", ] @@ -11114,7 +11971,7 @@ checksum = "3bd8f48b2066e9f69ab192797d66da804d1935bf22763204ed3675740cb0f221" dependencies = [ "derive_more", "fs-err", - "itertools", + "itertools 0.10.5", "static_init 0.5.2", "thiserror", ] @@ -11136,7 +11993,7 @@ checksum = "68bf53dad9b6086826722cdc99140793afd9f62faa14a1ad07eb4f955e7a7216" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -11260,6 +12117,21 @@ dependencies = [ "subtle", ] +[[package]] +name = "ring" +version = "0.1.0" +source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "common", + "fflonk", + "merlin 3.0.0", +] + [[package]] name = "ring" version = "0.16.20" @@ -11270,11 +12142,25 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +dependencies = [ + "cc", + "getrandom 0.2.10", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + [[package]] name = "ripemd" version = "0.1.3" @@ -11318,14 +12204,14 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "binary-merkle-tree", - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-executive", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -11371,7 +12257,7 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", @@ -11380,41 +12266,42 @@ dependencies = [ "serde", "serde_derive", "smallvec 1.11.0", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", "sp-consensus-beefy", - "sp-core", - "sp-inherents", - "sp-io", + "sp-core 21.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-io 23.0.0", "sp-mmr-primitives", "sp-offchain", - "sp-runtime", + "sp-runtime 24.0.0", "sp-session", - "sp-staking", - "sp-std", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-std 8.0.0", + "sp-storage 13.0.0", "sp-transaction-pool", - "sp-version", + "sp-version 22.0.0", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "static_assertions", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] name = "rococo-runtime-constants" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "polkadot-primitives", "polkadot-runtime-common", "smallvec 1.11.0", - "sp-core", - "sp-runtime", - "sp-weights", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-weights 20.0.0", ] [[package]] @@ -11553,14 +12440,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.3" +version = "0.38.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4" +checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.2", "errno", "libc", - "linux-raw-sys 0.4.3", + "linux-raw-sys 0.4.13", "windows-sys 0.48.0", ] @@ -11572,7 +12459,7 @@ checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ "base64 0.13.1", "log", - "ring", + "ring 0.16.20", "sct 0.6.1", "webpki 0.21.4", ] @@ -11584,11 +12471,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log", - "ring", + "ring 0.16.20", "sct 0.7.0", "webpki 0.22.0", ] +[[package]] +name = "rustls" +version = "0.21.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +dependencies = [ + "log", + "ring 0.17.7", + "rustls-webpki", + "sct 0.7.0", +] + [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -11610,12 +12509,33 @@ dependencies = [ "base64 0.21.2", ] +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring 0.17.7", + "untrusted 0.9.0", +] + [[package]] name = "rustversion" version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" +[[package]] +name = "ruzstd" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc" +dependencies = [ + "byteorder", + "thiserror-core", + "twox-hash", +] + [[package]] name = "rw-stream-sink" version = "0.3.0" @@ -11672,18 +12592,18 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "log", - "sp-core", - "sp-wasm-interface", + "sp-core 21.0.0", + "sp-wasm-interface 14.0.0", "thiserror", ] [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "futures 0.3.28", @@ -11691,20 +12611,19 @@ dependencies = [ "ip_network", "libp2p", "log", - "multihash 0.17.0", + "multihash", "parity-scale-codec", "prost", "prost-build", "rand 0.8.5", "sc-client-api", "sc-network", - "sc-network-common", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-authority-discovery", "sp-blockchain", - "sp-core", - "sp-keystore", - "sp-runtime", + "sp-core 21.0.0", + "sp-keystore 0.27.0", + "sp-runtime 24.0.0", "substrate-prometheus-endpoint", "thiserror", ] @@ -11712,7 +12631,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "futures 0.3.28", "futures-timer", @@ -11723,34 +12642,34 @@ dependencies = [ "sc-proposer-metrics", "sc-telemetry", "sc-transaction-pool-api", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-inherents", - "sp-runtime", + "sp-core 21.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-runtime 24.0.0", "substrate-prometheus-endpoint", ] [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "parity-scale-codec", "sc-client-api", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-block-builder", "sp-blockchain", - "sp-core", - "sp-inherents", - "sp-runtime", + "sp-core 21.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-runtime 24.0.0", ] [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "memmap2", "sc-chain-spec-derive", @@ -11761,28 +12680,28 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core", - "sp-runtime", - "sp-state-machine", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", ] [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "array-bytes 4.2.0", + "array-bytes 6.1.0", "chrono", "clap", "fdlimit", @@ -11798,7 +12717,6 @@ dependencies = [ "sc-client-db", "sc-keystore", "sc-network", - "sc-network-common", "sc-service", "sc-telemetry", "sc-tracing", @@ -11806,12 +12724,12 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core", + "sp-core 21.0.0", "sp-keyring", - "sp-keystore", - "sp-panic-handler", - "sp-runtime", - "sp-version", + "sp-keystore 0.27.0", + "sp-panic-handler 8.0.0", + "sp-runtime 24.0.0", + "sp-version 22.0.0", "thiserror", "tiny-bip39", "tokio", @@ -11820,7 +12738,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "fnv", "futures 0.3.28", @@ -11830,24 +12748,23 @@ dependencies = [ "sc-executor", "sc-transaction-pool-api", "sc-utils", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-blockchain", "sp-consensus", - "sp-core", + "sp-core 21.0.0", "sp-database", - "sp-externalities", - "sp-keystore", - "sp-runtime", - "sp-state-machine", + "sp-externalities 0.19.0", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", "sp-statement-store", - "sp-storage", + "sp-storage 13.0.0", "substrate-prometheus-endpoint", ] [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "hash-db 0.16.0", "kvdb", @@ -11861,19 +12778,19 @@ dependencies = [ "sc-client-api", "sc-state-db", "schnellru", - "sp-arithmetic", + "sp-arithmetic 16.0.0", "sp-blockchain", - "sp-core", + "sp-core 21.0.0", "sp-database", - "sp-runtime", - "sp-state-machine", - "sp-trie", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", + "sp-trie 22.0.0", ] [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "futures 0.3.28", @@ -11885,12 +12802,12 @@ dependencies = [ "sc-client-api", "sc-utils", "serde", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-runtime", - "sp-state-machine", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", "substrate-prometheus-endpoint", "thiserror", ] @@ -11898,7 +12815,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "futures 0.3.28", @@ -11909,17 +12826,17 @@ dependencies = [ "sc-consensus", "sc-consensus-slots", "sc-telemetry", - "sp-api", - "sp-application-crypto", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-application-crypto 23.0.0", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-aura", "sp-consensus-slots", - "sp-core", - "sp-inherents", - "sp-keystore", - "sp-runtime", + "sp-core 21.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-keystore 0.27.0", + "sp-runtime 24.0.0", "substrate-prometheus-endpoint", "thiserror", ] @@ -11927,7 +12844,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "fork-tree", @@ -11942,20 +12859,20 @@ dependencies = [ "sc-consensus", "sc-consensus-epochs", "sc-consensus-slots", - "sc-keystore", "sc-telemetry", + "sc-transaction-pool-api", "scale-info", - "sp-api", - "sp-application-crypto", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-application-crypto 23.0.0", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-consensus-slots", - "sp-core", - "sp-inherents", - "sp-keystore", - "sp-runtime", + "sp-core 21.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-keystore 0.27.0", + "sp-runtime 24.0.0", "substrate-prometheus-endpoint", "thiserror", ] @@ -11963,7 +12880,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "futures 0.3.28", "jsonrpsee", @@ -11971,24 +12888,24 @@ dependencies = [ "sc-consensus-epochs", "sc-rpc-api", "serde", - "sp-api", - "sp-application-crypto", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-application-crypto 23.0.0", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core", - "sp-keystore", - "sp-runtime", + "sp-core 21.0.0", + "sp-keystore 0.27.0", + "sp-runtime 24.0.0", "thiserror", ] [[package]] name = "sc-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "array-bytes 4.2.0", - "async-channel", + "array-bytes 6.1.0", + "async-channel 1.9.0", "async-trait", "fnv", "futures 0.3.28", @@ -11997,22 +12914,20 @@ dependencies = [ "parking_lot 0.12.1", "sc-client-api", "sc-consensus", - "sc-keystore", "sc-network", - "sc-network-common", "sc-network-gossip", "sc-network-sync", "sc-utils", - "sp-api", - "sp-application-crypto", - "sp-arithmetic", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-application-crypto 23.0.0", + "sp-arithmetic 16.0.0", "sp-blockchain", "sp-consensus", "sp-consensus-beefy", - "sp-core", - "sp-keystore", + "sp-core 21.0.0", + "sp-keystore 0.27.0", "sp-mmr-primitives", - "sp-runtime", + "sp-runtime 24.0.0", "substrate-prometheus-endpoint", "thiserror", "wasm-timer", @@ -12021,7 +12936,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "futures 0.3.28", "jsonrpsee", @@ -12032,31 +12947,31 @@ dependencies = [ "sc-rpc", "serde", "sp-consensus-beefy", - "sp-core", - "sp-runtime", + "sp-core 21.0.0", + "sp-runtime 24.0.0", "thiserror", ] [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "fork-tree", "parity-scale-codec", "sc-client-api", "sc-consensus", "sp-blockchain", - "sp-runtime", + "sp-runtime 24.0.0", ] [[package]] name = "sc-consensus-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "ahash 0.8.3", - "array-bytes 4.2.0", + "array-bytes 6.1.0", "async-trait", "dyn-clone", "finality-grandpa", @@ -12075,17 +12990,18 @@ dependencies = [ "sc-network-common", "sc-network-gossip", "sc-telemetry", + "sc-transaction-pool-api", "sc-utils", "serde_json", - "sp-api", - "sp-application-crypto", - "sp-arithmetic", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-application-crypto 23.0.0", + "sp-arithmetic 16.0.0", "sp-blockchain", "sp-consensus", "sp-consensus-grandpa", - "sp-core", - "sp-keystore", - "sp-runtime", + "sp-core 21.0.0", + "sp-keystore 0.27.0", + "sp-runtime 24.0.0", "substrate-prometheus-endpoint", "thiserror", ] @@ -12093,7 +13009,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "finality-grandpa", "futures 0.3.28", @@ -12105,15 +13021,15 @@ dependencies = [ "sc-rpc", "serde", "sp-blockchain", - "sp-core", - "sp-runtime", + "sp-core 21.0.0", + "sp-runtime 24.0.0", "thiserror", ] [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "futures 0.3.28", @@ -12123,46 +13039,46 @@ dependencies = [ "sc-client-api", "sc-consensus", "sc-telemetry", - "sp-arithmetic", + "sp-arithmetic 16.0.0", "sp-blockchain", "sp-consensus", "sp-consensus-slots", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-state-machine", + "sp-core 21.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", ] [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "lru 0.8.1", "parity-scale-codec", "parking_lot 0.12.1", "sc-executor-common", "sc-executor-wasmtime", - "sp-api", - "sp-core", - "sp-externalities", - "sp-io", - "sp-panic-handler", - "sp-runtime-interface", - "sp-trie", - "sp-version", - "sp-wasm-interface", + "schnellru", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-core 21.0.0", + "sp-externalities 0.19.0", + "sp-io 23.0.0", + "sp-panic-handler 8.0.0", + "sp-runtime-interface 17.0.0", + "sp-trie 22.0.0", + "sp-version 22.0.0", + "sp-wasm-interface 14.0.0", "tracing", ] [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", - "sp-wasm-interface", + "sp-wasm-interface 14.0.0", "thiserror", "wasm-instrument 0.3.0", ] @@ -12170,25 +13086,24 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "anyhow", "cfg-if", "libc", "log", - "once_cell", "rustix 0.36.15", "sc-allocator", "sc-executor-common", - "sp-runtime-interface", - "sp-wasm-interface", + "sp-runtime-interface 17.0.0", + "sp-wasm-interface 14.0.0", "wasmtime", ] [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "ansi_term", "futures 0.3.28", @@ -12198,30 +13113,30 @@ dependencies = [ "sc-network", "sc-network-common", "sp-blockchain", - "sp-runtime", + "sp-runtime 24.0.0", ] [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "array-bytes 4.2.0", + "array-bytes 6.1.0", "parking_lot 0.12.1", "serde_json", - "sp-application-crypto", - "sp-core", - "sp-keystore", + "sp-application-crypto 23.0.0", + "sp-core 21.0.0", + "sp-keystore 0.27.0", "thiserror", ] [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "array-bytes 4.2.0", - "async-channel", + "array-bytes 6.1.0", + "async-channel 1.9.0", "async-trait", "asynchronous-codec", "bytes", @@ -12233,39 +13148,35 @@ dependencies = [ "libp2p", "linked_hash_set", "log", - "lru 0.8.1", "mockall", "parity-scale-codec", "parking_lot 0.12.1", + "partial_sort", "pin-project", "rand 0.8.5", - "sc-block-builder", "sc-client-api", - "sc-consensus", "sc-network-common", - "sc-peerset", "sc-utils", "serde", "serde_json", "smallvec 1.11.0", - "snow", - "sp-arithmetic", + "sp-arithmetic 16.0.0", "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-runtime", + "sp-core 21.0.0", + "sp-runtime 24.0.0", "substrate-prometheus-endpoint", "thiserror", "unsigned-varint", + "wasm-timer", "zeroize", ] [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "async-channel", + "async-channel 1.9.0", "cid", "futures 0.3.28", "libp2p-identity", @@ -12274,9 +13185,8 @@ dependencies = [ "prost-build", "sc-client-api", "sc-network", - "sc-network-common", "sp-blockchain", - "sp-runtime", + "sp-runtime 24.0.0", "thiserror", "unsigned-varint", ] @@ -12284,46 +13194,34 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "array-bytes 4.2.0", "async-trait", "bitflags 1.3.2", - "bytes", "futures 0.3.28", - "futures-timer", "libp2p-identity", "parity-scale-codec", "prost-build", "sc-consensus", - "sc-peerset", - "sc-utils", - "serde", - "smallvec 1.11.0", - "sp-blockchain", "sp-consensus", "sp-consensus-grandpa", - "sp-runtime", - "substrate-prometheus-endpoint", - "thiserror", - "zeroize", + "sp-runtime 24.0.0", ] [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "ahash 0.8.3", "futures 0.3.28", "futures-timer", "libp2p", "log", - "lru 0.8.1", "sc-network", "sc-network-common", - "sc-peerset", - "sp-runtime", + "schnellru", + "sp-runtime 24.0.0", "substrate-prometheus-endpoint", "tracing", ] @@ -12331,10 +13229,10 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "array-bytes 4.2.0", - "async-channel", + "array-bytes 6.1.0", + "async-channel 1.9.0", "futures 0.3.28", "libp2p-identity", "log", @@ -12343,28 +13241,25 @@ dependencies = [ "prost-build", "sc-client-api", "sc-network", - "sc-network-common", - "sc-peerset", "sp-blockchain", - "sp-core", - "sp-runtime", + "sp-core 21.0.0", + "sp-runtime 24.0.0", "thiserror", ] [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "array-bytes 4.2.0", - "async-channel", + "array-bytes 6.1.0", + "async-channel 1.9.0", "async-trait", "fork-tree", "futures 0.3.28", "futures-timer", "libp2p", "log", - "lru 0.8.1", "mockall", "parity-scale-codec", "prost", @@ -12373,15 +13268,15 @@ dependencies = [ "sc-consensus", "sc-network", "sc-network-common", - "sc-peerset", "sc-utils", + "schnellru", "smallvec 1.11.0", - "sp-arithmetic", + "sp-arithmetic 16.0.0", "sp-blockchain", "sp-consensus", "sp-consensus-grandpa", - "sp-core", - "sp-runtime", + "sp-core 21.0.0", + "sp-runtime 24.0.0", "substrate-prometheus-endpoint", "thiserror", ] @@ -12389,29 +13284,27 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "array-bytes 4.2.0", + "array-bytes 6.1.0", "futures 0.3.28", "libp2p", "log", "parity-scale-codec", - "pin-project", "sc-network", "sc-network-common", - "sc-peerset", "sc-utils", "sp-consensus", - "sp-runtime", + "sp-runtime 24.0.0", "substrate-prometheus-endpoint", ] [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "array-bytes 4.2.0", + "array-bytes 6.1.0", "bytes", "fnv", "futures 0.3.28", @@ -12419,6 +13312,7 @@ dependencies = [ "hyper", "hyper-rustls", "libp2p", + "log", "num_cpus", "once_cell", "parity-scale-codec", @@ -12427,36 +13321,22 @@ dependencies = [ "sc-client-api", "sc-network", "sc-network-common", - "sc-peerset", + "sc-transaction-pool-api", "sc-utils", - "sp-api", - "sp-core", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-core 21.0.0", + "sp-externalities 0.19.0", + "sp-keystore 0.27.0", "sp-offchain", - "sp-runtime", + "sp-runtime 24.0.0", "threadpool", "tracing", ] -[[package]] -name = "sc-peerset" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "futures 0.3.28", - "libp2p-identity", - "log", - "parking_lot 0.12.1", - "partial_sort", - "sc-utils", - "serde_json", - "sp-arithmetic", - "wasm-timer", -] - [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -12465,7 +13345,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "futures 0.3.28", "jsonrpsee", @@ -12480,23 +13360,23 @@ dependencies = [ "sc-transaction-pool-api", "sc-utils", "serde_json", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-blockchain", - "sp-core", - "sp-keystore", + "sp-core 21.0.0", + "sp-keystore 0.27.0", "sp-offchain", "sp-rpc", - "sp-runtime", + "sp-runtime 24.0.0", "sp-session", "sp-statement-store", - "sp-version", + "sp-version 22.0.0", "tokio", ] [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -12505,17 +13385,17 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-core", + "sp-core 21.0.0", "sp-rpc", - "sp-runtime", - "sp-version", + "sp-runtime 24.0.0", + "sp-version 22.0.0", "thiserror", ] [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "http", "jsonrpsee", @@ -12530,9 +13410,9 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "array-bytes 4.2.0", + "array-bytes 6.1.0", "futures 0.3.28", "futures-util", "hex", @@ -12543,20 +13423,22 @@ dependencies = [ "sc-chain-spec", "sc-client-api", "sc-transaction-pool-api", + "sc-utils", "serde", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-blockchain", - "sp-core", - "sp-runtime", - "sp-version", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-version 22.0.0", "thiserror", + "tokio", "tokio-stream", ] [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "directories", @@ -12583,11 +13465,9 @@ dependencies = [ "sc-network-light", "sc-network-sync", "sc-network-transactions", - "sc-offchain", "sc-rpc", "sc-rpc-server", "sc-rpc-spec-v2", - "sc-storage-monitor", "sc-sysinfo", "sc-telemetry", "sc-tracing", @@ -12596,20 +13476,20 @@ dependencies = [ "sc-utils", "serde", "serde_json", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-externalities", - "sp-keystore", - "sp-runtime", + "sp-core 21.0.0", + "sp-externalities 0.19.0", + "sp-keystore 0.27.0", + "sp-runtime 24.0.0", "sp-session", - "sp-state-machine", - "sp-storage", + "sp-state-machine 0.28.0", + "sp-storage 13.0.0", "sp-transaction-pool", "sp-transaction-storage-proof", - "sp-trie", - "sp-version", + "sp-trie 22.0.0", + "sp-version 22.0.0", "static_init 1.0.3", "substrate-prometheus-endpoint", "tempfile", @@ -12622,26 +13502,24 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.1", - "sp-core", + "sp-core 21.0.0", ] [[package]] name = "sc-storage-monitor" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "clap", "fs4", - "futures 0.3.28", "log", "sc-client-db", - "sc-utils", - "sp-core", + "sp-core 21.0.0", "thiserror", "tokio", ] @@ -12649,7 +13527,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -12661,14 +13539,14 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-runtime", + "sp-runtime 24.0.0", "thiserror", ] [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "futures 0.3.28", "libc", @@ -12679,15 +13557,15 @@ dependencies = [ "sc-telemetry", "serde", "serde_json", - "sp-core", - "sp-io", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-std 8.0.0", ] [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "chrono", "futures 0.3.28", @@ -12706,7 +13584,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "ansi_term", "atty", @@ -12714,20 +13592,18 @@ dependencies = [ "lazy_static", "libc", "log", - "once_cell", "parking_lot 0.12.1", "regex", "rustc-hash", "sc-client-api", - "sc-rpc-server", "sc-tracing-proc-macro", "serde", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-blockchain", - "sp-core", + "sp-core 21.0.0", "sp-rpc", - "sp-runtime", - "sp-tracing", + "sp-runtime 24.0.0", + "sp-tracing 10.0.0", "thiserror", "tracing", "tracing-log", @@ -12737,36 +13613,35 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "futures 0.3.28", "futures-timer", "linked-hash-map", "log", - "num-traits", "parity-scale-codec", "parking_lot 0.12.1", "sc-client-api", "sc-transaction-pool-api", "sc-utils", "serde", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-blockchain", - "sp-core", - "sp-runtime", - "sp-tracing", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-tracing 10.0.0", "sp-transaction-pool", "substrate-prometheus-endpoint", "thiserror", @@ -12775,30 +13650,32 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "futures 0.3.28", "log", + "parity-scale-codec", "serde", "sp-blockchain", - "sp-runtime", + "sp-core 21.0.0", + "sp-runtime 24.0.0", "thiserror", ] [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "async-channel", + "async-channel 1.9.0", "futures 0.3.28", "futures-timer", "lazy_static", "log", "parking_lot 0.12.1", "prometheus", - "sp-arithmetic", + "sp-arithmetic 16.0.0", ] [[package]] @@ -12821,7 +13698,7 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "912e55f6d20e0e80d63733872b40e1227c0bce1e1ab81ba67d696339bfd7fd29" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -12857,7 +13734,7 @@ dependencies = [ "arrayvec 0.5.2", "curve25519-dalek 2.1.3", "getrandom 0.1.16", - "merlin", + "merlin 2.0.1", "rand 0.7.3", "rand_core 0.5.1", "sha2 0.8.2", @@ -12865,6 +13742,22 @@ dependencies = [ "zeroize", ] +[[package]] +name = "schnorrkel" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "844b7645371e6ecdf61ff246ba1958c29e802881a749ae3fb1993675d210d28d" +dependencies = [ + "arrayref", + "arrayvec 0.7.4", + "curve25519-dalek-ng", + "merlin 3.0.0", + "rand_core 0.6.4", + "sha2 0.9.9", + "subtle-ng", + "zeroize", +] + [[package]] name = "scopeguard" version = "1.1.0" @@ -12895,8 +13788,8 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -12905,8 +13798,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -13046,9 +13939,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.171" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" dependencies = [ "serde_derive", ] @@ -13066,20 +13959,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] name = "serde_json" -version = "1.0.100" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" +checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" dependencies = [ "itoa", "ryu", @@ -13204,10 +14097,10 @@ dependencies = [ "dapp-staking-v3-runtime-api", "fp-rpc", "fp-self-contained", - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-executive", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -13229,7 +14122,7 @@ dependencies = [ "pallet-collator-selection", "pallet-collective", "pallet-contracts", - "pallet-contracts-primitives", + "pallet-contracts-primitives 24.0.0", "pallet-dapp-staking-v3", "pallet-democracy", "pallet-dynamic-evm-base-fee", @@ -13274,30 +14167,30 @@ dependencies = [ "pallet-xvm", "parachain-info", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "precompile-utils", "scale-info", "smallvec 1.11.0", - "sp-api", - "sp-arithmetic", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-arithmetic 16.0.0", "sp-block-builder", "sp-consensus-aura", - "sp-core", - "sp-inherents", - "sp-io", + "sp-core 21.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-io 23.0.0", "sp-offchain", - "sp-runtime", - "sp-runtime-interface", + "sp-runtime 24.0.0", + "sp-runtime-interface 17.0.0", "sp-session", - "sp-std", + "sp-std 8.0.0", "sp-transaction-pool", - "sp-version", + "sp-version 22.0.0", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] @@ -13316,10 +14209,10 @@ dependencies = [ "cumulus-primitives-utility", "fp-rpc", "fp-self-contained", - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-executive", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -13339,7 +14232,7 @@ dependencies = [ "pallet-collator-selection", "pallet-collective", "pallet-contracts", - "pallet-contracts-primitives", + "pallet-contracts-primitives 24.0.0", "pallet-dapps-staking", "pallet-dynamic-evm-base-fee", "pallet-ethereum", @@ -13371,29 +14264,29 @@ dependencies = [ "pallet-xcm", "parachain-info", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "precompile-utils", "scale-info", "smallvec 1.11.0", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-block-builder", "sp-consensus-aura", - "sp-core", - "sp-inherents", - "sp-io", + "sp-core 21.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-io 23.0.0", "sp-offchain", - "sp-runtime", - "sp-runtime-interface", + "sp-runtime 24.0.0", + "sp-runtime-interface 17.0.0", "sp-session", - "sp-std", + "sp-std 8.0.0", "sp-transaction-pool", - "sp-version", + "sp-version 22.0.0", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] @@ -13473,7 +14366,7 @@ dependencies = [ "num-bigint", "num-traits", "thiserror", - "time 0.3.23", + "time", ] [[package]] @@ -13511,14 +14404,14 @@ dependencies = [ [[package]] name = "slot-range-helper" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "enumn", "parity-scale-codec", "paste", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -13545,6 +14438,113 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +[[package]] +name = "smol" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1" +dependencies = [ + "async-channel 1.9.0", + "async-executor", + "async-fs", + "async-io 1.13.0", + "async-lock 2.7.0", + "async-net", + "async-process", + "blocking", + "futures-lite 1.13.0", +] + +[[package]] +name = "smoldot" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0bb30cf57b7b5f6109ce17c3164445e2d6f270af2cb48f6e4d31c2967c9a9f5" +dependencies = [ + "arrayvec 0.7.4", + "async-lock 2.7.0", + "atomic-take", + "base64 0.21.2", + "bip39", + "blake2-rfc", + "bs58 0.5.0", + "chacha20", + "crossbeam-queue", + "derive_more", + "ed25519-zebra 4.0.3", + "either", + "event-listener 2.5.3", + "fnv", + "futures-lite 1.13.0", + "futures-util", + "hashbrown 0.14.0", + "hex", + "hmac 0.12.1", + "itertools 0.11.0", + "libsecp256k1", + "merlin 3.0.0", + "no-std-net", + "nom", + "num-bigint", + "num-rational", + "num-traits", + "pbkdf2 0.12.2", + "pin-project", + "poly1305", + "rand 0.8.5", + "rand_chacha 0.3.1", + "ruzstd", + "schnorrkel 0.10.2", + "serde", + "serde_json", + "sha2 0.10.7", + "sha3", + "siphasher", + "slab", + "smallvec 1.11.0", + "soketto", + "twox-hash", + "wasmi 0.31.1", + "x25519-dalek 2.0.0", + "zeroize", +] + +[[package]] +name = "smoldot-light" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "256b5bad1d6b49045e95fe87492ce73d5af81545d8b4d8318a872d2007024c33" +dependencies = [ + "async-channel 1.9.0", + "async-lock 2.7.0", + "base64 0.21.2", + "blake2-rfc", + "derive_more", + "either", + "event-listener 2.5.3", + "fnv", + "futures-channel", + "futures-lite 1.13.0", + "futures-util", + "hashbrown 0.14.0", + "hex", + "itertools 0.11.0", + "log", + "lru 0.11.1", + "no-std-net", + "parking_lot 0.12.1", + "pin-project", + "rand 0.8.5", + "rand_chacha 0.3.1", + "serde", + "serde_json", + "siphasher", + "slab", + "smol", + "smoldot", + "zeroize", +] + [[package]] name = "snap" version = "1.1.0" @@ -13553,16 +14553,16 @@ checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" [[package]] name = "snow" -version = "0.9.2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ccba027ba85743e09d15c03296797cad56395089b832b48b5a5217880f57733" +checksum = "58021967fd0a5eeeb23b08df6cc244a4d4a5b4aec1d27c9e02fad1a58b4cd74e" dependencies = [ - "aes-gcm 0.9.4", + "aes-gcm 0.10.2", "blake2", "chacha20poly1305", - "curve25519-dalek 4.0.0-rc.1", + "curve25519-dalek 4.1.1", "rand_core 0.6.4", - "ring", + "ring 0.17.7", "rustc_version 0.4.0", "sha2 0.10.7", "subtle", @@ -13614,14 +14614,35 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-api-proc-macro", - "sp-core", - "sp-metadata-ir", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", - "sp-version", + "sp-api-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", + "sp-core 7.0.0", + "sp-metadata-ir 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", + "sp-std 5.0.0", + "sp-trie 7.0.0", + "sp-version 5.0.0", + "thiserror", +] + +[[package]] +name = "sp-api" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "hash-db 0.16.0", + "log", + "parity-scale-codec", + "scale-info", + "sp-api-proc-macro 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-core 21.0.0", + "sp-externalities 0.19.0", + "sp-metadata-ir 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", + "sp-std 8.0.0", + "sp-trie 22.0.0", + "sp-version 22.0.0", "thiserror", ] @@ -13633,10 +14654,24 @@ dependencies = [ "Inflector", "blake2", "expander 1.0.0", - "proc-macro-crate", + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "sp-api-proc-macro" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "Inflector", + "blake2", + "expander 2.0.0", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -13647,9 +14682,22 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-std", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-std 5.0.0", +] + +[[package]] +name = "sp-application-crypto" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-std 8.0.0", ] [[package]] @@ -13662,153 +14710,163 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-std", + "sp-std 5.0.0", + "static_assertions", +] + +[[package]] +name = "sp-arithmetic" +version = "16.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "integer-sqrt", + "num-traits", + "parity-scale-codec", + "scale-info", + "serde", + "sp-std 8.0.0", "static_assertions", ] [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "parity-scale-codec", "scale-info", - "sp-api", - "sp-application-crypto", - "sp-runtime", - "sp-std", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-application-crypto 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "parity-scale-codec", - "sp-api", - "sp-inherents", - "sp-runtime", - "sp-std", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "futures 0.3.28", "log", - "lru 0.8.1", "parity-scale-codec", "parking_lot 0.12.1", - "sp-api", + "schnellru", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-consensus", "sp-database", - "sp-runtime", - "sp-state-machine", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", "thiserror", ] [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "futures 0.3.28", "log", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-state-machine", + "sp-core 21.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", "thiserror", ] [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "parity-scale-codec", "scale-info", - "sp-api", - "sp-application-crypto", - "sp-consensus", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-application-crypto 23.0.0", "sp-consensus-slots", - "sp-inherents", - "sp-runtime", - "sp-std", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-runtime 24.0.0", + "sp-std 8.0.0", "sp-timestamp", ] [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "parity-scale-codec", "scale-info", "serde", - "sp-api", - "sp-application-crypto", - "sp-consensus", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-application-crypto 23.0.0", "sp-consensus-slots", - "sp-core", - "sp-inherents", - "sp-keystore", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-runtime 24.0.0", + "sp-std 8.0.0", "sp-timestamp", ] [[package]] name = "sp-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "lazy_static", "parity-scale-codec", "scale-info", "serde", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-io", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-application-crypto 23.0.0", + "sp-core 21.0.0", + "sp-io 23.0.0", "sp-mmr-primitives", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-std 8.0.0", "strum 0.24.1", ] [[package]] name = "sp-consensus-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "finality-grandpa", "log", "parity-scale-codec", "scale-info", "serde", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-keystore", - "sp-runtime", - "sp-std", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-application-crypto 23.0.0", + "sp-core 21.0.0", + "sp-keystore 0.27.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-std", + "sp-std 8.0.0", "sp-timestamp", ] @@ -13823,7 +14881,53 @@ dependencies = [ "bounded-collections", "bs58 0.4.0", "dyn-clonable", - "ed25519-zebra", + "ed25519-zebra 3.1.0", + "futures 0.3.28", + "hash-db 0.16.0", + "hash256-std-hasher", + "impl-serde", + "lazy_static", + "libsecp256k1", + "log", + "merlin 2.0.1", + "parity-scale-codec", + "parking_lot 0.12.1", + "paste", + "primitive-types", + "rand 0.8.5", + "regex", + "scale-info", + "schnorrkel 0.9.1", + "secp256k1", + "secrecy", + "serde", + "sp-core-hashing 5.0.0", + "sp-debug-derive 5.0.0", + "sp-externalities 0.13.0", + "sp-runtime-interface 7.0.0", + "sp-std 5.0.0", + "sp-storage 7.0.0", + "ss58-registry", + "substrate-bip39", + "thiserror", + "tiny-bip39", + "zeroize", +] + +[[package]] +name = "sp-core" +version = "21.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "array-bytes 6.1.0", + "arrayvec 0.7.4", + "bandersnatch_vrfs", + "bitflags 1.3.2", + "blake2", + "bounded-collections", + "bs58 0.5.0", + "dyn-clonable", + "ed25519-zebra 3.1.0", "futures 0.3.28", "hash-db 0.16.0", "hash256-std-hasher", @@ -13831,7 +14935,7 @@ dependencies = [ "lazy_static", "libsecp256k1", "log", - "merlin", + "merlin 2.0.1", "parity-scale-codec", "parking_lot 0.12.1", "paste", @@ -13839,20 +14943,21 @@ dependencies = [ "rand 0.8.5", "regex", "scale-info", - "schnorrkel", + "schnorrkel 0.9.1", "secp256k1", "secrecy", "serde", - "sp-core-hashing", - "sp-debug-derive", - "sp-externalities", - "sp-runtime-interface", - "sp-std", - "sp-storage", + "sp-core-hashing 9.0.0", + "sp-debug-derive 8.0.0", + "sp-externalities 0.19.0", + "sp-runtime-interface 17.0.0", + "sp-std 8.0.0", + "sp-storage 13.0.0", "ss58-registry", "substrate-bip39", "thiserror", "tiny-bip39", + "tracing", "zeroize", ] @@ -13866,7 +14971,20 @@ dependencies = [ "digest 0.10.7", "sha2 0.10.7", "sha3", - "sp-std", + "sp-std 5.0.0", + "twox-hash", +] + +[[package]] +name = "sp-core-hashing" +version = "9.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "blake2b_simd", + "byteorder", + "digest 0.10.7", + "sha2 0.10.7", + "sha3", "twox-hash", ] @@ -13877,14 +14995,24 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e dependencies = [ "proc-macro2", "quote", - "sp-core-hashing", - "syn 2.0.32", + "sp-core-hashing 5.0.0", + "syn 2.0.48", +] + +[[package]] +name = "sp-core-hashing-proc-macro" +version = "9.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "quote", + "sp-core-hashing 9.0.0", + "syn 2.0.48", ] [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -13897,7 +15025,17 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", +] + +[[package]] +name = "sp-debug-derive" +version = "8.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", ] [[package]] @@ -13907,8 +15045,30 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e dependencies = [ "environmental", "parity-scale-codec", - "sp-std", - "sp-storage", + "sp-std 5.0.0", + "sp-storage 7.0.0", +] + +[[package]] +name = "sp-externalities" +version = "0.19.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "environmental", + "parity-scale-codec", + "sp-std 8.0.0", + "sp-storage 13.0.0", +] + +[[package]] +name = "sp-genesis-builder" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "serde_json", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -13920,9 +15080,23 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", + "thiserror", +] + +[[package]] +name = "sp-inherents" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "async-trait", + "impl-trait-for-tuples", + "parity-scale-codec", + "scale-info", + "sp-runtime 24.0.0", + "sp-std 8.0.0", "thiserror", ] @@ -13932,34 +15106,58 @@ version = "7.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" dependencies = [ "bytes", - "ed25519", - "ed25519-dalek", + "ed25519 1.5.3", + "ed25519-dalek 1.0.1", "futures 0.3.28", "libsecp256k1", "log", "parity-scale-codec", "rustversion", "secp256k1", - "sp-core", - "sp-externalities", - "sp-keystore", - "sp-runtime-interface", - "sp-state-machine", - "sp-std", - "sp-tracing", - "sp-trie", + "sp-core 7.0.0", + "sp-externalities 0.13.0", + "sp-keystore 0.13.0", + "sp-runtime-interface 7.0.0", + "sp-state-machine 0.13.0", + "sp-std 5.0.0", + "sp-tracing 6.0.0", + "sp-trie 7.0.0", "tracing", "tracing-core", ] [[package]] -name = "sp-keyring" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +name = "sp-io" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "lazy_static", - "sp-core", - "sp-runtime", + "bytes", + "ed25519-dalek 2.1.0", + "libsecp256k1", + "log", + "parity-scale-codec", + "rustversion", + "secp256k1", + "sp-core 21.0.0", + "sp-externalities 0.19.0", + "sp-keystore 0.27.0", + "sp-runtime-interface 17.0.0", + "sp-state-machine 0.28.0", + "sp-std 8.0.0", + "sp-tracing 10.0.0", + "sp-trie 22.0.0", + "tracing", + "tracing-core", +] + +[[package]] +name = "sp-keyring" +version = "24.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "lazy_static", + "sp-core 21.0.0", + "sp-runtime 24.0.0", "strum 0.24.1", ] @@ -13971,19 +15169,30 @@ dependencies = [ "futures 0.3.28", "parity-scale-codec", "parking_lot 0.12.1", - "serde", - "sp-core", - "sp-externalities", + "sp-core 7.0.0", + "sp-externalities 0.13.0", + "thiserror", +] + +[[package]] +name = "sp-keystore" +version = "0.27.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "parity-scale-codec", + "parking_lot 0.12.1", + "sp-core 21.0.0", + "sp-externalities 0.19.0", "thiserror", ] [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "thiserror", - "zstd 0.12.3+zstd.1.5.2", + "zstd 0.12.4", ] [[package]] @@ -13991,52 +15200,63 @@ name = "sp-metadata-ir" version = "0.1.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" dependencies = [ - "frame-metadata", + "frame-metadata 15.1.0", "parity-scale-codec", "scale-info", - "sp-std", + "sp-std 5.0.0", +] + +[[package]] +name = "sp-metadata-ir" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "frame-metadata 16.0.0", + "parity-scale-codec", + "scale-info", + "sp-std 8.0.0", ] [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "ckb-merkle-mountain-range", "log", "parity-scale-codec", "scale-info", "serde", - "sp-api", - "sp-core", - "sp-debug-derive", - "sp-runtime", - "sp-std", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-core 21.0.0", + "sp-debug-derive 8.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", "thiserror", ] [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-core", - "sp-runtime", - "sp-std", + "sp-arithmetic 16.0.0", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "sp-api", - "sp-core", - "sp-runtime", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-core 21.0.0", + "sp-runtime 24.0.0", ] [[package]] @@ -14049,14 +15269,24 @@ dependencies = [ "regex", ] +[[package]] +name = "sp-panic-handler" +version = "8.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "backtrace", + "lazy_static", + "regex", +] + [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "rustc-hash", "serde", - "sp-core", + "sp-core 21.0.0", ] [[package]] @@ -14073,12 +15303,34 @@ dependencies = [ "rand 0.8.5", "scale-info", "serde", - "sp-application-crypto", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-std", - "sp-weights", + "sp-application-crypto 7.0.0", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-std 5.0.0", + "sp-weights 4.0.0", +] + +[[package]] +name = "sp-runtime" +version = "24.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "either", + "hash256-std-hasher", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "paste", + "rand 0.8.5", + "scale-info", + "serde", + "sp-application-crypto 23.0.0", + "sp-arithmetic 16.0.0", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-std 8.0.0", + "sp-weights 20.0.0", ] [[package]] @@ -14090,12 +15342,30 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", - "sp-externalities", - "sp-runtime-interface-proc-macro", - "sp-std", - "sp-storage", - "sp-tracing", - "sp-wasm-interface", + "sp-externalities 0.13.0", + "sp-runtime-interface-proc-macro 6.0.0", + "sp-std 5.0.0", + "sp-storage 7.0.0", + "sp-tracing 6.0.0", + "sp-wasm-interface 7.0.0", + "static_assertions", +] + +[[package]] +name = "sp-runtime-interface" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "bytes", + "impl-trait-for-tuples", + "parity-scale-codec", + "primitive-types", + "sp-externalities 0.19.0", + "sp-runtime-interface-proc-macro 11.0.0", + "sp-std 8.0.0", + "sp-storage 13.0.0", + "sp-tracing 10.0.0", + "sp-wasm-interface 14.0.0", "static_assertions", ] @@ -14105,24 +15375,37 @@ version = "6.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" dependencies = [ "Inflector", - "proc-macro-crate", + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "sp-runtime-interface-proc-macro" +version = "11.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "Inflector", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "parity-scale-codec", "scale-info", - "sp-api", - "sp-core", - "sp-runtime", - "sp-staking", - "sp-std", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-core 21.0.0", + "sp-keystore 0.27.0", + "sp-runtime 24.0.0", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-std 8.0.0", ] [[package]] @@ -14133,9 +15416,23 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", +] + +[[package]] +name = "sp-staking" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "impl-trait-for-tuples", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -14149,31 +15446,58 @@ dependencies = [ "parking_lot 0.12.1", "rand 0.8.5", "smallvec 1.11.0", - "sp-core", - "sp-externalities", - "sp-panic-handler", - "sp-std", - "sp-trie", + "sp-core 7.0.0", + "sp-externalities 0.13.0", + "sp-panic-handler 5.0.0", + "sp-std 5.0.0", + "sp-trie 7.0.0", + "thiserror", + "tracing", +] + +[[package]] +name = "sp-state-machine" +version = "0.28.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "hash-db 0.16.0", + "log", + "parity-scale-codec", + "parking_lot 0.12.1", + "rand 0.8.5", + "smallvec 1.11.0", + "sp-core 21.0.0", + "sp-externalities 0.19.0", + "sp-panic-handler 8.0.0", + "sp-std 8.0.0", + "sp-trie 22.0.0", "thiserror", "tracing", + "trie-db", ] [[package]] name = "sp-statement-store" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "log", + "aes-gcm 0.10.2", + "curve25519-dalek 4.1.1", + "ed25519-dalek 2.1.0", + "hkdf", "parity-scale-codec", + "rand 0.8.5", "scale-info", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-externalities", - "sp-runtime", - "sp-runtime-interface", - "sp-std", + "sha2 0.10.7", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-application-crypto 23.0.0", + "sp-core 21.0.0", + "sp-externalities 0.19.0", + "sp-runtime 24.0.0", + "sp-runtime-interface 17.0.0", + "sp-std 8.0.0", "thiserror", + "x25519-dalek 2.0.0", ] [[package]] @@ -14181,6 +15505,11 @@ name = "sp-std" version = "5.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +[[package]] +name = "sp-std" +version = "8.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" + [[package]] name = "sp-storage" version = "7.0.0" @@ -14190,22 +15519,33 @@ dependencies = [ "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive", - "sp-std", + "sp-debug-derive 5.0.0", + "sp-std 5.0.0", +] + +[[package]] +name = "sp-storage" +version = "13.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "ref-cast", + "serde", + "sp-debug-derive 8.0.0", + "sp-std 8.0.0", ] [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", - "futures-timer", - "log", "parity-scale-codec", - "sp-inherents", - "sp-runtime", - "sp-std", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-runtime 24.0.0", + "sp-std 8.0.0", "thiserror", ] @@ -14215,7 +15555,19 @@ version = "6.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" dependencies = [ "parity-scale-codec", - "sp-std", + "sp-std 5.0.0", + "tracing", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "sp-tracing" +version = "10.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "parity-scale-codec", + "sp-std 8.0.0", "tracing", "tracing-core", "tracing-subscriber", @@ -14224,26 +15576,25 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "sp-api", - "sp-runtime", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-runtime 24.0.0", ] [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", - "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-std", - "sp-trie", + "sp-core 21.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "sp-trie 22.0.0", ] [[package]] @@ -14261,8 +15612,31 @@ dependencies = [ "parking_lot 0.12.1", "scale-info", "schnellru", - "sp-core", - "sp-std", + "sp-core 7.0.0", + "sp-std 5.0.0", + "thiserror", + "tracing", + "trie-db", + "trie-root", +] + +[[package]] +name = "sp-trie" +version = "22.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "ahash 0.8.3", + "hash-db 0.16.0", + "hashbrown 0.13.2", + "lazy_static", + "memory-db", + "nohash-hasher", + "parity-scale-codec", + "parking_lot 0.12.1", + "scale-info", + "schnellru", + "sp-core 21.0.0", + "sp-std 8.0.0", "thiserror", "tracing", "trie-db", @@ -14279,10 +15653,27 @@ dependencies = [ "parity-wasm", "scale-info", "serde", - "sp-core-hashing-proc-macro", - "sp-runtime", - "sp-std", - "sp-version-proc-macro", + "sp-core-hashing-proc-macro 5.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", + "sp-version-proc-macro 4.0.0-dev", + "thiserror", +] + +[[package]] +name = "sp-version" +version = "22.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "parity-wasm", + "scale-info", + "serde", + "sp-core-hashing-proc-macro 9.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "sp-version-proc-macro 8.0.0", "thiserror", ] @@ -14294,7 +15685,18 @@ dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", +] + +[[package]] +name = "sp-version-proc-macro" +version = "8.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "parity-scale-codec", + "proc-macro2", + "quote", + "syn 2.0.48", ] [[package]] @@ -14306,11 +15708,24 @@ dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std", + "sp-std 5.0.0", "wasmi 0.13.2", "wasmtime", ] +[[package]] +name = "sp-wasm-interface" +version = "14.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "anyhow", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "sp-std 8.0.0", + "wasmtime", +] + [[package]] name = "sp-weights" version = "4.0.0" @@ -14320,10 +15735,25 @@ dependencies = [ "scale-info", "serde", "smallvec 1.11.0", - "sp-arithmetic", - "sp-core", - "sp-debug-derive", - "sp-std", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", + "sp-debug-derive 5.0.0", + "sp-std 5.0.0", +] + +[[package]] +name = "sp-weights" +version = "20.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "smallvec 1.11.0", + "sp-arithmetic 16.0.0", + "sp-core 21.0.0", + "sp-debug-derive 8.0.0", + "sp-std 8.0.0", ] [[package]] @@ -14350,46 +15780,211 @@ dependencies = [ ] [[package]] -name = "spki" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +name = "spki" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +dependencies = [ + "base64ct", + "der 0.6.1", +] + +[[package]] +name = "spki" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +dependencies = [ + "base64ct", + "der 0.7.7", +] + +[[package]] +name = "ss58-registry" +version = "1.41.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfc443bad666016e012538782d9e3006213a7db43e9fb1dda91657dc06a6fa08" +dependencies = [ + "Inflector", + "num-format", + "proc-macro2", + "quote", + "serde", + "serde_json", + "unicode-xid", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "staging-kusama-runtime" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" +dependencies = [ + "binary-merkle-tree", + "bitvec", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-election-provider-support", + "frame-executive", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal", + "kusama-runtime-constants", + "log", + "pallet-authority-discovery", + "pallet-authorship", + "pallet-babe", + "pallet-bags-list", + "pallet-balances", + "pallet-beefy", + "pallet-beefy-mmr", + "pallet-bounties", + "pallet-child-bounties", + "pallet-collective", + "pallet-conviction-voting", + "pallet-democracy", + "pallet-election-provider-multi-phase", + "pallet-election-provider-support-benchmarking", + "pallet-elections-phragmen", + "pallet-fast-unstake", + "pallet-grandpa", + "pallet-identity", + "pallet-im-online", + "pallet-indices", + "pallet-membership", + "pallet-message-queue", + "pallet-mmr", + "pallet-multisig", + "pallet-nis", + "pallet-nomination-pools", + "pallet-nomination-pools-benchmarking", + "pallet-nomination-pools-runtime-api", + "pallet-offences", + "pallet-offences-benchmarking", + "pallet-preimage", + "pallet-proxy", + "pallet-ranked-collective", + "pallet-recovery", + "pallet-referenda", + "pallet-scheduler", + "pallet-session", + "pallet-session-benchmarking", + "pallet-society", + "pallet-staking", + "pallet-staking-runtime-api", + "pallet-state-trie-migration", + "pallet-timestamp", + "pallet-tips", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-treasury", + "pallet-utility", + "pallet-vesting", + "pallet-whitelist", + "pallet-xcm", + "pallet-xcm-benchmarks", + "parity-scale-codec", + "polkadot-primitives", + "polkadot-runtime-common", + "polkadot-runtime-parachains", + "rustc-hex", + "scale-info", + "serde", + "serde_derive", + "smallvec 1.11.0", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-application-crypto 23.0.0", + "sp-arithmetic 16.0.0", + "sp-authority-discovery", + "sp-block-builder", + "sp-consensus-babe", + "sp-consensus-beefy", + "sp-core 21.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-io 23.0.0", + "sp-mmr-primitives", + "sp-npos-elections", + "sp-offchain", + "sp-runtime 24.0.0", + "sp-session", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-std 8.0.0", + "sp-storage 13.0.0", + "sp-transaction-pool", + "sp-version 22.0.0", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "static_assertions", + "substrate-wasm-builder", +] + +[[package]] +name = "staging-xcm" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "base64ct", - "der 0.6.1", + "bounded-collections", + "derivative", + "environmental", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "scale-info", + "serde", + "sp-weights 20.0.0", + "xcm-procedural", ] [[package]] -name = "spki" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +name = "staging-xcm-builder" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "base64ct", - "der 0.7.7", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "impl-trait-for-tuples", + "log", + "pallet-transaction-payment", + "parity-scale-codec", + "polkadot-parachain-primitives", + "scale-info", + "sp-arithmetic 16.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "sp-weights 20.0.0", + "staging-xcm", + "staging-xcm-executor", ] [[package]] -name = "ss58-registry" -version = "1.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfc443bad666016e012538782d9e3006213a7db43e9fb1dda91657dc06a6fa08" +name = "staging-xcm-executor" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "Inflector", - "num-format", - "proc-macro2", - "quote", - "serde", - "serde_json", - "unicode-xid", + "environmental", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "sp-arithmetic 16.0.0", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "sp-weights 20.0.0", + "staging-xcm", ] -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - [[package]] name = "static_assertions" version = "1.1.0" @@ -14496,7 +16091,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -14510,7 +16105,7 @@ dependencies = [ "lazy_static", "md-5", "rand 0.8.5", - "ring", + "ring 0.16.20", "subtle", "thiserror", "tokio", @@ -14526,7 +16121,7 @@ checksum = "49eee6965196b32f882dd2ee85a92b1dbead41b04e53907f269de3b0dc04733c" dependencies = [ "hmac 0.11.0", "pbkdf2 0.8.0", - "schnorrkel", + "schnorrkel 0.9.1", "sha2 0.9.9", "zeroize", ] @@ -14547,15 +16142,12 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "platforms 2.0.0", -] +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.28", @@ -14564,17 +16156,17 @@ dependencies = [ "parity-scale-codec", "sc-rpc-api", "sc-transaction-pool-api", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-block-builder", "sp-blockchain", - "sp-core", - "sp-runtime", + "sp-core 21.0.0", + "sp-runtime 24.0.0", ] [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "hyper", "log", @@ -14586,44 +16178,43 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "jsonrpsee", "log", "sc-rpc-api", "serde", - "sp-runtime", + "sp-runtime 24.0.0", ] [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "jsonrpsee", - "log", "parity-scale-codec", "sc-client-api", "sc-rpc-api", - "scale-info", "serde", - "sp-core", - "sp-runtime", - "sp-state-machine", - "sp-trie", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", + "sp-trie 22.0.0", "trie-db", ] [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "ansi_term", "build-helper", "cargo_metadata 0.15.4", "filetime", + "parity-wasm", "sp-maybe-compressed-blob", "strum 0.24.1", "tempfile", @@ -14647,6 +16238,12 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +[[package]] +name = "subtle-ng" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" + [[package]] name = "syn" version = "1.0.109" @@ -14660,9 +16257,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.32" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -14723,7 +16320,7 @@ dependencies = [ "cfg-if", "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix 0.38.3", + "rustix 0.38.25", "windows-sys 0.48.0", ] @@ -14744,22 +16341,42 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.43" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] +[[package]] +name = "thiserror-core" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c001ee18b7e5e3f62cbf58c7fe220119e68d902bb7443179c0c8aef30090e999" +dependencies = [ + "thiserror-core-impl", +] + +[[package]] +name = "thiserror-core-impl" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4c60d69f36615a077cc7663b9cb8e42275722d23e58a7fa3d2c7f2915d09d04" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "thiserror-impl" -version = "1.0.43" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -14821,17 +16438,6 @@ dependencies = [ "libc", ] -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - [[package]] name = "time" version = "0.3.23" @@ -14939,7 +16545,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -14955,13 +16561,12 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.23.4" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.20.8", + "rustls 0.21.10", "tokio", - "webpki 0.22.0", ] [[package]] @@ -15009,7 +16614,19 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.12", +] + +[[package]] +name = "toml" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.2", ] [[package]] @@ -15031,7 +16648,20 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.4.9", +] + +[[package]] +name = "toml_edit" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.5.34", ] [[package]] @@ -15051,7 +16681,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8bd22a874a2d0b70452d5597b12c537331d49060824a95f49f108994f94aa4c" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.2", "bytes", "futures-core", "futures-util", @@ -15096,7 +16726,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -15121,9 +16751,10 @@ dependencies = [ [[package]] name = "tracing-gum" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ + "coarsetime", "polkadot-node-jaeger", "polkadot-primitives", "tracing", @@ -15132,14 +16763,14 @@ dependencies = [ [[package]] name = "tracing-gum-proc-macro" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "expander 2.0.0", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -15273,7 +16904,7 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", "clap", @@ -15284,27 +16915,26 @@ dependencies = [ "parity-scale-codec", "sc-cli", "sc-executor", - "sc-service", "serde", "serde_json", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "sp-consensus-aura", "sp-consensus-babe", - "sp-core", - "sp-debug-derive", - "sp-externalities", - "sp-inherents", - "sp-io", - "sp-keystore", + "sp-core 21.0.0", + "sp-debug-derive 8.0.0", + "sp-externalities 0.19.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-io 23.0.0", + "sp-keystore 0.27.0", "sp-rpc", - "sp-runtime", - "sp-state-machine", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", "sp-timestamp", "sp-transaction-storage-proof", - "sp-version", - "sp-weights", + "sp-version 22.0.0", + "sp-weights 20.0.0", "substrate-rpc-client", - "zstd 0.12.3+zstd.1.5.2", + "zstd 0.12.4", ] [[package]] @@ -15340,7 +16970,7 @@ dependencies = [ "log", "md-5", "rand 0.8.5", - "ring", + "ring 0.16.20", "stun", "thiserror", "tokio", @@ -15429,8 +17059,8 @@ dependencies = [ "num_enum 0.5.11", "parity-scale-codec", "scale-info", - "sp-core", - "sp-runtime", + "sp-core 21.0.0", + "sp-runtime 24.0.0", ] [[package]] @@ -15471,6 +17101,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "url" version = "2.4.0" @@ -15571,12 +17207,6 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -15604,7 +17234,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", "wasm-bindgen-shared", ] @@ -15638,7 +17268,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -15669,9 +17299,9 @@ dependencies = [ [[package]] name = "wasm-opt" -version = "0.112.0" +version = "0.114.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87fef6d0d508f08334e0ab0e6877feb4c0ecb3956bcf2cb950699b22fedf3e9c" +checksum = "effbef3bd1dde18acb401f73e740a6f3d4a1bc651e9773bddc512fe4d8d68f67" dependencies = [ "anyhow", "libc", @@ -15685,9 +17315,9 @@ dependencies = [ [[package]] name = "wasm-opt-cxx-sys" -version = "0.112.0" +version = "0.114.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc816bbc1596c8f2e8127e137a760c798023ef3d378f2ae51f0f1840e2dfa445" +checksum = "c09e24eb283919ace2ed5733bda4842a59ce4c8de110ef5c6d98859513d17047" dependencies = [ "anyhow", "cxx", @@ -15697,9 +17327,9 @@ dependencies = [ [[package]] name = "wasm-opt-sys" -version = "0.112.0" +version = "0.114.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40199e4f68ef1071b3c6d0bd8026a12b481865d4b9e49c156932ea9a6234dd14" +checksum = "36f2f817bed2e8d65eb779fa37317e74de15585751f903c9118342d1970703a4" dependencies = [ "anyhow", "cc", @@ -15745,6 +17375,19 @@ dependencies = [ "wasmparser-nostd", ] +[[package]] +name = "wasmi" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acfc1e384a36ca532d070a315925887247f3c7e23567e23e0ac9b1c5d6b8bf76" +dependencies = [ + "smallvec 1.11.0", + "spin 0.9.8", + "wasmi_arena", + "wasmi_core 0.13.0", + "wasmparser-nostd", +] + [[package]] name = "wasmi-validation" version = "0.5.0" @@ -15767,7 +17410,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7" dependencies = [ "downcast-rs", - "libm 0.2.7", + "libm", "memory_units", "num-rational", "num-traits", @@ -15780,7 +17423,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624e6333e861ef49095d2d678b76ebf30b06bf37effca845be7e5b87c90071b7" dependencies = [ "downcast-rs", - "libm 0.2.7", + "libm", + "num-traits", + "paste", +] + +[[package]] +name = "wasmi_core" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a" +dependencies = [ + "downcast-rs", + "libm", "num-traits", "paste", ] @@ -16015,8 +17670,8 @@ version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -16025,8 +17680,8 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -16038,6 +17693,12 @@ dependencies = [ "webpki 0.22.0", ] +[[package]] +name = "webpki-roots" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" + [[package]] name = "webrtc" version = "0.6.0" @@ -16054,7 +17715,7 @@ dependencies = [ "rand 0.8.5", "rcgen 0.9.3", "regex", - "ring", + "ring 0.16.20", "rtcp", "rtp", "rustls 0.19.1", @@ -16064,7 +17725,7 @@ dependencies = [ "sha2 0.10.7", "stun", "thiserror", - "time 0.3.23", + "time", "tokio", "turn", "url", @@ -16119,7 +17780,7 @@ dependencies = [ "rand 0.8.5", "rand_core 0.6.4", "rcgen 0.9.3", - "ring", + "ring 0.16.20", "rustls 0.19.1", "sec1 0.3.0", "serde", @@ -16131,7 +17792,7 @@ dependencies = [ "tokio", "webpki 0.21.4", "webrtc-util", - "x25519-dalek 2.0.0-pre.1", + "x25519-dalek 2.0.0", "x509-parser 0.13.2", ] @@ -16249,15 +17910,16 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ + "binary-merkle-tree", "bitvec", - "frame-benchmarking", + "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-election-provider-support", "frame-executive", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -16268,6 +17930,8 @@ dependencies = [ "pallet-babe", "pallet-bags-list", "pallet-balances", + "pallet-beefy", + "pallet-beefy-mmr", "pallet-collective", "pallet-democracy", "pallet-election-provider-multi-phase", @@ -16280,6 +17944,7 @@ dependencies = [ "pallet-indices", "pallet-membership", "pallet-message-queue", + "pallet-mmr", "pallet-multisig", "pallet-nomination-pools", "pallet-nomination-pools-benchmarking", @@ -16307,7 +17972,7 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", @@ -16316,42 +17981,44 @@ dependencies = [ "serde", "serde_derive", "smallvec 1.11.0", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-application-crypto 23.0.0", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", "sp-consensus-beefy", - "sp-core", - "sp-inherents", - "sp-io", + "sp-core 21.0.0", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-io 23.0.0", "sp-mmr-primitives", "sp-npos-elections", "sp-offchain", - "sp-runtime", + "sp-runtime 24.0.0", "sp-session", - "sp-staking", - "sp-std", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-std 8.0.0", + "sp-storage 13.0.0", "sp-transaction-pool", - "sp-version", + "sp-version 22.0.0", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", "westend-runtime-constants", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] name = "westend-runtime-constants" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "polkadot-primitives", "polkadot-runtime-common", "smallvec 1.11.0", - "sp-core", - "sp-runtime", - "sp-weights", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-weights 20.0.0", ] [[package]] @@ -16452,6 +18119,15 @@ dependencies = [ "windows-targets 0.48.1", ] +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -16482,6 +18158,21 @@ dependencies = [ "windows_x86_64_msvc 0.48.0", ] +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -16494,6 +18185,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + [[package]] name = "windows_aarch64_msvc" version = "0.34.0" @@ -16512,6 +18209,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + [[package]] name = "windows_i686_gnu" version = "0.34.0" @@ -16530,6 +18233,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + [[package]] name = "windows_i686_msvc" version = "0.34.0" @@ -16548,6 +18257,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + [[package]] name = "windows_x86_64_gnu" version = "0.34.0" @@ -16566,6 +18281,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -16578,6 +18299,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + [[package]] name = "windows_x86_64_msvc" version = "0.34.0" @@ -16596,6 +18323,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + [[package]] name = "winnow" version = "0.4.9" @@ -16605,6 +18338,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.5.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.50.0" @@ -16656,12 +18398,13 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "2.0.0-pre.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df" +checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" dependencies = [ - "curve25519-dalek 3.2.0", + "curve25519-dalek 4.1.1", "rand_core 0.6.4", + "serde", "zeroize", ] @@ -16678,10 +18421,10 @@ dependencies = [ "lazy_static", "nom", "oid-registry 0.4.0", - "ring", + "ring 0.16.20", "rusticata-macros", "thiserror", - "time 0.3.23", + "time", ] [[package]] @@ -16699,94 +18442,36 @@ dependencies = [ "oid-registry 0.6.1", "rusticata-macros", "thiserror", - "time 0.3.23", -] - -[[package]] -name = "xcm" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" -dependencies = [ - "bounded-collections", - "derivative", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "scale-info", - "serde", - "sp-weights", - "xcm-procedural", -] - -[[package]] -name = "xcm-builder" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" -dependencies = [ - "frame-support", - "frame-system", - "impl-trait-for-tuples", - "log", - "pallet-transaction-payment", - "parity-scale-codec", - "polkadot-parachain", - "scale-info", - "sp-arithmetic", - "sp-io", - "sp-runtime", - "sp-std", - "sp-weights", - "xcm", - "xcm-executor", -] - -[[package]] -name = "xcm-executor" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" -dependencies = [ - "environmental", - "frame-benchmarking", - "frame-support", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "sp-weights", - "xcm", + "time", ] [[package]] name = "xcm-procedural" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] name = "xcm-simulator" -version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25" +version = "1.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "parity-scale-codec", "paste", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-runtime-parachains", - "sp-io", - "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "sp-io 23.0.0", + "sp-std 8.0.0", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", ] [[package]] @@ -16796,8 +18481,8 @@ dependencies = [ "astar-primitives", "astar-test-utils", "cumulus-pallet-xcm", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", "log", "orml-traits", "orml-xcm-support", @@ -16805,7 +18490,7 @@ dependencies = [ "pallet-assets", "pallet-balances", "pallet-contracts", - "pallet-contracts-primitives", + "pallet-contracts-primitives 24.0.0", "pallet-dapps-staking", "pallet-insecure-randomness-collective-flip", "pallet-message-queue", @@ -16816,19 +18501,19 @@ dependencies = [ "pallet-xcm", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-parachains", "scale-info", "smallvec 1.11.0", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "sp-tracing", - "xcm", - "xcm-builder", - "xcm-executor", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "sp-tracing 10.0.0", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "xcm-simulator", ] @@ -16840,14 +18525,14 @@ dependencies = [ "clap", "cumulus-primitives-core", "hex", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", - "sp-core", - "sp-runtime", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-build-script-utils", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] @@ -16857,8 +18542,8 @@ dependencies = [ "astar-primitives", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -16881,7 +18566,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.23", + "time", ] [[package]] @@ -16901,7 +18586,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.48", ] [[package]] @@ -16915,9 +18600,9 @@ dependencies = [ [[package]] name = "zstd" -version = "0.12.3+zstd.1.5.2" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" +checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" dependencies = [ "zstd-safe 6.0.5+zstd.1.5.4", ] diff --git a/Cargo.toml b/Cargo.toml index 30f78873e0..56711b23f7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,7 +41,7 @@ exclude = ["vendor"] # Astar runtime requires unwinding. panic = "unwind" -[patch."https://github.com/paritytech/substrate"] +[patch."https://github.com/paritytech/polkadot-sdk"] pallet-contracts = { git = "https://github.com/AstarNetwork/substrate", branch = "astar-polkadot-v0.9.43" } pallet-contracts-primitives = { git = "https://github.com/AstarNetwork/substrate", branch = "astar-polkadot-v0.9.43" } @@ -56,7 +56,7 @@ repository = "https://github.com/AstarNetwork/Astar" # (wasm) parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive"] } scale-info = { version = "2.5.0", default-features = false, features = ["derive"] } -log = { version = "0.4.17", default-features = false } +log = { version = "0.4.20", default-features = false } environmental = { version = "1.1.2", default-features = false } sha3 = { version = "0.10.1", default-features = false } num_enum = { version = "0.5.3", default-features = false } @@ -94,91 +94,91 @@ ethers = { version = "2.0.9", default_features = false } # Substrate # (wasm) -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-core-hashing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-core-hashing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-version = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +sp-externalities = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } # (native) -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-consensus-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-network-sync = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sp-trie = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-client-db = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-consensus-babe = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +try-runtime-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } # Substrate pallets # (wasm) -pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-contracts = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-contracts-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false, features = ["historical"] } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } -pallet-message-queue = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false } +pallet-assets = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-contracts = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-contracts-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-identity = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, features = ["historical"] } +pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-vesting = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } # EVM & Ethereum # (wasm) @@ -191,84 +191,84 @@ ethereum = { version = "0.14.0", default-features = false } # Frontier # (wasm) -fp-rpc = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v0.9.43", default-features = false } -fp-self-contained = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v0.9.43", default-features = false } -pallet-ethereum = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v0.9.43", default-features = false, features = ["forbid-evm-reentrancy"] } -pallet-evm = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v0.9.43", default-features = false, features = ["forbid-evm-reentrancy"] } -pallet-evm-precompile-blake2 = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v0.9.43", default-features = false } -pallet-evm-precompile-bn128 = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v0.9.43", default-features = false } -pallet-evm-precompile-dispatch = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v0.9.43", default-features = false } -pallet-evm-precompile-ed25519 = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v0.9.43", default-features = false } -pallet-evm-precompile-modexp = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v0.9.43", default-features = false } -pallet-evm-precompile-sha3fips = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v0.9.43", default-features = false } -pallet-evm-precompile-simple = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v0.9.43", default-features = false } -pallet-base-fee = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v0.9.43", default-features = false } -pallet-evm-chain-id = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v0.9.43", default-features = false } -fp-evm = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v0.9.43", default-features = false } -fp-ethereum = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v0.9.43", default-features = false } +fp-rpc = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0", default-features = false } +fp-self-contained = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0", default-features = false } +pallet-ethereum = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0", default-features = false, features = ["forbid-evm-reentrancy"] } +pallet-evm = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0", default-features = false, features = ["forbid-evm-reentrancy"] } +pallet-evm-precompile-blake2 = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0", default-features = false } +pallet-evm-precompile-bn128 = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0", default-features = false } +pallet-evm-precompile-dispatch = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0", default-features = false } +pallet-evm-precompile-ed25519 = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0", default-features = false } +pallet-evm-precompile-modexp = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0", default-features = false } +pallet-evm-precompile-sha3fips = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0", default-features = false } +pallet-evm-precompile-simple = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0", default-features = false } +pallet-base-fee = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0", default-features = false } +pallet-evm-chain-id = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0", default-features = false } +fp-evm = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0", default-features = false } +fp-ethereum = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0", default-features = false } # (native) -fc-consensus = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v0.9.43" } -fc-db = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v0.9.43" } -fc-mapping-sync = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v0.9.43" } -fc-rpc = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v0.9.43", features = ["rpc-binary-search-estimate"] } -fc-rpc-core = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v0.9.43" } -fp-consensus = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v0.9.43" } -fp-storage = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v0.9.43" } -fc-storage = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v0.9.43" } +fc-consensus = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0" } +fc-db = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0" } +fc-mapping-sync = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0" } +fc-rpc = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0", features = ["rpc-binary-search-estimate"] } +fc-rpc-core = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0" } +fp-consensus = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0" } +fp-storage = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0" } +fc-storage = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0" } # Cumulus # (wasm) -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +parachain-info = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } # (native) -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43" } +cumulus-client-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-client-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } # Polkadot # (wasm) -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false } -polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } # XCM # (wasm) -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.43", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false } -pallet-xcm-benchmarks = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false } -xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +pallet-xcm-benchmarks = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } +xcm-simulator = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false } # (native) -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +polkadot-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } # ORML # (wasm) -orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.43", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.43", default-features = false } -orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.43", default-features = false } +orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v1.1.0", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v1.1.0", default-features = false } +orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v1.1.0", default-features = false } # Astar pallets & modules # (wasm) @@ -334,5 +334,5 @@ moonbeam-rpc-core-trace = { path = "./vendor/rpc-core/trace" } moonbeam-rpc-core-debug = { path = "./vendor/rpc-core/debug" } # Build deps -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" } +substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } +substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" } diff --git a/rust-toolchain.toml b/rust-toolchain.toml index d9f00d7570..18ab590fbd 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.69.0" +channel = "1.70.0" components = ["rustfmt", "clippy"] targets = ["wasm32-unknown-unknown"] profile = "minimal" From 323187ce672550f70803733ba817dd208dbb67c9 Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Mon, 22 Jan 2024 17:34:22 +0400 Subject: [PATCH 02/29] feat(assets-erc20): update imports for `frame_support` --- precompiles/assets-erc20/src/lib.rs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/precompiles/assets-erc20/src/lib.rs b/precompiles/assets-erc20/src/lib.rs index 9c471a0ad7..7b2a32a975 100644 --- a/precompiles/assets-erc20/src/lib.rs +++ b/precompiles/assets-erc20/src/lib.rs @@ -37,18 +37,19 @@ #![cfg_attr(not(feature = "std"), no_std)] use fp_evm::{ExitError, PrecompileHandle}; -use frame_support::traits::fungibles::approvals::Inspect as ApprovalInspect; -use frame_support::traits::fungibles::metadata::Inspect as MetadataInspect; -use frame_support::traits::fungibles::Inspect; -use frame_support::traits::OriginTrait; -use frame_support::DefaultNoBound; use frame_support::{ - dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}, - sp_runtime::traits::StaticLookup, + dispatch::{GetDispatchInfo, PostDispatchInfo}, + traits::{ + fungibles::{ + approvals::Inspect as ApprovalInspect, metadata::Inspect as MetadataInspect, Inspect, + }, + OriginTrait, + }, + DefaultNoBound, }; use pallet_evm::AddressMapping; use precompile_utils::prelude::*; -use sp_runtime::traits::Bounded; +use sp_runtime::traits::{Bounded, Dispatchable, StaticLookup}; use sp_core::{Get, MaxEncodedLen, H160, U256}; use sp_std::{ From bfe1ded7eab7bf05224d11dd60372c0c496ea35b Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Mon, 22 Jan 2024 17:35:45 +0400 Subject: [PATCH 03/29] feat(xc-asset-config): update imports for `frame_support` --- pallets/xc-asset-config/src/migrations.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pallets/xc-asset-config/src/migrations.rs b/pallets/xc-asset-config/src/migrations.rs index e1a445564e..c80d4791c9 100644 --- a/pallets/xc-asset-config/src/migrations.rs +++ b/pallets/xc-asset-config/src/migrations.rs @@ -17,8 +17,10 @@ // along with Astar. If not, see . use super::*; -use frame_support::traits::OnRuntimeUpgrade; -use frame_support::{dispatch::GetStorageVersion, log, pallet_prelude::*, traits::Get}; +use frame_support::{ + pallet_prelude::*, + traits::{Get, OnRuntimeUpgrade}, +}; use sp_std::{marker::PhantomData, vec::Vec}; use xcm::IntoVersion; From 72e0462be9d82c1e5bf18886efe535358a4c8813 Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Mon, 22 Jan 2024 18:14:34 +0400 Subject: [PATCH 04/29] feat(primitives): replace xcm `Convert` with `sp_runtime`'s `MaybeEquivalence` --- primitives/src/dapp_staking.rs | 4 +- primitives/src/xcm/mod.rs | 140 +++------------------------------ 2 files changed, 11 insertions(+), 133 deletions(-) diff --git a/primitives/src/dapp_staking.rs b/primitives/src/dapp_staking.rs index ee6eeedfa5..dac28c3afa 100644 --- a/primitives/src/dapp_staking.rs +++ b/primitives/src/dapp_staking.rs @@ -20,7 +20,7 @@ use super::{Balance, BlockNumber}; use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; -use frame_support::{pallet_prelude::Weight, RuntimeDebug}; +use frame_support::pallet_prelude::{RuntimeDebug, Weight}; use sp_core::H160; use sp_std::hash::Hash; @@ -76,7 +76,7 @@ pub trait CycleConfiguration { Self::blocks_per_era().saturating_mul(Self::eras_per_cycle()) } - /// For how many standard era lengths do all the build&earn subperiods in a cycle last. + /// For how many standard era lengths do all the build&earn subperiods in a cycle last. fn build_and_earn_eras_per_cycle() -> EraNumber { Self::eras_per_build_and_earn_subperiod().saturating_mul(Self::periods_per_cycle()) } diff --git a/primitives/src/xcm/mod.rs b/primitives/src/xcm/mod.rs index 85cdb740b9..8e5622e41b 100644 --- a/primitives/src/xcm/mod.rs +++ b/primitives/src/xcm/mod.rs @@ -36,8 +36,8 @@ use frame_support::{ traits::{tokens::fungibles, ContainsPair, Get}, weights::constants::WEIGHT_REF_TIME_PER_SECOND, }; -use sp_runtime::traits::{Bounded, Convert, Zero}; -use sp_std::{borrow::Borrow, marker::PhantomData, vec::Vec}; +use sp_runtime::traits::{Bounded, Convert, MaybeEquivalence, Zero}; +use sp_std::marker::PhantomData; // Polkadot imports use xcm::latest::{prelude::*, Weight}; @@ -60,26 +60,18 @@ pub const MAX_ASSETS: u32 = 64; /// This implementation relies on `XcAssetConfig` pallet to handle mapping. /// In case asset location hasn't been mapped, it means the asset isn't supported (yet). pub struct AssetLocationIdConverter(PhantomData<(AssetId, AssetMapper)>); -impl xcm_executor::traits::Convert +impl MaybeEquivalence for AssetLocationIdConverter where AssetId: Clone + Eq + Bounded, AssetMapper: XcAssetLocation, { - fn convert_ref(location: impl Borrow) -> Result { - if let Some(asset_id) = AssetMapper::get_asset_id(location.borrow().clone()) { - Ok(asset_id) - } else { - Err(()) - } + fn convert(location: &MultiLocation) -> Option { + AssetMapper::get_asset_id(location.clone()) } - fn reverse_ref(id: impl Borrow) -> Result { - if let Some(multilocation) = AssetMapper::get_xc_asset_location(id.borrow().clone()) { - Ok(multilocation) - } else { - Err(()) - } + fn convert_back(id: &AssetId) -> Option { + AssetMapper::get_xc_asset_location(id.clone()) } } @@ -111,6 +103,7 @@ impl WeightTrader for FixedRateOfForeig &mut self, weight: Weight, payment: xcm_executor::Assets, + _: &XcmContext, ) -> Result { log::trace!( target: "xcm::weight", @@ -166,7 +159,7 @@ impl WeightTrader for FixedRateOfForeig } } - fn refund_weight(&mut self, weight: Weight) -> Option { + fn refund_weight(&mut self, weight: Weight, _: &XcmContext) -> Option { log::trace!(target: "xcm::weight", "FixedRateOfForeignAsset::refund_weight weight: {:?}", weight); if let Some((asset_location, units_per_second)) = @@ -274,121 +267,6 @@ impl< } } -// TODO: remove this after uplift to `polkadot-v0.9.44` or beyond, and replace it with code in XCM builder. - -use parity_scale_codec::{Compact, Encode}; -use sp_io::hashing::blake2_256; -use sp_std::prelude::*; -use xcm_executor::traits::Convert as XcmConvert; - -/// Means of converting a location into a stable and unique descriptive identifier. -pub trait DescribeLocation { - /// Create a description of the given `location` if possible. No two locations should have the - /// same descriptor. - fn describe_location(location: &MultiLocation) -> Option>; -} - -#[impl_trait_for_tuples::impl_for_tuples(30)] -impl DescribeLocation for Tuple { - fn describe_location(l: &MultiLocation) -> Option> { - for_tuples!( #( - match Tuple::describe_location(l) { - Some(result) => return Some(result), - None => {}, - } - )* ); - None - } -} - -pub struct DescribeTerminus; -impl DescribeLocation for DescribeTerminus { - fn describe_location(l: &MultiLocation) -> Option> { - match (l.parents, &l.interior) { - (0, Here) => Some(Vec::new()), - _ => return None, - } - } -} - -pub struct DescribePalletTerminal; -impl DescribeLocation for DescribePalletTerminal { - fn describe_location(l: &MultiLocation) -> Option> { - match (l.parents, &l.interior) { - (0, X1(PalletInstance(i))) => { - Some((b"Pallet", Compact::::from(*i as u32)).encode()) - } - _ => return None, - } - } -} - -pub struct DescribeAccountId32Terminal; -impl DescribeLocation for DescribeAccountId32Terminal { - fn describe_location(l: &MultiLocation) -> Option> { - match (l.parents, &l.interior) { - (0, X1(AccountId32 { id, .. })) => Some((b"AccountId32", id).encode()), - _ => return None, - } - } -} - -pub struct DescribeAccountKey20Terminal; -impl DescribeLocation for DescribeAccountKey20Terminal { - fn describe_location(l: &MultiLocation) -> Option> { - match (l.parents, &l.interior) { - (0, X1(AccountKey20 { key, .. })) => Some((b"AccountKey20", key).encode()), - _ => return None, - } - } -} - -pub type DescribeAccountIdTerminal = (DescribeAccountId32Terminal, DescribeAccountKey20Terminal); - -pub type DescribeAllTerminal = ( - DescribeTerminus, - DescribePalletTerminal, - DescribeAccountId32Terminal, - DescribeAccountKey20Terminal, -); - -pub struct DescribeFamily(PhantomData); -impl DescribeLocation for DescribeFamily { - fn describe_location(l: &MultiLocation) -> Option> { - match (l.parents, l.interior.first()) { - (0, Some(Parachain(index))) => { - let tail = l.interior.split_first().0; - let interior = Suffix::describe_location(&tail.into())?; - Some((b"ChildChain", Compact::::from(*index), interior).encode()) - } - (1, Some(Parachain(index))) => { - let tail = l.interior.split_first().0; - let interior = Suffix::describe_location(&tail.into())?; - Some((b"SiblingChain", Compact::::from(*index), interior).encode()) - } - (1, _) => { - let tail = l.interior.into(); - let interior = Suffix::describe_location(&tail)?; - Some((b"ParentChain", interior).encode()) - } - _ => return None, - } - } -} - -pub struct HashedDescription(PhantomData<(AccountId, Describe)>); -impl + Clone, Describe: DescribeLocation> - XcmConvert for HashedDescription -{ - fn convert(value: MultiLocation) -> Result { - if let Some(description) = Describe::describe_location(&value) { - Ok(blake2_256(&description).into()) - } else { - Err(value) - } - } -} - /// Convert `AccountId` to `MultiLocation`. pub struct AccountIdToMultiLocation; impl Convert for AccountIdToMultiLocation { From 2b2da4aa71df97f69256872fb1848e8056ef81da Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Fri, 26 Jan 2024 15:36:04 +0400 Subject: [PATCH 05/29] feat: update all pallets for polkadot v1.1.0 --- pallets/astar-xcm-benchmarks/Cargo.toml | 4 +- .../src/fungible/benchmarking.rs | 40 ++--------- .../astar-xcm-benchmarks/src/fungible/mod.rs | 5 -- .../src/generic/benchmarking.rs | 2 +- pallets/astar-xcm-benchmarks/src/lib.rs | 2 +- pallets/astar-xcm-benchmarks/src/mock.rs | 57 +++++++-------- pallets/block-rewards-hybrid/Cargo.toml | 4 ++ .../block-rewards-hybrid/src/benchmarking.rs | 2 +- pallets/block-rewards-hybrid/src/lib.rs | 13 ++-- pallets/block-rewards-hybrid/src/mock.rs | 25 +++---- pallets/collator-selection/Cargo.toml | 2 +- .../collator-selection/src/benchmarking.rs | 10 +-- pallets/collator-selection/src/lib.rs | 23 ++---- pallets/collator-selection/src/mock.rs | 28 +++----- pallets/collator-selection/src/tests.rs | 8 +-- pallets/dapp-staking-migration/Cargo.toml | 9 +-- .../src/benchmarking.rs | 10 ++- pallets/dapp-staking-migration/src/lib.rs | 41 ++++++++--- pallets/dapp-staking-migration/src/mock.rs | 27 +++---- pallets/dapp-staking-v3/log.log | 1 + .../dapp-staking-v3/src/benchmarking/mod.rs | 27 +++---- .../dapp-staking-v3/src/benchmarking/utils.rs | 72 +++++++++++++++---- pallets/dapp-staking-v3/src/lib.rs | 47 ++++++++---- pallets/dapp-staking-v3/src/migrations.rs | 14 +++- pallets/dapp-staking-v3/src/test/mock.rs | 24 +++---- pallets/dapps-staking/src/mock.rs | 21 ++---- pallets/dapps-staking/src/pallet/mod.rs | 4 +- pallets/dynamic-evm-base-fee/Cargo.toml | 2 + .../dynamic-evm-base-fee/src/benchmarking.rs | 13 ++-- pallets/dynamic-evm-base-fee/src/lib.rs | 4 +- pallets/dynamic-evm-base-fee/src/mock.rs | 32 +++------ pallets/ethereum-checked/src/lib.rs | 4 +- pallets/ethereum-checked/src/mock.rs | 23 ++---- pallets/inflation/Cargo.toml | 2 + pallets/inflation/src/benchmarking.rs | 11 +-- pallets/inflation/src/lib.rs | 17 ++--- pallets/inflation/src/mock.rs | 26 +++---- pallets/inflation/src/tests.rs | 7 +- pallets/static-price-provider/Cargo.toml | 2 + pallets/static-price-provider/src/mock.rs | 29 ++++---- pallets/unified-accounts/src/lib.rs | 2 +- pallets/unified-accounts/src/mock.rs | 25 +++---- pallets/xc-asset-config/src/mock.rs | 22 ++---- pallets/xvm/src/benchmarking.rs | 2 +- pallets/xvm/src/lib.rs | 6 +- pallets/xvm/src/mock.rs | 33 +++++---- 46 files changed, 382 insertions(+), 402 deletions(-) create mode 100644 pallets/dapp-staking-v3/log.log diff --git a/pallets/astar-xcm-benchmarks/Cargo.toml b/pallets/astar-xcm-benchmarks/Cargo.toml index d115be0b6a..37f7df417d 100644 --- a/pallets/astar-xcm-benchmarks/Cargo.toml +++ b/pallets/astar-xcm-benchmarks/Cargo.toml @@ -19,6 +19,7 @@ frame-system = { workspace = true } parity-scale-codec = { workspace = true, optional = true, features = ["derive"] } scale-info = { workspace = true } sp-std = { workspace = true } +sp-runtime = { workspace = true } # Polkadot / XCM pallet-xcm-benchmarks = { workspace = true } @@ -36,7 +37,6 @@ pallet-assets = { workspace = true, features = ["std"] } pallet-balances = { workspace = true, features = ["std"] } sp-core = { workspace = true, features = ["std"] } sp-io = { workspace = true, features = ["std"] } -sp-runtime = { workspace = true, features = ["std"] } xcm-builder = { workspace = true, features = ["std"] } [features] @@ -50,6 +50,7 @@ std = [ "parity-scale-codec/std", "serde", "sp-std/std", + "sp-runtime/std", "xcm/std", ] @@ -58,6 +59,7 @@ try-runtime = ["frame-support/try-runtime"] runtime-benchmarks = [ "frame-benchmarking", "frame-system/runtime-benchmarks", + "frame-support/runtime-benchmarks", "pallet-assets/runtime-benchmarks", "pallet-xcm-benchmarks/runtime-benchmarks", "parity-scale-codec", diff --git a/pallets/astar-xcm-benchmarks/src/fungible/benchmarking.rs b/pallets/astar-xcm-benchmarks/src/fungible/benchmarking.rs index 4246c1076d..eb21999ce2 100644 --- a/pallets/astar-xcm-benchmarks/src/fungible/benchmarking.rs +++ b/pallets/astar-xcm-benchmarks/src/fungible/benchmarking.rs @@ -19,16 +19,14 @@ use super::{Pallet as AstarBenchmarks, *}; use crate::WrappedBenchmark; use frame_benchmarking::v2::*; -use frame_support::{ - dispatch::Weight, - traits::{fungible::Inspect, Get}, -}; +use frame_support::{traits::fungible::Inspect, weights::Weight}; use pallet_xcm_benchmarks::{ account_and_location, fungible::Pallet as PalletXcmBenchmarks, new_executor, AssetTransactorOf, }; +use sp_runtime::traits::Zero; use sp_std::vec; use xcm::latest::prelude::*; -use xcm_executor::traits::{Convert, TransactAsset}; +use xcm_executor::traits::{ConvertLocation, TransactAsset}; #[benchmarks( where @@ -58,14 +56,14 @@ mod benchmarks { // this xcm doesn't use holding let dest_location = T::valid_destination()?; - let dest_account = T::AccountIdConverter::convert(dest_location.clone()).unwrap(); + let dest_account = T::AccountIdConverter::convert_location(&dest_location).unwrap(); >::deposit_asset( &asset_to_deposit, &sender_location, &XcmContext { origin: Some(sender_location.clone()), - message_hash: [0; 32], + message_id: [0; 32], topic: None, }, ) @@ -94,7 +92,7 @@ mod benchmarks { fn transfer_reserve_asset() -> Result<(), BenchmarkError> { let (sender_account, sender_location) = account_and_location::(1); let dest_location = T::valid_destination()?; - let dest_account = T::AccountIdConverter::convert(dest_location.clone()).unwrap(); + let dest_account = T::AccountIdConverter::convert_location(&dest_location).unwrap(); let asset_to_deposit = T::get_multi_asset(); // take out ED from given asset @@ -107,7 +105,7 @@ mod benchmarks { &sender_location, &XcmContext { origin: Some(sender_location.clone()), - message_hash: [0; 32], + message_id: [0; 32], topic: None, }, ) @@ -132,30 +130,6 @@ mod benchmarks { Ok(()) } - /// The benchmarks for `reserve_asset_deposited` was added in later versions of - /// `pallet-xcm-benchmarks` (in v1.x.x versions). - /// TODO: remove this once we uplift to new polkadot release - #[benchmark] - fn reserve_asset_deposited() -> Result<(), BenchmarkError> { - let (trusted_reserve, transferable_reserve_asset) = T::TrustedReserve::get().ok_or( - BenchmarkError::Override(BenchmarkResult::from_weight(Weight::MAX)), - )?; - - let assets: MultiAssets = vec![transferable_reserve_asset].into(); - - let mut executor = new_executor::(trusted_reserve); - let instruction = Instruction::ReserveAssetDeposited(assets.clone()); - let xcm = Xcm(vec![instruction]); - - #[block] - { - executor.bench_process(xcm)?; - } - - assert!(executor.holding().ensure_contains(&assets).is_ok()); - Ok(()) - } - #[benchmark] fn receive_teleported_asset() -> Result<(), BenchmarkError> { #[block] diff --git a/pallets/astar-xcm-benchmarks/src/fungible/mod.rs b/pallets/astar-xcm-benchmarks/src/fungible/mod.rs index 6e4fa21e6b..f07537ea3e 100644 --- a/pallets/astar-xcm-benchmarks/src/fungible/mod.rs +++ b/pallets/astar-xcm-benchmarks/src/fungible/mod.rs @@ -27,11 +27,6 @@ pub mod pallet { pub trait Config: frame_system::Config + crate::Config + pallet_xcm_benchmarks::fungible::Config { - /// A trusted location where reserve assets are stored, and the asset we allow to be - /// reserves. - type TrustedReserve: frame_support::traits::Get< - Option<(xcm::latest::MultiLocation, xcm::latest::MultiAsset)>, - >; } #[pallet::pallet] diff --git a/pallets/astar-xcm-benchmarks/src/generic/benchmarking.rs b/pallets/astar-xcm-benchmarks/src/generic/benchmarking.rs index 003df54ae6..6d001a3430 100644 --- a/pallets/astar-xcm-benchmarks/src/generic/benchmarking.rs +++ b/pallets/astar-xcm-benchmarks/src/generic/benchmarking.rs @@ -19,7 +19,7 @@ use super::{Pallet as AstarBenchmarks, *}; use crate::WrappedBenchmark; use frame_benchmarking::v2::*; -use frame_support::dispatch::Weight; +use frame_support::weights::Weight; use pallet_xcm_benchmarks::{generic::Pallet as PalletXcmBenchmarks, new_executor, XcmCallOf}; use sp_std::vec; use xcm::latest::prelude::*; diff --git a/pallets/astar-xcm-benchmarks/src/lib.rs b/pallets/astar-xcm-benchmarks/src/lib.rs index b0f232da72..f1822a2aaa 100644 --- a/pallets/astar-xcm-benchmarks/src/lib.rs +++ b/pallets/astar-xcm-benchmarks/src/lib.rs @@ -52,7 +52,7 @@ where fn run_benchmark( name: &[u8], c: &[(frame_benchmarking::BenchmarkParameter, u32)], - whitelist: &[frame_benchmarking::TrackedStorageKey], + whitelist: &[frame_support::traits::TrackedStorageKey], verify: bool, internal_repeats: u32, ) -> Result, frame_benchmarking::BenchmarkError> { diff --git a/pallets/astar-xcm-benchmarks/src/mock.rs b/pallets/astar-xcm-benchmarks/src/mock.rs index f8add0f541..d345cec9cf 100644 --- a/pallets/astar-xcm-benchmarks/src/mock.rs +++ b/pallets/astar-xcm-benchmarks/src/mock.rs @@ -30,14 +30,10 @@ use frame_system::{EnsureRoot, EnsureSigned}; use core::marker::PhantomData; use sp_core::{ConstU32, ConstU64, Get, H256}; -use sp_runtime::{ - testing::Header, - traits::{BlakeTwo256, IdentityLookup}, -}; +use sp_runtime::traits::{BlakeTwo256, IdentityLookup}; use xcm::latest::prelude::*; use xcm_builder::{AllowUnpaidExecutionFrom, FungiblesAdapter, MintLocation, NoChecking}; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; type Balance = u64; type AccountId = u64; @@ -45,36 +41,29 @@ type AssetId = u128; // For testing the pallet, we construct a mock runtime. frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Config, Storage, Event} = 10, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Assets: pallet_assets::{Pallet, Call, Storage, Event}, - PolkadotXcmGenericBenchmarks: pallet_xcm_benchmarks::generic::{Pallet}, - PolkadotXcmFungibleBenchmarks: pallet_xcm_benchmarks::fungible::{Pallet}, - XcmAssetsBenchmark: fungible::{Pallet}, - XcmGenericBenchmarks: generic::{Pallet}, + System: frame_system = 10, + Balances: pallet_balances, + Assets: pallet_assets, + PolkadotXcmGenericBenchmarks: pallet_xcm_benchmarks::generic, + PolkadotXcmFungibleBenchmarks: pallet_xcm_benchmarks::fungible, + XcmAssetsBenchmark: fungible, + XcmGenericBenchmarks: generic, } ); pub struct AccountIdConverter; -impl xcm_executor::traits::Convert for AccountIdConverter { - fn convert(ml: MultiLocation) -> Result { +impl xcm_executor::traits::ConvertLocation for AccountIdConverter { + fn convert_location(ml: &MultiLocation) -> Option { match ml { MultiLocation { parents: 0, interior: X1(Junction::AccountId32 { id, .. }), - } => Ok(::decode(&mut &*id.to_vec()).unwrap()), - _ => Err(ml), + } => ::decode(&mut &*id.to_vec()).ok(), + _ => None, } } - - fn reverse(acc: u64) -> Result { - Err(acc) - } } // An xcm sender/receiver akin to > /dev/null @@ -120,16 +109,15 @@ impl frame_system::Config for Test { type BaseCallFilter = Everything; type BlockWeights = (); type BlockLength = (); + type Block = Block; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = u64; + type Nonce = u64; type Hash = H256; type RuntimeCall = RuntimeCall; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -157,7 +145,7 @@ impl pallet_balances::Config for Test { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = (); type MaxHolds = ConstU32<0>; type MaxFreezes = ConstU32<0>; @@ -257,6 +245,7 @@ impl xcm_executor::Config for XcmConfig { type UniversalAliases = Nothing; type CallDispatcher = RuntimeCall; type SafeCallFilter = Everything; + type Aliasers = (); } impl pallet_xcm_benchmarks::Config for Test { @@ -324,6 +313,10 @@ impl pallet_xcm_benchmarks::generic::Config for Test { fn unlockable_asset() -> Result<(MultiLocation, MultiLocation, MultiAsset), BenchmarkError> { Err(BenchmarkError::Skip) } + + fn alias_origin() -> Result<(MultiLocation, MultiLocation), BenchmarkError> { + Err(BenchmarkError::Skip) + } } parameter_types! { @@ -335,6 +328,7 @@ impl pallet_xcm_benchmarks::fungible::Config for Test { type TransactAsset = ItemOf; type CheckedAccount = CheckingAccount; type TrustedTeleporter = TrustedTeleporter; + type TrustedReserve = TrustedReserve; fn get_multi_asset() -> MultiAsset { let min_balance = 100u64; @@ -361,17 +355,14 @@ parameter_types! { pub TrustedReserve: Option<(MultiLocation, MultiAsset)> = Some((TrustedReserveLocation::get(), TrustedReserveAsset::get())); } -impl fungible::Config for Test { - type TrustedReserve = TrustedReserve; -} - +impl fungible::Config for Test {} impl generic::Config for Test {} impl Config for Test {} #[cfg(feature = "runtime-benchmarks")] pub fn new_test_ext() -> sp_io::TestExternalities { use sp_runtime::BuildStorage; - let t = GenesisConfig { + let t = RuntimeGenesisConfig { ..Default::default() } .build_storage() diff --git a/pallets/block-rewards-hybrid/Cargo.toml b/pallets/block-rewards-hybrid/Cargo.toml index b5b6486d18..8d8e0fa6f4 100644 --- a/pallets/block-rewards-hybrid/Cargo.toml +++ b/pallets/block-rewards-hybrid/Cargo.toml @@ -9,6 +9,7 @@ homepage.workspace = true repository.workspace = true [dependencies] +log = { workspace = true } parity-scale-codec = { workspace = true } serde = { workspace = true } @@ -19,6 +20,7 @@ scale-info = { workspace = true } sp-arithmetic = { workspace = true } sp-runtime = { workspace = true } sp-std = { workspace = true } +sp-io = { workspace = true } frame-benchmarking = { workspace = true, optional = true } @@ -34,7 +36,9 @@ std = [ "sp-core/std", "scale-info/std", "sp-std/std", + "sp-io/std", "serde/std", + "log/std", "frame-support/std", "frame-system/std", "pallet-timestamp/std", diff --git a/pallets/block-rewards-hybrid/src/benchmarking.rs b/pallets/block-rewards-hybrid/src/benchmarking.rs index d24f80f049..c8e7366b0e 100644 --- a/pallets/block-rewards-hybrid/src/benchmarking.rs +++ b/pallets/block-rewards-hybrid/src/benchmarking.rs @@ -53,7 +53,7 @@ mod benchmarks { #[cfg(test)] mod tests { use crate::mock; - use frame_support::sp_io::TestExternalities; + use sp_io::TestExternalities; pub fn new_test_ext() -> TestExternalities { mock::ExternalityBuilder::build() diff --git a/pallets/block-rewards-hybrid/src/lib.rs b/pallets/block-rewards-hybrid/src/lib.rs index 7b6d3c7c81..f78e94b509 100644 --- a/pallets/block-rewards-hybrid/src/lib.rs +++ b/pallets/block-rewards-hybrid/src/lib.rs @@ -80,10 +80,7 @@ pub use pallet::*; use astar_primitives::Balance; use frame_support::pallet_prelude::*; -use frame_support::{ - log, - traits::{Currency, Get, Imbalance, OnTimestampSet}, -}; +use frame_support::traits::{Currency, Get, Imbalance, OnTimestampSet}; use frame_system::{ensure_root, pallet_prelude::*}; use sp_runtime::{ traits::{CheckedAdd, Zero}, @@ -155,13 +152,15 @@ pub mod pallet { } #[pallet::genesis_config] - #[cfg_attr(feature = "std", derive(Default))] - pub struct GenesisConfig { + #[derive(frame_support::DefaultNoBound)] + pub struct GenesisConfig { pub reward_config: RewardDistributionConfig, + #[serde(skip)] + pub _config: sp_std::marker::PhantomData, } #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { assert!(self.reward_config.is_consistent()); RewardDistributionConfigStorage::::put(self.reward_config.clone()) diff --git a/pallets/block-rewards-hybrid/src/mock.rs b/pallets/block-rewards-hybrid/src/mock.rs index 80e10e6eeb..e6535c8a7a 100644 --- a/pallets/block-rewards-hybrid/src/mock.rs +++ b/pallets/block-rewards-hybrid/src/mock.rs @@ -20,37 +20,29 @@ use crate::{self as pallet_block_reward, NegativeImbalanceOf}; use frame_support::{ construct_runtime, parameter_types, - sp_io::TestExternalities, traits::Currency, traits::{ConstU32, Get}, weights::Weight, PalletId, }; - use sp_core::H256; +use sp_io::TestExternalities; use sp_runtime::{ - testing::Header, traits::{AccountIdConversion, BlakeTwo256, IdentityLookup}, + BuildStorage, }; use sp_std::cell::RefCell; pub(crate) type AccountId = u64; -pub(crate) type BlockNumber = u64; pub(crate) type Balance = u128; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; /// Value shouldn't be less than 2 for testing purposes, otherwise we cannot test certain corner cases. pub(crate) const EXISTENTIAL_DEPOSIT: Balance = 2; construct_runtime!( - pub struct TestRuntime - where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { + pub struct TestRuntime { System: frame_system, Balances: pallet_balances, Timestamp: pallet_timestamp, @@ -69,14 +61,13 @@ impl frame_system::Config for TestRuntime { type BlockWeights = (); type BlockLength = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; + type Nonce = u64; type RuntimeCall = RuntimeCall; - type BlockNumber = BlockNumber; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); @@ -106,7 +97,7 @@ impl pallet_balances::Config for TestRuntime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = (); type MaxHolds = ConstU32<0>; type MaxFreezes = ConstU32<0>; @@ -188,8 +179,8 @@ pub struct ExternalityBuilder; impl ExternalityBuilder { pub fn build() -> TestExternalities { - let mut storage = frame_system::GenesisConfig::default() - .build_storage::() + let mut storage = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); // This will cause some initial issuance diff --git a/pallets/collator-selection/Cargo.toml b/pallets/collator-selection/Cargo.toml index 4374e602f4..3fd0e114c9 100644 --- a/pallets/collator-selection/Cargo.toml +++ b/pallets/collator-selection/Cargo.toml @@ -31,7 +31,7 @@ frame-benchmarking = { workspace = true, optional = true } [dev-dependencies] pallet-aura = { workspace = true } -pallet-balances = { workspace = true } +pallet-balances = { workspace = true, features = ["std"] } pallet-timestamp = { workspace = true } sp-consensus-aura = { workspace = true } sp-core = { workspace = true } diff --git a/pallets/collator-selection/src/benchmarking.rs b/pallets/collator-selection/src/benchmarking.rs index 2844b69565..98aae52a8a 100644 --- a/pallets/collator-selection/src/benchmarking.rs +++ b/pallets/collator-selection/src/benchmarking.rs @@ -26,12 +26,12 @@ use frame_benchmarking::{ }; use frame_support::{ assert_ok, - codec::Decode, traits::{Currency, EnsureOrigin, Get}, }; -use frame_system::{EventRecord, RawOrigin}; +use frame_system::{pallet_prelude::BlockNumberFor, EventRecord, RawOrigin}; use pallet_authorship::EventHandler; use pallet_session::{self as session, SessionManager}; +use parity_scale_codec::Decode; use sp_std::prelude::*; pub type BalanceOf = @@ -203,7 +203,7 @@ benchmarks! { T::Currency::minimum_balance() * 4u32.into(), ); let author = account("author", 0, SEED); - let new_block: T::BlockNumber = 10u32.into(); + let new_block: BlockNumberFor = 10u32.into(); frame_system::Pallet::::set_block_number(new_block); assert!(T::Currency::free_balance(&author) == 0u32.into()); @@ -226,8 +226,8 @@ benchmarks! { register_validators::(c); register_candidates::(c); - let new_block: T::BlockNumber = 1800u32.into(); - let zero_block: T::BlockNumber = 0u32.into(); + let new_block: BlockNumberFor = 1800u32.into(); + let zero_block: BlockNumberFor = 0u32.into(); let candidates = >::get(); let non_removals = c.saturating_sub(r); diff --git a/pallets/collator-selection/src/lib.rs b/pallets/collator-selection/src/lib.rs index 58c49e8866..2cae6ca6a2 100644 --- a/pallets/collator-selection/src/lib.rs +++ b/pallets/collator-selection/src/lib.rs @@ -80,7 +80,6 @@ pub mod pallet { use core::ops::Div; use frame_support::{ dispatch::{DispatchClass, DispatchResultWithPostInfo}, - inherent::Vec, pallet_prelude::*, sp_runtime::{ traits::{AccountIdConversion, CheckedSub, Saturating, Zero}, @@ -90,7 +89,7 @@ pub mod pallet { Currency, EnsureOrigin, ExistenceRequirement::KeepAlive, ReservableCurrency, ValidatorRegistration, }, - PalletId, + DefaultNoBound, PalletId, }; use frame_system::{pallet_prelude::*, Config as SystemConfig}; use pallet_session::SessionManager; @@ -141,7 +140,7 @@ pub mod pallet { type MaxInvulnerables: Get; // Will be kicked if block is not produced in threshold. - type KickThreshold: Get; + type KickThreshold: Get>; /// A stable ID for a validator. type ValidatorId: Member + Parameter; @@ -189,7 +188,7 @@ pub mod pallet { #[pallet::storage] #[pallet::getter(fn last_authored_block)] pub type LastAuthoredBlock = - StorageMap<_, Twox64Concat, T::AccountId, T::BlockNumber, ValueQuery>; + StorageMap<_, Twox64Concat, T::AccountId, BlockNumberFor, ValueQuery>; /// Desired number of candidates. /// @@ -211,25 +210,15 @@ pub mod pallet { pub type SlashDestination = StorageValue<_, ::AccountId>; #[pallet::genesis_config] + #[derive(DefaultNoBound)] pub struct GenesisConfig { pub invulnerables: Vec, pub candidacy_bond: BalanceOf, pub desired_candidates: u32, } - #[cfg(feature = "std")] - impl Default for GenesisConfig { - fn default() -> Self { - Self { - invulnerables: Default::default(), - candidacy_bond: Default::default(), - desired_candidates: Default::default(), - } - } - } - #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { let duplicate_invulnerables = self .invulnerables @@ -507,7 +496,7 @@ pub mod pallet { /// Keep track of number of authored blocks per authority, uncles are counted as well since /// they're a valid proof of being online. impl - pallet_authorship::EventHandler for Pallet + pallet_authorship::EventHandler> for Pallet { fn note_author(author: T::AccountId) { let pot = Self::account_id(); diff --git a/pallets/collator-selection/src/mock.rs b/pallets/collator-selection/src/mock.rs index 3ba37fac6f..9a196c2d31 100644 --- a/pallets/collator-selection/src/mock.rs +++ b/pallets/collator-selection/src/mock.rs @@ -19,29 +19,23 @@ use super::*; use crate as collator_selection; use frame_support::{ ord_parameter_types, parameter_types, - traits::{ConstU32, FindAuthor, GenesisBuild, ValidatorRegistration}, + traits::{ConstU32, FindAuthor, ValidatorRegistration}, PalletId, }; use frame_system as system; use frame_system::EnsureSignedBy; -use sp_core::H256; +use sp_core::{ConstBool, H256}; use sp_runtime::{ - testing::{Header, UintAuthorityId}, + testing::UintAuthorityId, traits::{BlakeTwo256, IdentityLookup, OpaqueKeys}, - Perbill, RuntimeAppPublic, + BuildStorage, Perbill, RuntimeAppPublic, }; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; // Configure a mock runtime to test the pallet. frame_support::construct_runtime!( - pub struct Test - where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { + pub struct Test { System: frame_system, Timestamp: pallet_timestamp, Session: pallet_session, @@ -64,13 +58,12 @@ impl system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = u64; - type BlockNumber = u64; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = u64; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -99,7 +92,7 @@ impl pallet_balances::Config for Test { type MaxLocks = (); type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = (); type MaxHolds = ConstU32<0>; type MaxFreezes = ConstU32<0>; @@ -135,6 +128,7 @@ impl pallet_aura::Config for Test { type AuthorityId = sp_consensus_aura::sr25519::AuthorityId; type MaxAuthorities = MaxAuthorities; type DisabledValidators = (); + type AllowMultipleBlocksPerSlot = ConstBool; } sp_runtime::impl_opaque_keys! { @@ -230,8 +224,8 @@ impl Config for Test { pub fn new_test_ext() -> sp_io::TestExternalities { sp_tracing::try_init_simple(); - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); let invulnerables = vec![1, 2]; diff --git a/pallets/collator-selection/src/tests.rs b/pallets/collator-selection/src/tests.rs index dd60803912..a123629d12 100644 --- a/pallets/collator-selection/src/tests.rs +++ b/pallets/collator-selection/src/tests.rs @@ -19,10 +19,10 @@ use crate as collator_selection; use crate::{mock::*, CandidateInfo, Error}; use frame_support::{ assert_noop, assert_ok, - traits::{Currency, GenesisBuild, OnInitialize}, + traits::{Currency, OnInitialize}, }; use pallet_balances::Error as BalancesError; -use sp_runtime::traits::BadOrigin; +use sp_runtime::{traits::BadOrigin, BuildStorage}; #[test] fn basic_setup_works() { @@ -437,8 +437,8 @@ fn should_not_kick_mechanism_too_few() { #[should_panic = "duplicate invulnerables in genesis."] fn cannot_set_genesis_value_twice() { sp_tracing::try_init_simple(); - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); let invulnerables = vec![1, 1]; diff --git a/pallets/dapp-staking-migration/Cargo.toml b/pallets/dapp-staking-migration/Cargo.toml index ab503dbe17..7913982399 100644 --- a/pallets/dapp-staking-migration/Cargo.toml +++ b/pallets/dapp-staking-migration/Cargo.toml @@ -12,18 +12,18 @@ repository.workspace = true frame-benchmarking = { workspace = true, optional = true } frame-support = { workspace = true } frame-system = { workspace = true } +log = { workspace = true } parity-scale-codec = { workspace = true } scale-info = { workspace = true } sp-io = { workspace = true } sp-runtime = { workspace = true } sp-std = { workspace = true } -astar-primitives = { workspace = true, optional = true } +astar-primitives = { workspace = true } pallet-dapp-staking-v3 = { workspace = true } pallet-dapps-staking = { workspace = true } [dev-dependencies] -astar-primitives = { workspace = true } pallet-balances = { workspace = true } sp-arithmetic = { workspace = true } sp-core = { workspace = true } @@ -35,12 +35,13 @@ std = [ "scale-info/std", "sp-std/std", "sp-io/std", + "log/std", "frame-support/std", "frame-system/std", "pallet-dapp-staking-v3/std", "pallet-dapps-staking/std", "frame-benchmarking/std", - "astar-primitives?/std", + "astar-primitives/std", "sp-core/std", "pallet-balances/std", ] @@ -53,4 +54,4 @@ runtime-benchmarks = [ "pallet-dapps-staking/runtime-benchmarks", "astar-primitives/runtime-benchmarks", ] -try-runtime = ["frame-support/try-runtime", "astar-primitives"] +try-runtime = ["frame-support/try-runtime"] diff --git a/pallets/dapp-staking-migration/src/benchmarking.rs b/pallets/dapp-staking-migration/src/benchmarking.rs index 047e272d1b..345a622cad 100644 --- a/pallets/dapp-staking-migration/src/benchmarking.rs +++ b/pallets/dapp-staking-migration/src/benchmarking.rs @@ -32,7 +32,10 @@ fn smart_contract(index: u8) -> T::SmartContrac } /// Initialize the old dApp staking pallet with some storage. -pub(super) fn initial_config() { +pub(super) fn initial_config() +where + BlockNumberFor: IsType, +{ let dapps_number = ::MaxNumberOfContracts::get(); let dapps_number = (dapps_number as u8).min(100); @@ -65,7 +68,10 @@ pub(super) fn initial_config() { } } -#[benchmarks] +#[benchmarks( + where + BlockNumberFor: IsType, +)] mod benchmarks { use super::*; diff --git a/pallets/dapp-staking-migration/src/lib.rs b/pallets/dapp-staking-migration/src/lib.rs index a49ad9021c..4079bb0358 100644 --- a/pallets/dapp-staking-migration/src/lib.rs +++ b/pallets/dapp-staking-migration/src/lib.rs @@ -53,12 +53,13 @@ pub use pallet::*; use frame_support::{ dispatch::PostDispatchInfo, - log, pallet_prelude::*, traits::{Get, LockableCurrency, ReservableCurrency}, }; +use astar_primitives::BlockNumber; use frame_system::{pallet_prelude::*, RawOrigin}; +use pallet_dapps_staking::{Ledger as OldLedger, RegisteredDapps as OldRegisteredDapps}; use parity_scale_codec::{Decode, Encode}; use sp_io::{hashing::twox_128, storage::clear_prefix, KillStorageResult}; use sp_runtime::{ @@ -66,8 +67,6 @@ use sp_runtime::{ Saturating, }; -use pallet_dapps_staking::{Ledger as OldLedger, RegisteredDapps as OldRegisteredDapps}; - #[cfg(feature = "try-runtime")] use astar_primitives::Balance; #[cfg(feature = "try-runtime")] @@ -99,6 +98,8 @@ pub mod pallet { pub trait Config: // Tight coupling, but it's fine since pallet is supposed to be just temporary and will be removed after migration. frame_system::Config + pallet_dapp_staking_v3::Config + pallet_dapps_staking::Config + where + BlockNumberFor: IsType, { /// The overarching event type. type RuntimeEvent: From> + IsType<::RuntimeEvent>; @@ -113,7 +114,10 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(crate) fn deposit_event)] - pub enum Event { + pub enum Event + where + BlockNumberFor: IsType, + { /// Number of entries migrated from v2 over to v3 EntriesMigrated(u32), /// Number of entries deleted from v2 @@ -121,7 +125,10 @@ pub mod pallet { } #[pallet::call] - impl Pallet { + impl Pallet + where + BlockNumberFor: IsType, + { /// Attempt to execute migration steps, consuming up to the specified amount of weight. /// If no weight is specified, max allowed weight is used. /// @@ -154,7 +161,10 @@ pub mod pallet { } #[pallet::hooks] - impl Hooks> for Pallet { + impl Hooks> for Pallet + where + BlockNumberFor: IsType, + { fn integrity_test() { assert!(Pallet::::max_call_weight().all_gte(Pallet::::min_call_weight())); @@ -165,7 +175,10 @@ pub mod pallet { } } - impl Pallet { + impl Pallet + where + BlockNumberFor: IsType, + { /// Execute migrations steps until the specified weight limit has been consumed. /// /// Depending on the number of entries migrated and/or deleted, appropriate events are emited. @@ -525,8 +538,13 @@ pub mod pallet { } } - pub struct DappStakingMigrationHandler(PhantomData); - impl frame_support::traits::OnRuntimeUpgrade for DappStakingMigrationHandler { + pub struct DappStakingMigrationHandler(PhantomData) + where + BlockNumberFor: IsType; + impl frame_support::traits::OnRuntimeUpgrade for DappStakingMigrationHandler + where + BlockNumberFor: IsType, + { fn on_runtime_upgrade() -> Weight { // When upgrade happens, we need to put dApp staking v3 into maintenance mode immediately. // For the old pallet, since the storage cleanup is going to happen, maintenance mode must be ensured @@ -707,7 +725,10 @@ pub mod pallet { #[cfg(feature = "try-runtime")] /// Used to help with `try-runtime` testing. #[derive(Encode, Decode)] -struct Helper { +struct Helper +where + BlockNumberFor: IsType, +{ /// Vec of devs, with their associated smart contract & total reserved balance developers: Vec<( T::AccountId, diff --git a/pallets/dapp-staking-migration/src/mock.rs b/pallets/dapp-staking-migration/src/mock.rs index 5870641184..2267ed248b 100644 --- a/pallets/dapp-staking-migration/src/mock.rs +++ b/pallets/dapp-staking-migration/src/mock.rs @@ -27,12 +27,14 @@ use frame_support::{ use sp_arithmetic::fixed_point::FixedU64; use sp_core::H256; use sp_io::TestExternalities; -use sp_runtime::traits::{BlakeTwo256, IdentityLookup}; +use sp_runtime::{ + traits::{BlakeTwo256, IdentityLookup}, + BuildStorage, +}; use astar_primitives::{ dapp_staking::{CycleConfiguration, SmartContract, StakingRewardHandler}, oracle::PriceProvider, - testing::Header, Balance, BlockNumber, }; @@ -41,16 +43,10 @@ pub(crate) type AccountId = u64; pub(crate) const EXISTENTIAL_DEPOSIT: Balance = 2; pub(crate) const MINIMUM_LOCK_AMOUNT: Balance = 10; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; construct_runtime!( - pub struct Test - where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { + pub struct Test { System: frame_system, Balances: pallet_balances, DappStaking: pallet_dapp_staking_v3, @@ -70,14 +66,13 @@ impl frame_system::Config for Test { type BlockWeights = (); type BlockLength = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; + type Nonce = u64; type RuntimeCall = RuntimeCall; - type BlockNumber = BlockNumber; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); @@ -101,7 +96,7 @@ impl pallet_balances::Config for Test { type DustRemoval = (); type ExistentialDeposit = ConstU128; type AccountStore = System; - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = RuntimeFreezeReason; type MaxHolds = ConstU32<0>; type MaxFreezes = ConstU32<1>; @@ -227,8 +222,8 @@ pub struct ExtBuilder; impl ExtBuilder { pub fn build() -> TestExternalities { // Normal behavior is for reward payout to succeed - let mut storage = frame_system::GenesisConfig::default() - .build_storage::() + let mut storage = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); let balances = vec![1000; 9] diff --git a/pallets/dapp-staking-v3/log.log b/pallets/dapp-staking-v3/log.log new file mode 100644 index 0000000000..9d25a91b7d --- /dev/null +++ b/pallets/dapp-staking-v3/log.log @@ -0,0 +1 @@ + Blocking waiting for file lock on build directory diff --git a/pallets/dapp-staking-v3/src/benchmarking/mod.rs b/pallets/dapp-staking-v3/src/benchmarking/mod.rs index 0069ec9b55..fc08855563 100644 --- a/pallets/dapp-staking-v3/src/benchmarking/mod.rs +++ b/pallets/dapp-staking-v3/src/benchmarking/mod.rs @@ -34,7 +34,10 @@ use utils::*; // // Without this optimization, benchmarks can take hours to execute for production runtimes. -#[benchmarks] +#[benchmarks( + where + BlockNumberFor: IsType, +)] mod benchmarks { use super::*; @@ -271,7 +274,7 @@ mod benchmarks { let mut counter = 1; Ledger::::mutate(&staker, |ledger| { ledger.unlocking.iter_mut().for_each(|unlocking| { - unlocking.unlock_block = System::::block_number() + counter; + unlocking.unlock_block = (System::::block_number() + counter.into()).into(); }); counter += 1; }); @@ -285,7 +288,7 @@ mod benchmarks { .last() .expect("At least one entry must exist.") .unlock_block; - run_to_block::(unlock_block); + run_to_block::(unlock_block.into()); #[extrinsic_call] _(RawOrigin::Signed(staker.clone())); @@ -811,9 +814,9 @@ mod benchmarks { // Register & stake contracts, just so we don't have empty stakes. prepare_contracts_for_tier_assignment::(max_number_of_contracts::()); - run_to_block::(state.next_era_start - 1); - DappStaking::::on_finalize(state.next_era_start - 1); - System::::set_block_number(state.next_era_start); + run_to_block::((state.next_era_start - 1).into()); + DappStaking::::on_finalize((state.next_era_start - 1).into()); + System::::set_block_number(state.next_era_start.into()); #[block] { @@ -857,7 +860,7 @@ mod benchmarks { .next_subperiod_start_era - 1, ); - run_to_block::(ActiveProtocolState::::get().next_era_start - 1); + run_to_block::((ActiveProtocolState::::get().next_era_start - 1).into()); // Some sanity checks, we should still be in the build&earn subperiod, and in the same period as when snapshot was taken. assert_eq!( @@ -870,8 +873,8 @@ mod benchmarks { ); let new_era_start_block = ActiveProtocolState::::get().next_era_start; - DappStaking::::on_finalize(new_era_start_block - 1); - System::::set_block_number(new_era_start_block); + DappStaking::::on_finalize((new_era_start_block - 1).into()); + System::::set_block_number(new_era_start_block.into()); let pre_cleanup_marker = HistoryCleanupMarker::::get(); @@ -906,7 +909,7 @@ mod benchmarks { // Advance over to the next era, and then again to the last block of that era. force_advance_to_next_era::(); - run_to_block::(ActiveProtocolState::::get().next_era_start - 1); + run_to_block::((ActiveProtocolState::::get().next_era_start - 1).into()); // Some sanity checks, we should still be in the build&earn subperiod, and in the first period. assert_eq!( @@ -919,8 +922,8 @@ mod benchmarks { ); let new_era_start_block = ActiveProtocolState::::get().next_era_start; - DappStaking::::on_finalize(new_era_start_block - 1); - System::::set_block_number(new_era_start_block); + DappStaking::::on_finalize((new_era_start_block - 1).into()); + System::::set_block_number(new_era_start_block.into()); #[block] { diff --git a/pallets/dapp-staking-v3/src/benchmarking/utils.rs b/pallets/dapp-staking-v3/src/benchmarking/utils.rs index 81a788da4b..b2b7e3ccc9 100644 --- a/pallets/dapp-staking-v3/src/benchmarking/utils.rs +++ b/pallets/dapp-staking-v3/src/benchmarking/utils.rs @@ -24,10 +24,13 @@ use frame_system::Pallet as System; /// Run to the specified block number. /// Function assumes first block has been initialized. -pub(super) fn run_to_block(n: BlockNumberFor) { +pub(super) fn run_to_block(n: BlockNumberFor) +where + BlockNumberFor: IsType, +{ while System::::block_number() < n { DappStaking::::on_finalize(System::::block_number()); - System::::set_block_number(System::::block_number() + 1); + System::::set_block_number(System::::block_number() + 1.into()); // This is performed outside of dapps staking but we expect it before on_initialize DappStaking::::on_initialize(System::::block_number()); } @@ -35,14 +38,20 @@ pub(super) fn run_to_block(n: BlockNumberFor) { /// Run for the specified number of blocks. /// Function assumes first block has been initialized. -pub(super) fn run_for_blocks(n: BlockNumberFor) { +pub(super) fn run_for_blocks(n: BlockNumberFor) +where + BlockNumberFor: IsType, +{ run_to_block::(System::::block_number() + n); } /// Advance blocks until the specified era has been reached. /// /// Function has no effect if era is already passed. -pub(super) fn advance_to_era(era: EraNumber) { +pub(super) fn advance_to_era(era: EraNumber) +where + BlockNumberFor: IsType, +{ assert!(era >= ActiveProtocolState::::get().era); while ActiveProtocolState::::get().era < era { run_for_blocks::(One::one()); @@ -52,7 +61,10 @@ pub(super) fn advance_to_era(era: EraNumber) { /// Advance blocks until the specified era has been reached. /// /// Relies on the `force` approach to advance one era per block. -pub(super) fn force_advance_to_era(era: EraNumber) { +pub(super) fn force_advance_to_era(era: EraNumber) +where + BlockNumberFor: IsType, +{ assert!(era >= ActiveProtocolState::::get().era); while ActiveProtocolState::::get().era < era { assert_ok!(DappStaking::::force( @@ -64,12 +76,18 @@ pub(super) fn force_advance_to_era(era: EraNumber) { } /// Advance blocks until next era has been reached. -pub(super) fn _advance_to_next_era() { +pub(super) fn _advance_to_next_era() +where + BlockNumberFor: IsType, +{ advance_to_era::(ActiveProtocolState::::get().era + 1); } /// Advance to next era, in the next block using the `force` approach. -pub(crate) fn force_advance_to_next_era() { +pub(crate) fn force_advance_to_next_era() +where + BlockNumberFor: IsType, +{ assert_ok!(DappStaking::::force( RawOrigin::Root.into(), ForcingType::Era @@ -80,7 +98,10 @@ pub(crate) fn force_advance_to_next_era() { /// Advance blocks until next period has been reached. /// /// Relies on the `force` approach to advance one subperiod per block. -pub(super) fn force_advance_to_next_period() { +pub(super) fn force_advance_to_next_period() +where + BlockNumberFor: IsType, +{ let init_period_number = ActiveProtocolState::::get().period_number(); while ActiveProtocolState::::get().period_number() == init_period_number { assert_ok!(DappStaking::::force( @@ -92,7 +113,10 @@ pub(super) fn force_advance_to_next_period() { } /// Advance to the specified period, using the `force` approach. -pub(super) fn force_advance_to_period(period: PeriodNumber) { +pub(super) fn force_advance_to_period(period: PeriodNumber) +where + BlockNumberFor: IsType, +{ assert!(period >= ActiveProtocolState::::get().period_number()); while ActiveProtocolState::::get().period_number() < period { force_advance_to_next_subperiod::(); @@ -100,7 +124,10 @@ pub(super) fn force_advance_to_period(period: PeriodNumber) { } /// Use the `force` approach to advance to the next subperiod immediately in the next block. -pub(super) fn force_advance_to_next_subperiod() { +pub(super) fn force_advance_to_next_subperiod() +where + BlockNumberFor: IsType, +{ assert_ok!(DappStaking::::force( RawOrigin::Root.into(), ForcingType::Subperiod @@ -121,12 +148,18 @@ pub(super) const NUMBER_OF_SLOTS: u32 = 100; pub(super) const SEED: u32 = 9000; /// Assert that the last event equals the provided one. -pub(super) fn assert_last_event(generic_event: ::RuntimeEvent) { +pub(super) fn assert_last_event(generic_event: ::RuntimeEvent) +where + BlockNumberFor: IsType, +{ frame_system::Pallet::::assert_last_event(generic_event.into()); } // Return all dApp staking events from the event buffer. -pub(super) fn dapp_staking_events() -> Vec> { +pub(super) fn dapp_staking_events() -> Vec> +where + BlockNumberFor: IsType, +{ System::::events() .into_iter() .map(|r| r.event) @@ -138,7 +171,10 @@ pub(super) fn dapp_staking_events() -> Vec> { /// /// **NOTE:** This assumes similar tier configuration for all runtimes. /// If we decide to change this, we'll need to provide a more generic init function. -pub(super) fn initial_config() { +pub(super) fn initial_config() +where + BlockNumberFor: IsType, +{ let era_length = T::CycleConfiguration::blocks_per_era(); let voting_period_length_in_eras = T::CycleConfiguration::eras_per_voting_subperiod(); @@ -206,7 +242,10 @@ pub(super) fn initial_config() { } /// Maximum number of contracts that 'makes sense' - considers both contract number limit & number of slots. -pub(super) fn max_number_of_contracts() -> u32 { +pub(super) fn max_number_of_contracts() -> u32 +where + BlockNumberFor: IsType, +{ T::MaxNumberOfContracts::get().min(NUMBER_OF_SLOTS).into() } @@ -214,7 +253,10 @@ pub(super) fn max_number_of_contracts() -> u32 { /// /// Stake amounts are decided in such a way to maximize tier filling rate. /// This means that all of the contracts should end up in some tier. -pub(super) fn prepare_contracts_for_tier_assignment(x: u32) { +pub(super) fn prepare_contracts_for_tier_assignment(x: u32) +where + BlockNumberFor: IsType, +{ let developer: T::AccountId = whitelisted_caller(); for id in 0..x { let smart_contract = T::BenchmarkHelper::get_smart_contract(id as u32); diff --git a/pallets/dapp-staking-v3/src/lib.rs b/pallets/dapp-staking-v3/src/lib.rs index e1854b0e5d..5613c6eb4f 100644 --- a/pallets/dapp-staking-v3/src/lib.rs +++ b/pallets/dapp-staking-v3/src/lib.rs @@ -106,7 +106,10 @@ pub mod pallet { } #[pallet::config] - pub trait Config: frame_system::Config { + pub trait Config: frame_system::Config + where + BlockNumberFor: IsType, + { /// The overarching event type. type RuntimeEvent: From> + IsType<::RuntimeEvent> @@ -192,7 +195,10 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(crate) fn deposit_event)] - pub enum Event { + pub enum Event + where + BlockNumberFor: IsType, + { /// Maintenance mode has been either enabled or disabled. MaintenanceMode { enabled: bool }, /// New era has started. @@ -457,15 +463,19 @@ pub mod pallet { #[pallet::genesis_config] #[derive(frame_support::DefaultNoBound)] - pub struct GenesisConfig { + pub struct GenesisConfig { pub reward_portion: Vec, pub slot_distribution: Vec, pub tier_thresholds: Vec, pub slots_per_tier: Vec, + _config: PhantomData, } #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig + where + BlockNumberFor: IsType, + { fn build(&self) { // Prepare tier parameters & verify their correctness let tier_params = TierParameters:: { @@ -527,9 +537,12 @@ pub mod pallet { } #[pallet::hooks] - impl Hooks for Pallet { - fn on_initialize(now: BlockNumber) -> Weight { - Self::era_and_period_handler(now, TierAssignment::Real) + impl Hooks> for Pallet + where + BlockNumberFor: IsType, + { + fn on_initialize(now: BlockNumberFor) -> Weight { + Self::era_and_period_handler(now.into(), TierAssignment::Real) } fn on_idle(_block: BlockNumberFor, remaining_weight: Weight) -> Weight { @@ -567,7 +580,10 @@ pub mod pallet { } #[pallet::call] - impl Pallet { + impl Pallet + where + BlockNumberFor: IsType, + { /// Wrapper around _legacy-like_ `unbond_and_unstake`. /// /// Used to support legacy Ledger users so they can start the unlocking process for their funds. @@ -844,9 +860,9 @@ pub mod pallet { ledger.subtract_lock_amount(amount_to_unlock); let current_block = frame_system::Pallet::::block_number(); - let unlock_block = current_block.saturating_add(Self::unlocking_period()); + let unlock_block = current_block.saturating_add(Self::unlocking_period().into()); ledger - .add_unlocking_chunk(amount_to_unlock, unlock_block) + .add_unlocking_chunk(amount_to_unlock, unlock_block.into()) .map_err(|_| Error::::TooManyUnlockingChunks)?; // Update storage @@ -873,7 +889,7 @@ pub mod pallet { let mut ledger = Ledger::::get(&account); let current_block = frame_system::Pallet::::block_number(); - let amount = ledger.claim_unlocked(current_block); + let amount = ledger.claim_unlocked(current_block.into()); ensure!(amount > Zero::zero(), Error::::NoUnlockedChunksToClaim); // In case it's full unlock, account is exiting dApp staking, ensure all storage is cleaned up. @@ -1513,7 +1529,7 @@ pub mod pallet { // Ensure a 'change' happens on the next block ActiveProtocolState::::mutate(|state| { let current_block = frame_system::Pallet::::block_number(); - state.next_era_start = current_block.saturating_add(One::one()); + state.next_era_start = current_block.saturating_add(One::one()).into(); match forcing_type { ForcingType::Era => (), @@ -1566,7 +1582,10 @@ pub mod pallet { } } - impl Pallet { + impl Pallet + where + BlockNumberFor: IsType, + { /// `Err` if pallet disabled for maintenance, `Ok` otherwise. pub(crate) fn ensure_pallet_enabled() -> Result<(), Error> { if ActiveProtocolState::::get().maintenance { @@ -1667,7 +1686,7 @@ pub mod pallet { /// 3. Read in tier configuration. This contains information about how many slots per tier there are, /// as well as the threshold for each tier. Threshold is the minimum amount of stake required to be eligible for a tier. /// Iterate over tier thresholds & capacities, starting from the top tier, and assign dApps to them. - /// + /// /// ```text //// for each tier: /// for each unassigned dApp: diff --git a/pallets/dapp-staking-v3/src/migrations.rs b/pallets/dapp-staking-v3/src/migrations.rs index 52e5f6da74..dbb96dc644 100644 --- a/pallets/dapp-staking-v3/src/migrations.rs +++ b/pallets/dapp-staking-v3/src/migrations.rs @@ -28,6 +28,8 @@ impl< TiersConfiguration, )>, > OnRuntimeUpgrade for DAppStakingV3InitConfig +where + BlockNumberFor: IsType, { fn on_runtime_upgrade() -> Weight { if Pallet::::on_chain_storage_version() >= STORAGE_VERSION { @@ -44,7 +46,7 @@ impl< let period_number = 1; let protocol_state = ProtocolState { era: init_era, - next_era_start: now.saturating_add(voting_period_length), + next_era_start: now.saturating_add(voting_period_length.into()).into(), period_info: PeriodInfo { number: period_number, subperiod: Subperiod::Voting, @@ -168,7 +170,10 @@ type OldDAppTierRewardsFor = /// `OnRuntimeUpgrade` logic used to migrate DApp tiers storage item to BTreeMap. pub struct DappStakingV3TierRewardAsTree(PhantomData); -impl OnRuntimeUpgrade for DappStakingV3TierRewardAsTree { +impl OnRuntimeUpgrade for DappStakingV3TierRewardAsTree +where + BlockNumberFor: IsType, +{ fn on_runtime_upgrade() -> Weight { let mut counter = 0; let mut translate = |pre: OldDAppTierRewardsFor| -> DAppTierRewardsFor { @@ -204,7 +209,10 @@ impl OnRuntimeUpgrade for DappStakingV3TierRewardAsTree { /// We just set it to default value (all zeros) and let the pallet itself do the history cleanup. /// Only needed for Shibuya, can be removed later. pub struct DappStakingV3HistoryCleanupMarkerReset(PhantomData); -impl OnRuntimeUpgrade for DappStakingV3HistoryCleanupMarkerReset { +impl OnRuntimeUpgrade for DappStakingV3HistoryCleanupMarkerReset +where + BlockNumberFor: IsType, +{ fn on_runtime_upgrade() -> Weight { HistoryCleanupMarker::::put(CleanupMarker::default()); T::DbWeight::get().writes(1) diff --git a/pallets/dapp-staking-v3/src/test/mock.rs b/pallets/dapp-staking-v3/src/test/mock.rs index 1be4b46eab..72f97a23aa 100644 --- a/pallets/dapp-staking-v3/src/test/mock.rs +++ b/pallets/dapp-staking-v3/src/test/mock.rs @@ -32,13 +32,12 @@ use sp_core::H256; use sp_io::TestExternalities; use sp_runtime::{ traits::{BlakeTwo256, IdentityLookup}, - Permill, + BuildStorage, Permill, }; use sp_std::cell::RefCell; use astar_primitives::{ dapp_staking::{Observer as DappStakingObserver, SmartContract}, - testing::Header, Balance, BlockNumber, }; @@ -47,16 +46,10 @@ pub(crate) type AccountId = u64; pub(crate) const EXISTENTIAL_DEPOSIT: Balance = 2; pub(crate) const MINIMUM_LOCK_AMOUNT: Balance = 10; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; construct_runtime!( - pub struct Test - where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { + pub struct Test { System: frame_system, Balances: pallet_balances, DappStaking: pallet_dapp_staking, @@ -74,14 +67,13 @@ impl frame_system::Config for Test { type BlockWeights = (); type BlockLength = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; + type Nonce = u64; type RuntimeCall = RuntimeCall; - type BlockNumber = BlockNumber; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); @@ -105,7 +97,7 @@ impl pallet_balances::Config for Test { type DustRemoval = (); type ExistentialDeposit = ConstU128; type AccountStore = System; - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = RuntimeFreezeReason; type MaxHolds = ConstU32<0>; type MaxFreezes = ConstU32<1>; @@ -223,8 +215,8 @@ impl ExtBuilder { // Normal behavior is for reward payout to succeed DOES_PAYOUT_SUCCEED.with(|v| *v.borrow_mut() = true); - let mut storage = frame_system::GenesisConfig::default() - .build_storage::() + let mut storage = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); let balances = vec![1000; 9] diff --git a/pallets/dapps-staking/src/mock.rs b/pallets/dapps-staking/src/mock.rs index 3ecb3e0a3b..50c7c15f2b 100644 --- a/pallets/dapps-staking/src/mock.rs +++ b/pallets/dapps-staking/src/mock.rs @@ -29,8 +29,8 @@ use sp_core::{H160, H256}; use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use sp_io::TestExternalities; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, ConstBool, ConstU32, IdentityLookup}, + BuildStorage, }; pub(crate) type AccountId = u64; @@ -38,7 +38,6 @@ pub(crate) type BlockNumber = u64; pub(crate) type Balance = u128; pub(crate) type EraIndex = u32; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; /// Value shouldn't be less than 2 for testing purposes, otherwise we cannot test certain corner cases. @@ -61,12 +60,7 @@ pub(crate) const STAKER_BLOCK_REWARD: Balance = 531911; pub(crate) const DAPP_BLOCK_REWARD: Balance = 773333; construct_runtime!( - pub struct TestRuntime - where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { + pub struct TestRuntime { System: frame_system, Balances: pallet_balances, Timestamp: pallet_timestamp, @@ -85,14 +79,13 @@ impl frame_system::Config for TestRuntime { type BlockWeights = (); type BlockLength = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; + type Nonce = u64; type RuntimeCall = RuntimeCall; - type BlockNumber = BlockNumber; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); @@ -122,7 +115,7 @@ impl pallet_balances::Config for TestRuntime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = (); type MaxHolds = ConstU32<0>; type MaxFreezes = ConstU32<0>; @@ -187,8 +180,8 @@ pub struct ExternalityBuilder; impl ExternalityBuilder { pub fn build() -> TestExternalities { - let mut storage = frame_system::GenesisConfig::default() - .build_storage::() + let mut storage = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); pallet_balances::GenesisConfig:: { diff --git a/pallets/dapps-staking/src/pallet/mod.rs b/pallets/dapps-staking/src/pallet/mod.rs index 55b4d09bea..57c7bbe829 100644 --- a/pallets/dapps-staking/src/pallet/mod.rs +++ b/pallets/dapps-staking/src/pallet/mod.rs @@ -56,7 +56,7 @@ pub mod pallet { pub trait Config: frame_system::Config { /// The staking balance. type Currency: Currency - + LockableCurrency + + LockableCurrency> + ReservableCurrency; /// Describes smart contract in the context required by dapps staking. @@ -169,7 +169,7 @@ pub mod pallet { #[pallet::storage] #[pallet::whitelist_storage] #[pallet::getter(fn next_era_starting_block)] - pub type NextEraStartingBlock = StorageValue<_, T::BlockNumber, ValueQuery>; + pub type NextEraStartingBlock = StorageValue<_, BlockNumberFor, ValueQuery>; /// Simple map where developer account points to their smart contract #[pallet::storage] diff --git a/pallets/dynamic-evm-base-fee/Cargo.toml b/pallets/dynamic-evm-base-fee/Cargo.toml index e9c2177b6d..4fde90ddf0 100644 --- a/pallets/dynamic-evm-base-fee/Cargo.toml +++ b/pallets/dynamic-evm-base-fee/Cargo.toml @@ -18,6 +18,7 @@ frame-support = { workspace = true } frame-system = { workspace = true } pallet-transaction-payment = { workspace = true } sp-core = { workspace = true } +sp-io = { workspace = true } sp-runtime = { workspace = true } # Frontier @@ -38,6 +39,7 @@ std = [ "frame-support/std", "frame-system/std", "sp-core/std", + "sp-io/std", "sp-runtime/std", "pallet-transaction-payment/std", "pallet-balances/std", diff --git a/pallets/dynamic-evm-base-fee/src/benchmarking.rs b/pallets/dynamic-evm-base-fee/src/benchmarking.rs index eb94e5fc67..6b1312e97f 100644 --- a/pallets/dynamic-evm-base-fee/src/benchmarking.rs +++ b/pallets/dynamic-evm-base-fee/src/benchmarking.rs @@ -21,15 +21,18 @@ use super::*; use fp_evm::FeeCalculator; use frame_benchmarking::v2::*; use frame_support::traits::Hooks; -use frame_system::RawOrigin; +use frame_system::{pallet_prelude::*, RawOrigin}; -#[benchmarks] +#[benchmarks( + where + BlockNumberFor: From +)] mod benchmarks { use super::*; #[benchmark] fn base_fee_per_gas_adjustment() { - let (first_block, second_block) = (T::BlockNumber::from(1u32), T::BlockNumber::from(2u32)); + let (first_block, second_block) = (1u32.into(), 2u32.into()); // Setup actions, should ensure some value is written to storage. Pallet::::on_initialize(first_block); @@ -65,7 +68,7 @@ mod benchmarks { #[benchmark] fn min_gas_price() { - let first_block = T::BlockNumber::from(1u32); + let first_block = 1u32.into(); // Setup actions, should ensure some value is written to storage. Pallet::::on_initialize(first_block); @@ -91,7 +94,7 @@ mod benchmarks { #[cfg(test)] mod tests { use crate::mock; - use frame_support::sp_io::TestExternalities; + use sp_io::TestExternalities; pub fn new_test_ext() -> TestExternalities { mock::ExtBuilder::build() diff --git a/pallets/dynamic-evm-base-fee/src/lib.rs b/pallets/dynamic-evm-base-fee/src/lib.rs index 5574346825..dc6bd07dd0 100644 --- a/pallets/dynamic-evm-base-fee/src/lib.rs +++ b/pallets/dynamic-evm-base-fee/src/lib.rs @@ -151,11 +151,11 @@ pub mod pallet { #[pallet::hooks] impl Hooks> for Pallet { - fn on_initialize(_: T::BlockNumber) -> Weight { + fn on_initialize(_: BlockNumberFor) -> Weight { T::WeightInfo::base_fee_per_gas_adjustment() } - fn on_finalize(_n: ::BlockNumber) { + fn on_finalize(_n: BlockNumberFor) { BaseFeePerGas::::mutate(|base_fee_per_gas| { let old_bfpg = *base_fee_per_gas; diff --git a/pallets/dynamic-evm-base-fee/src/mock.rs b/pallets/dynamic-evm-base-fee/src/mock.rs index 3d7db1e4cb..5a26681695 100644 --- a/pallets/dynamic-evm-base-fee/src/mock.rs +++ b/pallets/dynamic-evm-base-fee/src/mock.rs @@ -22,22 +22,19 @@ use super::*; use crate as pallet_dynamic_evm_base_fee; use frame_support::{ - construct_runtime, parameter_types, - sp_io::TestExternalities, - storage, + construct_runtime, parameter_types, storage, traits::{ConstU128, ConstU32, ConstU64, Get}, weights::constants::RocksDbWeight, }; use parity_scale_codec::Encode; use sp_core::H256; +use sp_io::TestExternalities; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup, One}, - FixedU128, Perquintill, + BuildStorage, FixedU128, Perquintill, }; pub(crate) type AccountId = u128; -pub(crate) type BlockNumber = u64; pub(crate) type Balance = u128; parameter_types! { @@ -50,16 +47,15 @@ impl frame_system::Config for TestRuntime { type BlockWeights = (); type BlockLength = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; + type Nonce = u64; type RuntimeCall = RuntimeCall; - type BlockNumber = BlockNumber; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; - type BlockHashCount = ConstU64<250>; + type BlockHashCount = ConstU32<250>; type DbWeight = RocksDbWeight; type Version = (); type PalletInfo = PalletInfo; @@ -82,7 +78,7 @@ impl pallet_balances::Config for TestRuntime { type ExistentialDeposit = ConstU128<2>; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = (); type MaxHolds = ConstU32<0>; type MaxFreezes = ConstU32<0>; @@ -113,16 +109,10 @@ impl pallet_dynamic_evm_base_fee::Config for TestRuntime { type WeightInfo = (); } -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; construct_runtime!( - pub struct TestRuntime - where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { + pub struct TestRuntime { System: frame_system, Timestamp: pallet_timestamp, Balances: pallet_balances, @@ -147,8 +137,8 @@ impl Get for GetAdjustmentFactor { pub struct ExtBuilder; impl ExtBuilder { pub fn build() -> TestExternalities { - let storage = frame_system::GenesisConfig::default() - .build_storage::() + let storage = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); let mut ext = TestExternalities::from(storage); diff --git a/pallets/ethereum-checked/src/lib.rs b/pallets/ethereum-checked/src/lib.rs index b01a9041a1..b3f388ca64 100644 --- a/pallets/ethereum-checked/src/lib.rs +++ b/pallets/ethereum-checked/src/lib.rs @@ -50,7 +50,7 @@ use ethereum_types::{H160, U256}; use fp_ethereum::{TransactionData, ValidatedTransaction}; use fp_evm::{ CallInfo, CallOrCreateInfo, CheckEvmTransaction, CheckEvmTransactionConfig, ExitReason, - ExitSucceed, InvalidEvmTransactionError, + ExitSucceed, TransactionValidationError, }; use pallet_evm::GasWeightMapping; @@ -136,7 +136,7 @@ pub mod pallet { type XvmTxWeightLimit: Get; /// Invalid tx error. - type InvalidEvmTransactionError: From; + type InvalidEvmTransactionError: From; /// Validated tx execution. type ValidatedTransaction: ValidatedTransaction; diff --git a/pallets/ethereum-checked/src/mock.rs b/pallets/ethereum-checked/src/mock.rs index 7c2a712d45..e2a9c9471c 100644 --- a/pallets/ethereum-checked/src/mock.rs +++ b/pallets/ethereum-checked/src/mock.rs @@ -25,17 +25,15 @@ use ethereum_types::H256; use frame_support::{ assert_ok, construct_runtime, parameter_types, - sp_io::TestExternalities, traits::{ConstU128, ConstU64, FindAuthor}, weights::Weight, }; use pallet_ethereum::PostLogContent; use pallet_evm::{AddressMapping, FeeCalculator}; -use sp_io::hashing::blake2_256; +use sp_io::{hashing::blake2_256, TestExternalities}; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup}, - AccountId32, ConsensusEngineId, + AccountId32, BuildStorage, ConsensusEngineId, }; parameter_types! { @@ -48,14 +46,13 @@ impl frame_system::Config for TestRuntime { type BlockWeights = (); type BlockLength = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; + type Nonce = u64; type RuntimeCall = RuntimeCall; - type BlockNumber = BlockNumber; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = ConstU64<250>; type DbWeight = (); @@ -80,7 +77,7 @@ impl pallet_balances::Config for TestRuntime { type ExistentialDeposit = ConstU128<2>; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = (); type MaxHolds = ConstU32<0>; type MaxFreezes = ConstU32<0>; @@ -211,22 +208,16 @@ impl pallet_ethereum_checked::Config for TestRuntime { } pub(crate) type AccountId = AccountId32; -pub(crate) type BlockNumber = u64; pub(crate) type Balance = u128; pub const ALICE: AccountId32 = AccountId32::new([0u8; 32]); pub const BOB: AccountId32 = AccountId32::new([1u8; 32]); pub const CHARLIE: AccountId32 = AccountId32::new([2u8; 32]); -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; construct_runtime!( pub struct TestRuntime - where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, { System: frame_system, Timestamp: pallet_timestamp, @@ -289,8 +280,8 @@ impl Default for ExtBuilder { impl ExtBuilder { pub fn build(self) -> TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); pallet_balances::GenesisConfig:: { diff --git a/pallets/inflation/Cargo.toml b/pallets/inflation/Cargo.toml index a82a1480ad..eab56dd857 100644 --- a/pallets/inflation/Cargo.toml +++ b/pallets/inflation/Cargo.toml @@ -19,6 +19,7 @@ frame-system = { workspace = true } scale-info = { workspace = true } sp-runtime = { workspace = true } sp-std = { workspace = true } +sp-io = { workspace = true } frame-benchmarking = { workspace = true, optional = true } @@ -35,6 +36,7 @@ std = [ "scale-info/std", "serde/std", "sp-std/std", + "sp-io/std", "frame-support/std", "frame-system/std", "pallet-balances/std", diff --git a/pallets/inflation/src/benchmarking.rs b/pallets/inflation/src/benchmarking.rs index 184ae5cc64..4c9a7367c4 100644 --- a/pallets/inflation/src/benchmarking.rs +++ b/pallets/inflation/src/benchmarking.rs @@ -65,7 +65,10 @@ fn initial_config() { T::Currency::make_free_balance_be(&dummy_account, 1_000_000_000_000_000_000_000); } -#[benchmarks] +#[benchmarks( + where + BlockNumberFor: IsType +)] mod benchmarks { use super::*; @@ -114,7 +117,7 @@ mod benchmarks { #[block] { Pallet::::block_before_new_era(init_recalculation_era); - Pallet::::on_finalize(1); + Pallet::::on_finalize(1.into()); } assert!(ActiveInflationConfig::::get().recalculation_era > init_recalculation_era); @@ -128,7 +131,7 @@ mod benchmarks { let init_issuance = T::Currency::total_issuance(); DoRecalculation::::kill(); - let block = 1; + let block = 1.into(); #[block] { Pallet::::on_initialize(block); @@ -151,7 +154,7 @@ mod benchmarks { #[cfg(test)] mod tests { use crate::mock; - use frame_support::sp_io::TestExternalities; + use sp_io::TestExternalities; pub fn new_test_ext() -> TestExternalities { mock::ExternalityBuilder::build() diff --git a/pallets/inflation/src/lib.rs b/pallets/inflation/src/lib.rs index ef5286136b..480695ad1a 100644 --- a/pallets/inflation/src/lib.rs +++ b/pallets/inflation/src/lib.rs @@ -107,6 +107,7 @@ use astar_primitives::{ use frame_support::{ pallet_prelude::*, traits::{Currency, GetStorageVersion, OnRuntimeUpgrade}, + DefaultNoBound, }; use frame_system::{ensure_root, pallet_prelude::*}; use sp_runtime::{traits::CheckedAdd, Perquintill}; @@ -125,7 +126,6 @@ mod tests; #[frame_support::pallet] pub mod pallet { - use super::*; /// The current storage version. @@ -141,7 +141,7 @@ pub mod pallet { >>::NegativeImbalance; #[pallet::config] - pub trait Config: frame_system::Config { + pub trait Config: frame_system::Config { /// The currency trait. /// This has been soft-deprecated but it still needs to be used here in order to access `NegativeImbalance` /// which is defined in the currency trait. @@ -195,14 +195,15 @@ pub mod pallet { pub type DoRecalculation = StorageValue<_, EraNumber, OptionQuery>; #[pallet::genesis_config] - #[cfg_attr(feature = "std", derive(Default))] - pub struct GenesisConfig { + #[derive(DefaultNoBound)] + pub struct GenesisConfig { pub params: InflationParameters, + _config: sp_std::marker::PhantomData, } /// This should be executed **AFTER** other pallets that cause issuance to increase have been initialized. #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { assert!(self.params.is_valid()); @@ -215,8 +216,8 @@ pub mod pallet { } #[pallet::hooks] - impl Hooks for Pallet { - fn on_initialize(_now: BlockNumber) -> Weight { + impl Hooks> for Pallet { + fn on_initialize(_now: BlockNumberFor) -> Weight { Self::payout_block_rewards(); // Benchmarks won't account for the whitelisted storage access so this needs to be added manually. @@ -226,7 +227,7 @@ pub mod pallet { ::DbWeight::get().reads(2) } - fn on_finalize(_now: BlockNumber) { + fn on_finalize(_now: BlockNumberFor) { // Recalculation is done at the block right before a new cycle starts. // This is to ensure all the rewards are paid out according to the new inflation configuration from next block. // diff --git a/pallets/inflation/src/mock.rs b/pallets/inflation/src/mock.rs index 37588f12d3..9d699b4f43 100644 --- a/pallets/inflation/src/mock.rs +++ b/pallets/inflation/src/mock.rs @@ -23,17 +23,16 @@ use crate::{ use frame_support::{ construct_runtime, parameter_types, - sp_io::TestExternalities, traits::Currency, traits::{ConstU128, ConstU32, Hooks}, weights::Weight, PalletId, }; - use sp_core::H256; +use sp_io::TestExternalities; use sp_runtime::{ traits::{AccountIdConversion, BlakeTwo256, IdentityLookup}, - Perquintill, + BuildStorage, Perquintill, }; use astar_primitives::{testing::Header, Balance, BlockNumber}; @@ -64,8 +63,7 @@ pub const INIT_CONFIG: InflationConfiguration = InflationConfiguration { ideal_staking_rate: Perquintill::from_percent(50), }; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; parameter_types! { pub const BlockHashCount: BlockNumber = 250; @@ -78,14 +76,13 @@ impl frame_system::Config for Test { type BlockWeights = (); type BlockLength = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; + type Nonce = u64; type RuntimeCall = RuntimeCall; - type BlockNumber = BlockNumber; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); @@ -110,7 +107,7 @@ impl pallet_balances::Config for Test { type ExistentialDeposit = ConstU128<1>; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = (); type MaxHolds = ConstU32<0>; type MaxFreezes = ConstU32<0>; @@ -158,12 +155,7 @@ impl pallet_inflation::Config for Test { } construct_runtime!( - pub struct Test - where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { + pub struct Test { System: frame_system, Balances: pallet_balances, Inflation: pallet_inflation, @@ -173,8 +165,8 @@ construct_runtime!( pub struct ExternalityBuilder; impl ExternalityBuilder { pub fn build() -> TestExternalities { - let mut storage = frame_system::GenesisConfig::default() - .build_storage::() + let mut storage = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); // This will cause some initial issuance diff --git a/pallets/inflation/src/tests.rs b/pallets/inflation/src/tests.rs index 75f82800e5..1b4c3ce7fe 100644 --- a/pallets/inflation/src/tests.rs +++ b/pallets/inflation/src/tests.rs @@ -17,10 +17,7 @@ // along with Astar. If not, see . use super::{pallet::Error, Event, *}; -use frame_support::{ - assert_noop, assert_ok, assert_storage_noop, - traits::{GenesisBuild, Hooks}, -}; +use frame_support::{assert_noop, assert_ok, assert_storage_noop, traits::Hooks}; use mock::*; use sp_runtime::{ traits::{AccountIdConversion, BadOrigin, Zero}, @@ -466,7 +463,7 @@ fn test_genesis_build() { InflationParams::::kill(); // Execute genesis build - >::build(&genesis_config); + as BuildGenesisConfig>::build(&genesis_config); // Verify state is as expected assert_eq!(InflationParams::::get(), genesis_config.params); diff --git a/pallets/static-price-provider/Cargo.toml b/pallets/static-price-provider/Cargo.toml index 5d1251408e..a118ddbeba 100644 --- a/pallets/static-price-provider/Cargo.toml +++ b/pallets/static-price-provider/Cargo.toml @@ -20,6 +20,7 @@ scale-info = { workspace = true } sp-arithmetic = { workspace = true } sp-runtime = { workspace = true } sp-std = { workspace = true } +sp-io = { workspace = true } frame-benchmarking = { workspace = true, optional = true } @@ -36,6 +37,7 @@ std = [ "scale-info/std", "serde/std", "sp-std/std", + "sp-io/std", "frame-support/std", "frame-system/std", "pallet-balances/std", diff --git a/pallets/static-price-provider/src/mock.rs b/pallets/static-price-provider/src/mock.rs index 99c35b5943..00b102e573 100644 --- a/pallets/static-price-provider/src/mock.rs +++ b/pallets/static-price-provider/src/mock.rs @@ -20,18 +20,19 @@ use crate::{self as pallet_static_price_provider}; use frame_support::{ construct_runtime, parameter_types, - sp_io::TestExternalities, traits::{ConstU128, ConstU32}, weights::Weight, }; - use sp_core::H256; -use sp_runtime::traits::{BlakeTwo256, IdentityLookup}; +use sp_io::TestExternalities; +use sp_runtime::{ + traits::{BlakeTwo256, IdentityLookup}, + BuildStorage, +}; -use astar_primitives::{testing::Header, Balance, BlockNumber}; +use astar_primitives::{Balance, BlockNumber}; type AccountId = u64; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; parameter_types! { @@ -45,14 +46,13 @@ impl frame_system::Config for Test { type BlockWeights = (); type BlockLength = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; + type Nonce = u64; type RuntimeCall = RuntimeCall; - type BlockNumber = BlockNumber; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); @@ -77,7 +77,7 @@ impl pallet_balances::Config for Test { type ExistentialDeposit = ConstU128<1>; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = (); type MaxHolds = ConstU32<0>; type MaxFreezes = ConstU32<0>; @@ -88,12 +88,7 @@ impl pallet_static_price_provider::Config for Test { } construct_runtime!( - pub struct Test - where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { + pub struct Test { System: frame_system, Balances: pallet_balances, StaticPriceProvider: pallet_static_price_provider, @@ -103,8 +98,8 @@ construct_runtime!( pub struct ExternalityBuilder; impl ExternalityBuilder { pub fn build() -> TestExternalities { - let storage = frame_system::GenesisConfig::default() - .build_storage::() + let storage = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); let mut ext = TestExternalities::from(storage); diff --git a/pallets/unified-accounts/src/lib.rs b/pallets/unified-accounts/src/lib.rs index 358f4c12b3..98a1cbbd8e 100644 --- a/pallets/unified-accounts/src/lib.rs +++ b/pallets/unified-accounts/src/lib.rs @@ -312,7 +312,7 @@ impl Pallet { domain.extend_from_slice(&keccak256!("1")); // version domain.extend_from_slice(&(<[u8; 32]>::from(U256::from(T::ChainId::get())))); // chain id domain.extend_from_slice( - frame_system::Pallet::::block_hash(T::BlockNumber::zero()).as_ref(), + frame_system::Pallet::::block_hash(BlockNumberFor::::zero()).as_ref(), ); // genesis block hash keccak_256(domain.as_slice()) } diff --git a/pallets/unified-accounts/src/mock.rs b/pallets/unified-accounts/src/mock.rs index 4ad3697d5a..67933e5180 100644 --- a/pallets/unified-accounts/src/mock.rs +++ b/pallets/unified-accounts/src/mock.rs @@ -23,17 +23,16 @@ use crate as pallet_unified_accounts; use astar_primitives::evm::HashedDefaultMappings; use frame_support::{ construct_runtime, parameter_types, - sp_io::TestExternalities, traits::{ConstU64, FindAuthor}, weights::Weight, }; use pallet_ethereum::PostLogContent; use pallet_evm::FeeCalculator; use sp_core::{keccak_256, H160, H256, U256}; +use sp_io::TestExternalities; use sp_runtime::{ - testing::Header, traits::{AccountIdLookup, BlakeTwo256}, - AccountId32, ConsensusEngineId, + AccountId32, BuildStorage, ConsensusEngineId, }; parameter_types! { @@ -47,14 +46,13 @@ impl frame_system::Config for TestRuntime { type BlockWeights = (); type BlockLength = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; + type Nonce = u64; type RuntimeCall = RuntimeCall; - type BlockNumber = BlockNumber; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = (AccountIdLookup, UnifiedAccounts); - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = ConstU64<250>; type DbWeight = (); @@ -79,7 +77,7 @@ impl pallet_balances::Config for TestRuntime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = (); type MaxHolds = ConstU32<0>; type MaxFreezes = ConstU32<0>; @@ -163,7 +161,6 @@ impl pallet_unified_accounts::Config for TestRuntime { } pub(crate) type AccountId = AccountId32; -pub(crate) type BlockNumber = u64; pub(crate) type Balance = u128; pub const ALICE: AccountId32 = AccountId32::new([0u8; 32]); @@ -178,16 +175,10 @@ pub fn bob_secret() -> libsecp256k1::SecretKey { libsecp256k1::SecretKey::parse(&keccak_256(b"Bob")).unwrap() } -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; construct_runtime!( - pub struct TestRuntime - where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { + pub struct TestRuntime { System: frame_system, Timestamp: pallet_timestamp, Balances: pallet_balances, @@ -215,8 +206,8 @@ impl Default for ExtBuilder { impl ExtBuilder { pub fn build(self) -> TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); pallet_balances::GenesisConfig:: { diff --git a/pallets/xc-asset-config/src/mock.rs b/pallets/xc-asset-config/src/mock.rs index f15736b8b8..aa6acb45e8 100644 --- a/pallets/xc-asset-config/src/mock.rs +++ b/pallets/xc-asset-config/src/mock.rs @@ -23,26 +23,19 @@ use sp_core::H256; use sp_io::TestExternalities; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup}, + BuildStorage, }; -type BlockNumber = u64; type Balance = u128; type AccountId = u64; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; const EXISTENTIAL_DEPOSIT: Balance = 2; construct_runtime!( - pub struct Test - where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { + pub struct Test { System: frame_system, Balances: pallet_balances, XcAssetConfig: pallet_xc_asset_config, @@ -60,14 +53,13 @@ impl frame_system::Config for Test { type BlockWeights = (); type BlockLength = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; + type Nonce = u64; type RuntimeCall = RuntimeCall; - type BlockNumber = BlockNumber; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); @@ -97,7 +89,7 @@ impl pallet_balances::Config for Test { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = (); type MaxHolds = ConstU32<0>; type MaxFreezes = ConstU32<0>; @@ -116,8 +108,8 @@ pub struct ExternalityBuilder; impl ExternalityBuilder { pub fn build() -> TestExternalities { - let storage = frame_system::GenesisConfig::default() - .build_storage::() + let storage = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); let mut ext = TestExternalities::from(storage); diff --git a/pallets/xvm/src/benchmarking.rs b/pallets/xvm/src/benchmarking.rs index 9ab8c5383e..6223ec62a8 100644 --- a/pallets/xvm/src/benchmarking.rs +++ b/pallets/xvm/src/benchmarking.rs @@ -27,7 +27,7 @@ use sp_runtime::MultiAddress; use astar_primitives::Balance; #[benchmarks( - where ::Currency: Currency, + where ::Currency: Inspect, )] mod benchmarks { use super::*; diff --git a/pallets/xvm/src/lib.rs b/pallets/xvm/src/lib.rs index 133ee9b053..b311ee6d92 100644 --- a/pallets/xvm/src/lib.rs +++ b/pallets/xvm/src/lib.rs @@ -41,7 +41,7 @@ extern crate alloc; use alloc::format; use fp_evm::ExitReason; -use frame_support::{ensure, traits::Currency, weights::Weight}; +use frame_support::{ensure, traits::fungible::Inspect, weights::Weight}; use pallet_contracts::{CollectEvents, DebugInfo, Determinism}; use pallet_contracts_primitives::ReturnFlags; use pallet_evm::GasWeightMapping; @@ -100,7 +100,7 @@ pub mod pallet { impl XvmCall for Pallet where T: Config, - T::Currency: Currency, + T::Currency: Inspect, { fn call( context: Context, @@ -127,7 +127,7 @@ where impl Pallet where T: Config, - T::Currency: Currency, + T::Currency: Inspect, { fn do_call( context: Context, diff --git a/pallets/xvm/src/mock.rs b/pallets/xvm/src/mock.rs index 027bbf72a4..2610152fb6 100644 --- a/pallets/xvm/src/mock.rs +++ b/pallets/xvm/src/mock.rs @@ -28,14 +28,13 @@ use frame_support::{ dispatch::{DispatchErrorWithPostInfo, PostDispatchInfo}, pallet_prelude::*, parameter_types, - sp_io::TestExternalities, traits::{ConstBool, ConstU128, ConstU64, Nothing}, }; use sp_core::{H160, H256}; +use sp_io::TestExternalities; use sp_runtime::{ - testing::Header, traits::{AccountIdLookup, BlakeTwo256}, - AccountId32, + AccountId32, BuildStorage, Perbill, }; use sp_std::cell::RefCell; @@ -49,14 +48,13 @@ impl frame_system::Config for TestRuntime { type BlockWeights = (); type BlockLength = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; + type Nonce = u64; type RuntimeCall = RuntimeCall; - type BlockNumber = BlockNumber; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = AccountIdLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = ConstU64<250>; type DbWeight = (); @@ -81,7 +79,7 @@ impl pallet_balances::Config for TestRuntime { type ExistentialDeposit = ConstU128<2>; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = (); type MaxHolds = ConstU32<0>; type MaxFreezes = ConstU32<0>; @@ -100,6 +98,8 @@ parameter_types! { pub const DepositPerItem: Balance = 1_000; pub const DepositPerByte: Balance = 1_000; pub const DefaultDepositLimit: Balance = 1_000; + pub const MaxDelegateDependencies: u32 = 32; + pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(30); pub Schedule: pallet_contracts::Schedule = Default::default(); } @@ -109,6 +109,7 @@ impl pallet_contracts::Config for TestRuntime { type Currency = Balances; type RuntimeEvent = RuntimeEvent; type RuntimeCall = RuntimeCall; + type RuntimeHoldReason = RuntimeHoldReason; type CallFilter = Nothing; type DepositPerItem = DepositPerItem; type DepositPerByte = DepositPerByte; @@ -123,6 +124,11 @@ impl pallet_contracts::Config for TestRuntime { type MaxStorageKeyLen = ConstU32<128>; type UnsafeUnstableInterface = ConstBool; type MaxDebugBufferLen = ConstU32<{ 2 * 1024 * 1024 }>; + type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent; + type MaxDelegateDependencies = MaxDelegateDependencies; + type Migrations = (); + type Debug = (); + type Environment = (); } thread_local! { @@ -179,18 +185,11 @@ impl pallet_xvm::Config for TestRuntime { } pub(crate) type AccountId = AccountId32; -pub(crate) type BlockNumber = u64; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; construct_runtime!( - pub struct TestRuntime - where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { + pub struct TestRuntime { System: frame_system, Timestamp: pallet_timestamp, Balances: pallet_balances, @@ -210,8 +209,8 @@ impl ExtBuilder { pub fn build(self) -> TestExternalities { TRANSACTED.with(|v| *v.borrow_mut() = None); - let t = frame_system::GenesisConfig::default() - .build_storage::() + let t = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); let mut ext = TestExternalities::from(t); From df09963db6b28f67e440a85ce0933da025c75876 Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Wed, 31 Jan 2024 14:49:09 +0530 Subject: [PATCH 06/29] feat: update chain extensions --- Cargo.lock | 3674 ++++++++------------ Cargo.toml | 4 - chain-extensions/pallet-assets/Cargo.toml | 3 +- chain-extensions/pallet-assets/src/mock.rs | 53 +- chain-extensions/xvm/src/lib.rs | 3 +- 5 files changed, 1535 insertions(+), 2202 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 71a940d713..3bb1095c20 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -492,12 +492,6 @@ dependencies = [ "sha3", ] -[[package]] -name = "array-bytes" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6" - [[package]] name = "array-bytes" version = "6.1.0" @@ -620,7 +614,7 @@ dependencies = [ "num_enum 0.5.11", "parity-scale-codec", "scale-info", - "sp-runtime 24.0.0", + "sp-runtime", ] [[package]] @@ -654,9 +648,9 @@ dependencies = [ "fp-evm", "fp-rpc", "fp-storage", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", "frame-benchmarking-cli", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system", "frame-try-runtime", "futures 0.3.28", "jsonrpsee", @@ -701,22 +695,22 @@ dependencies = [ "serde_json", "shibuya-runtime", "shiden-runtime", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-aura", - "sp-core 21.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-io 23.0.0", + "sp-core", + "sp-inherents", + "sp-io", "sp-keyring", - "sp-keystore 0.27.0", + "sp-keystore", "sp-offchain", - "sp-runtime 24.0.0", + "sp-runtime", "sp-session", "sp-timestamp", "sp-transaction-pool", - "sp-trie 22.0.0", + "sp-trie", "substrate-build-script-utils", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", @@ -732,8 +726,8 @@ dependencies = [ "ethereum", "ethereum-types", "fp-evm", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "log", "orml-traits", @@ -744,11 +738,11 @@ dependencies = [ "pallet-xc-asset-config", "parity-scale-codec", "scale-info", - "sp-arithmetic 16.0.0", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -758,7 +752,7 @@ dependencies = [ name = "astar-runtime" version = "5.29.0" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "astar-primitives", "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", @@ -770,10 +764,10 @@ dependencies = [ "cumulus-primitives-utility", "fp-rpc", "fp-self-contained", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -793,7 +787,7 @@ dependencies = [ "pallet-collator-selection", "pallet-collective", "pallet-contracts", - "pallet-contracts-primitives 24.0.0", + "pallet-contracts-primitives", "pallet-dapps-staking", "pallet-dynamic-evm-base-fee", "pallet-ethereum", @@ -830,19 +824,19 @@ dependencies = [ "precompile-utils", "scale-info", "smallvec 1.11.0", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-block-builder", "sp-consensus-aura", - "sp-core 21.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-io 23.0.0", + "sp-core", + "sp-inherents", + "sp-io", "sp-offchain", - "sp-runtime 24.0.0", - "sp-runtime-interface 17.0.0", + "sp-runtime", + "sp-runtime-interface", "sp-session", - "sp-std 8.0.0", + "sp-std", "sp-transaction-pool", - "sp-version 22.0.0", + "sp-version", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -853,13 +847,13 @@ dependencies = [ name = "astar-test-utils" version = "0.1.0" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "pallet-contracts", - "pallet-contracts-primitives 24.0.0", + "pallet-contracts-primitives", "parity-scale-codec", "scale-info", - "sp-runtime 24.0.0", + "sp-runtime", ] [[package]] @@ -867,9 +861,9 @@ name = "astar-xcm-benchmarks" version = "0.1.0" dependencies = [ "astar-primitives", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "pallet-assets", "pallet-balances", @@ -877,10 +871,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -2308,8 +2302,8 @@ dependencies = [ "sc-cli", "sc-client-api", "sc-service", - "sp-core 21.0.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-runtime", "url", ] @@ -2329,10 +2323,10 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "sc-client-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-consensus", - "sp-core 21.0.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-runtime", "tracing", ] @@ -2362,17 +2356,17 @@ dependencies = [ "sc-consensus-slots", "sc-telemetry", "schnellru", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-application-crypto 23.0.0", + "sp-api", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-aura", - "sp-core 21.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-keystore 0.27.0", - "sp-runtime 24.0.0", - "sp-state-machine 0.28.0", + "sp-core", + "sp-inherents", + "sp-keystore", + "sp-runtime", + "sp-state-machine", "sp-timestamp", "substrate-prometheus-endpoint", "tracing", @@ -2399,10 +2393,10 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-consensus-slots", - "sp-core 21.0.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-runtime", "sp-timestamp", - "sp-trie 22.0.0", + "sp-trie", "substrate-prometheus-endpoint", "tracing", ] @@ -2416,9 +2410,9 @@ dependencies = [ "async-trait", "cumulus-primitives-parachain-inherent", "sp-consensus", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-runtime 24.0.0", - "sp-state-machine 0.28.0", + "sp-inherents", + "sp-runtime", + "sp-state-machine", "thiserror", ] @@ -2434,13 +2428,13 @@ dependencies = [ "futures 0.3.28", "parking_lot 0.12.1", "sc-consensus", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core 21.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-runtime 24.0.0", + "sp-core", + "sp-inherents", + "sp-runtime", "substrate-prometheus-endpoint", "tracing", ] @@ -2462,9 +2456,9 @@ dependencies = [ "sc-client-api", "sp-blockchain", "sp-consensus", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-state-machine 0.28.0", + "sp-core", + "sp-runtime", + "sp-state-machine", "tracing", ] @@ -2488,7 +2482,7 @@ dependencies = [ "sc-consensus", "sp-consensus", "sp-maybe-compressed-blob", - "sp-runtime 24.0.0", + "sp-runtime", "tracing", ] @@ -2519,11 +2513,11 @@ dependencies = [ "sc-telemetry", "sc-transaction-pool", "sc-utils", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 21.0.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-runtime", "sp-transaction-pool", ] @@ -2533,16 +2527,16 @@ version = "0.1.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "cumulus-pallet-parachain-system", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "pallet-aura", "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto 23.0.0", + "sp-application-crypto", "sp-consensus-aura", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -2551,14 +2545,14 @@ version = "0.1.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "cumulus-primitives-core", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-io", + "sp-runtime", + "sp-std", "staging-xcm", ] @@ -2572,22 +2566,22 @@ dependencies = [ "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", "environmental", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "log", "parity-scale-codec", "polkadot-parachain-primitives", "scale-info", - "sp-core 21.0.0", - "sp-externalities 0.19.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-state-machine 0.28.0", - "sp-std 8.0.0", - "sp-trie 22.0.0", - "sp-version 22.0.0", + "sp-core", + "sp-externalities", + "sp-inherents", + "sp-io", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", + "sp-version", "staging-xcm", "trie-db", ] @@ -2609,13 +2603,13 @@ version = "0.1.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "cumulus-primitives-core", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-io", + "sp-runtime", + "sp-std", "staging-xcm", ] @@ -2625,17 +2619,17 @@ version = "0.1.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "cumulus-primitives-core", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", "polkadot-runtime-common", "rand_chacha 0.3.1", "scale-info", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-io", + "sp-runtime", + "sp-std", "staging-xcm", "staging-xcm-executor", ] @@ -2648,10 +2642,10 @@ dependencies = [ "parity-scale-codec", "polkadot-core-primitives", "polkadot-primitives", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-consensus-aura", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -2664,10 +2658,10 @@ dependencies = [ "polkadot-parachain-primitives", "polkadot-primitives", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-runtime 24.0.0", - "sp-std 8.0.0", - "sp-trie 22.0.0", + "sp-api", + "sp-runtime", + "sp-std", + "sp-trie", "staging-xcm", ] @@ -2683,14 +2677,14 @@ dependencies = [ "parity-scale-codec", "sc-client-api", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-core 21.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-runtime 24.0.0", - "sp-state-machine 0.28.0", - "sp-std 8.0.0", - "sp-storage 13.0.0", - "sp-trie 22.0.0", + "sp-api", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-storage", + "sp-trie", "tracing", ] @@ -2702,8 +2696,8 @@ dependencies = [ "cumulus-primitives-core", "futures 0.3.28", "parity-scale-codec", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-std 8.0.0", + "sp-inherents", + "sp-std", "sp-timestamp", ] @@ -2713,13 +2707,13 @@ version = "0.1.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "cumulus-primitives-core", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", "log", "parity-scale-codec", "polkadot-runtime-common", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-io", + "sp-runtime", + "sp-std", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -2742,11 +2736,11 @@ dependencies = [ "sc-sysinfo", "sc-telemetry", "sc-tracing", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-consensus", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-state-machine 0.28.0", + "sp-core", + "sp-runtime", + "sp-state-machine", ] [[package]] @@ -2761,9 +2755,9 @@ dependencies = [ "parity-scale-codec", "polkadot-overseer", "sc-client-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-blockchain", - "sp-state-machine 0.28.0", + "sp-state-machine", "thiserror", ] @@ -2772,7 +2766,7 @@ name = "cumulus-relay-chain-minimal-node" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", @@ -2795,10 +2789,10 @@ dependencies = [ "sc-tracing", "sc-utils", "schnellru", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-consensus", "sp-consensus-babe", - "sp-runtime 24.0.0", + "sp-runtime", "tracing", ] @@ -2826,13 +2820,13 @@ dependencies = [ "serde_json", "smoldot", "smoldot-light", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-authority-discovery", "sp-consensus-babe", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-state-machine 0.28.0", - "sp-storage 13.0.0", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-storage", "thiserror", "tokio", "tokio-util", @@ -2848,10 +2842,10 @@ dependencies = [ "cumulus-primitives-core", "parity-scale-codec", "polkadot-primitives", - "sp-runtime 24.0.0", - "sp-state-machine 0.28.0", - "sp-std 8.0.0", - "sp-trie 22.0.0", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", ] [[package]] @@ -2970,8 +2964,8 @@ name = "dapp-staking-v3-runtime-api" version = "0.0.1-alpha" dependencies = [ "astar-primitives", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-std 8.0.0", + "sp-api", + "sp-std", ] [[package]] @@ -3365,15 +3359,6 @@ dependencies = [ "spki 0.7.2", ] -[[package]] -name = "ed25519" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" -dependencies = [ - "signature 1.6.4", -] - [[package]] name = "ed25519" version = "2.2.3" @@ -3384,18 +3369,6 @@ dependencies = [ "signature 2.1.0", ] -[[package]] -name = "ed25519-dalek" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" -dependencies = [ - "curve25519-dalek 3.2.0", - "ed25519 1.5.3", - "sha2 0.9.9", - "zeroize", -] - [[package]] name = "ed25519-dalek" version = "2.1.0" @@ -3403,7 +3376,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" dependencies = [ "curve25519-dalek 4.1.1", - "ed25519 2.2.3", + "ed25519", "rand_core 0.6.4", "serde", "sha2 0.10.7", @@ -3432,7 +3405,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9" dependencies = [ "curve25519-dalek 4.1.1", - "ed25519 2.2.3", + "ed25519", "hashbrown 0.14.0", "hex", "rand_core 0.6.4", @@ -4025,7 +3998,7 @@ dependencies = [ "evm-gasometer", "evm-runtime", "parity-scale-codec", - "sp-runtime-interface 17.0.0", + "sp-runtime-interface", ] [[package]] @@ -4061,19 +4034,6 @@ dependencies = [ "quote", ] -[[package]] -name = "expander" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f360349150728553f92e4c997a16af8915f418d3a0f21b440d34c5632f16ed84" -dependencies = [ - "blake2", - "fs-err", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "expander" version = "2.0.0" @@ -4158,35 +4118,35 @@ dependencies = [ [[package]] name = "fc-api" version = "1.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#8a5a81a24c3e0fab668483b54882757b7302926d" dependencies = [ "async-trait", "fp-storage", "parity-scale-codec", - "sp-core 21.0.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-runtime", ] [[package]] name = "fc-consensus" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#8a5a81a24c3e0fab668483b54882757b7302926d" dependencies = [ "async-trait", "fp-consensus", "fp-rpc", "sc-consensus", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-block-builder", "sp-consensus", - "sp-runtime 24.0.0", + "sp-runtime", "thiserror", ] [[package]] name = "fc-db" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#8a5a81a24c3e0fab668483b54882757b7302926d" dependencies = [ "async-trait", "fc-api", @@ -4199,15 +4159,15 @@ dependencies = [ "sc-client-db", "smallvec 1.11.0", "sp-blockchain", - "sp-core 21.0.0", + "sp-core", "sp-database", - "sp-runtime 24.0.0", + "sp-runtime", ] [[package]] name = "fc-mapping-sync" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#8a5a81a24c3e0fab668483b54882757b7302926d" dependencies = [ "fc-db", "fc-storage", @@ -4219,16 +4179,16 @@ dependencies = [ "parking_lot 0.12.1", "sc-client-api", "sc-utils", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-blockchain", "sp-consensus", - "sp-runtime 24.0.0", + "sp-runtime", ] [[package]] name = "fc-rpc" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#8a5a81a24c3e0fab668483b54882757b7302926d" dependencies = [ "ethereum", "ethereum-types", @@ -4262,17 +4222,17 @@ dependencies = [ "sc-utils", "schnellru", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-aura", - "sp-core 21.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-state-machine 0.28.0", - "sp-storage 13.0.0", + "sp-core", + "sp-inherents", + "sp-io", + "sp-runtime", + "sp-state-machine", + "sp-storage", "sp-timestamp", "substrate-prometheus-endpoint", "thiserror", @@ -4282,7 +4242,7 @@ dependencies = [ [[package]] name = "fc-rpc-core" version = "1.1.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#8a5a81a24c3e0fab668483b54882757b7302926d" dependencies = [ "ethereum", "ethereum-types", @@ -4295,7 +4255,7 @@ dependencies = [ [[package]] name = "fc-storage" version = "1.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#8a5a81a24c3e0fab668483b54882757b7302926d" dependencies = [ "ethereum", "ethereum-types", @@ -4303,11 +4263,11 @@ dependencies = [ "fp-storage", "parity-scale-codec", "sc-client-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-blockchain", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-storage 13.0.0", + "sp-io", + "sp-runtime", + "sp-storage", ] [[package]] @@ -4460,7 +4420,7 @@ dependencies = [ [[package]] name = "fp-account" version = "1.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#8a5a81a24c3e0fab668483b54882757b7302926d" dependencies = [ "hex", "impl-serde", @@ -4469,87 +4429,87 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-runtime-interface 17.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-runtime-interface", + "sp-std", ] [[package]] name = "fp-consensus" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#8a5a81a24c3e0fab668483b54882757b7302926d" dependencies = [ "ethereum", "parity-scale-codec", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] name = "fp-ethereum" version = "1.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#8a5a81a24c3e0fab668483b54882757b7302926d" dependencies = [ "ethereum", "ethereum-types", "fp-evm", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", "parity-scale-codec", - "sp-std 8.0.0", + "sp-std", ] [[package]] name = "fp-evm" version = "3.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#8a5a81a24c3e0fab668483b54882757b7302926d" dependencies = [ "evm", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", "num_enum 0.7.0", "parity-scale-codec", "scale-info", "serde", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] name = "fp-rpc" version = "3.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#8a5a81a24c3e0fab668483b54882757b7302926d" dependencies = [ "ethereum", "ethereum-types", "fp-evm", "parity-scale-codec", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-state-machine 0.28.0", - "sp-std 8.0.0", + "sp-api", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-std", ] [[package]] name = "fp-self-contained" version = "1.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#8a5a81a24c3e0fab668483b54882757b7302926d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", "parity-scale-codec", "scale-info", "serde", - "sp-runtime 24.0.0", + "sp-runtime", ] [[package]] name = "fp-storage" version = "2.0.0" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#8a5a81a24c3e0fab668483b54882757b7302926d" dependencies = [ "parity-scale-codec", "serde", @@ -4561,53 +4521,28 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" -[[package]] -name = "frame-benchmarking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", - "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", - "linregress", - "log", - "parity-scale-codec", - "paste", - "scale-info", - "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-runtime-interface 7.0.0", - "sp-std 5.0.0", - "sp-storage 7.0.0", - "static_assertions", -] - [[package]] name = "frame-benchmarking" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-support-procedural", + "frame-system", "linregress", "log", "parity-scale-codec", "paste", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-application-crypto 23.0.0", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-runtime-interface 17.0.0", - "sp-std 8.0.0", - "sp-storage 13.0.0", + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-io", + "sp-runtime", + "sp-runtime-interface", + "sp-std", + "sp-storage", "static_assertions", ] @@ -4617,13 +4552,13 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "Inflector", - "array-bytes 6.1.0", + "array-bytes", "chrono", "clap", "comfy-table", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "gethostname", "handlebars", "itertools 0.10.5", @@ -4642,19 +4577,19 @@ dependencies = [ "sc-sysinfo", "serde", "serde_json", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-blockchain", - "sp-core 21.0.0", + "sp-core", "sp-database", - "sp-externalities 0.19.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-io 23.0.0", - "sp-keystore 0.27.0", - "sp-runtime 24.0.0", - "sp-state-machine 0.28.0", - "sp-storage 13.0.0", - "sp-trie 22.0.0", - "sp-wasm-interface 14.0.0", + "sp-externalities", + "sp-inherents", + "sp-io", + "sp-keystore", + "sp-runtime", + "sp-state-machine", + "sp-storage", + "sp-trie", + "sp-wasm-interface", "thiserror", "thousands", ] @@ -4676,15 +4611,15 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "frame-election-provider-solution-type", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-arithmetic 16.0.0", - "sp-core 21.0.0", + "sp-arithmetic", + "sp-core", "sp-npos-elections", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -4692,29 +4627,17 @@ name = "frame-executive" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "frame-try-runtime", "log", "parity-scale-codec", "scale-info", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", - "sp-tracing 10.0.0", -] - -[[package]] -name = "frame-metadata" -version = "15.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "878babb0b136e731cc77ec2fd883ff02745ff21e6fb662729953d44923df009c" -dependencies = [ - "cfg-if", - "parity-scale-codec", - "scale-info", - "serde", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-tracing", ] [[package]] @@ -4741,50 +4664,16 @@ dependencies = [ "log", "parity-scale-codec", "serde", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-state-machine 0.28.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-state-machine", "spinners", "substrate-rpc-client", "tokio", "tokio-retry", ] -[[package]] -name = "frame-support" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "bitflags 1.3.2", - "environmental", - "frame-metadata 15.1.0", - "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", - "impl-trait-for-tuples", - "k256", - "log", - "once_cell", - "parity-scale-codec", - "paste", - "scale-info", - "serde", - "smallvec 1.11.0", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", - "sp-arithmetic 6.0.0", - "sp-core 7.0.0", - "sp-core-hashing-proc-macro 5.0.0", - "sp-debug-derive 5.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", - "sp-state-machine 0.13.0", - "sp-std 5.0.0", - "sp-tracing 6.0.0", - "sp-weights 4.0.0", - "tt-call", -] - [[package]] name = "frame-support" version = "4.0.0-dev" @@ -4794,8 +4683,8 @@ dependencies = [ "bitflags 1.3.2", "docify", "environmental", - "frame-metadata 16.0.0", - "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-metadata", + "frame-support-procedural", "impl-trait-for-tuples", "k256", "log", @@ -4806,41 +4695,25 @@ dependencies = [ "serde", "serde_json", "smallvec 1.11.0", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-arithmetic 16.0.0", - "sp-core 21.0.0", - "sp-core-hashing-proc-macro 9.0.0", - "sp-debug-derive 8.0.0", + "sp-api", + "sp-arithmetic", + "sp-core", + "sp-core-hashing-proc-macro", + "sp-debug-derive", "sp-genesis-builder", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-io 23.0.0", - "sp-metadata-ir 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-runtime 24.0.0", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-state-machine 0.28.0", - "sp-std 8.0.0", - "sp-tracing 10.0.0", - "sp-weights 20.0.0", + "sp-inherents", + "sp-io", + "sp-metadata-ir", + "sp-runtime", + "sp-staking", + "sp-state-machine", + "sp-std", + "sp-tracing", + "sp-weights", "static_assertions", "tt-call", ] -[[package]] -name = "frame-support-procedural" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "Inflector", - "cfg-expr", - "derive-syn-parse", - "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", - "itertools 0.10.5", - "proc-macro-warning 0.3.1", - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "frame-support-procedural" version = "4.0.0-dev" @@ -4850,22 +4723,10 @@ dependencies = [ "cfg-expr", "derive-syn-parse", "expander 2.0.0", - "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support-procedural-tools", "itertools 0.10.5", "macro_magic", - "proc-macro-warning 0.4.2", - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "frame-support-procedural-tools" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", - "proc-macro-crate 1.3.1", + "proc-macro-warning", "proc-macro2", "quote", "syn 2.0.48", @@ -4876,23 +4737,13 @@ name = "frame-support-procedural-tools" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support-procedural-tools-derive", "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 2.0.48", ] -[[package]] -name = "frame-support-procedural-tools-derive" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" @@ -4903,42 +4754,23 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "frame-system" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "cfg-if", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", - "log", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", - "sp-version 5.0.0", - "sp-weights 4.0.0", -] - [[package]] name = "frame-system" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "cfg-if", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", "log", "parity-scale-codec", "scale-info", "serde", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", - "sp-version 22.0.0", - "sp-weights 20.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-version", + "sp-weights", ] [[package]] @@ -4946,14 +4778,14 @@ name = "frame-system-benchmarking" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -4962,7 +4794,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", ] [[package]] @@ -4970,11 +4802,11 @@ name = "frame-try-runtime" version = "0.10.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-api", + "sp-runtime", + "sp-std", ] [[package]] @@ -5807,14 +5639,14 @@ dependencies = [ "astar-test-utils", "env_logger 0.10.0", "fp-evm", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "hex", "libsecp256k1", "pallet-assets", "pallet-balances", "pallet-contracts", - "pallet-contracts-primitives 24.0.0", + "pallet-contracts-primitives", "pallet-dapp-staking-v3", "pallet-dapps-staking", "pallet-ethereum-checked", @@ -5830,9 +5662,9 @@ dependencies = [ "sha3", "shibuya-runtime", "shiden-runtime", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-io", + "sp-runtime", "unified-accounts-chain-extension-types", ] @@ -6138,13 +5970,13 @@ name = "kusama-runtime-constants" version = "1.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", "polkadot-primitives", "polkadot-runtime-common", "smallvec 1.11.0", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-weights 20.0.0", + "sp-core", + "sp-runtime", + "sp-weights", ] [[package]] @@ -6357,7 +6189,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce" dependencies = [ "bs58 0.4.0", - "ed25519-dalek 2.1.0", + "ed25519-dalek", "log", "multiaddr", "multihash", @@ -6782,15 +6614,15 @@ checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" name = "local-runtime" version = "5.29.0" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "astar-primitives", "dapp-staking-v3-runtime-api", "fp-rpc", "fp-self-contained", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -6808,7 +6640,7 @@ dependencies = [ "pallet-chain-extension-xvm", "pallet-collective", "pallet-contracts", - "pallet-contracts-primitives 24.0.0", + "pallet-contracts-primitives", "pallet-dapp-staking-migration", "pallet-dapp-staking-v3", "pallet-dapps-staking", @@ -6850,19 +6682,19 @@ dependencies = [ "precompile-utils", "scale-info", "smallvec 1.11.0", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-arithmetic 16.0.0", + "sp-api", + "sp-arithmetic", "sp-block-builder", "sp-consensus-aura", - "sp-core 21.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-io 23.0.0", + "sp-core", + "sp-inherents", + "sp-io", "sp-offchain", - "sp-runtime 24.0.0", + "sp-runtime", "sp-session", - "sp-std 8.0.0", + "sp-std", "sp-transaction-pool", - "sp-version 22.0.0", + "sp-version", "substrate-wasm-builder", ] @@ -7110,12 +6942,6 @@ dependencies = [ "hash-db 0.16.0", ] -[[package]] -name = "memory_units" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" - [[package]] name = "merlin" version = "2.0.1" @@ -7193,13 +7019,13 @@ dependencies = [ "parity-scale-codec", "sc-client-api", "sc-offchain", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-blockchain", "sp-consensus", "sp-consensus-beefy", - "sp-core 21.0.0", + "sp-core", "sp-mmr-primitives", - "sp-runtime 24.0.0", + "sp-runtime", ] [[package]] @@ -7211,11 +7037,11 @@ dependencies = [ "jsonrpsee", "parity-scale-codec", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-blockchain", - "sp-core 21.0.0", + "sp-core", "sp-mmr-primitives", - "sp-runtime 24.0.0", + "sp-runtime", ] [[package]] @@ -7256,7 +7082,7 @@ dependencies = [ "parity-scale-codec", "serde", "serde_json", - "sp-std 8.0.0", + "sp-std", ] [[package]] @@ -7272,10 +7098,10 @@ dependencies = [ "moonbeam-primitives-ext", "pallet-evm", "parity-scale-codec", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -7285,9 +7111,9 @@ dependencies = [ "ethereum-types", "evm-tracing-events", "parity-scale-codec", - "sp-externalities 0.19.0", - "sp-runtime-interface 17.0.0", - "sp-std 8.0.0", + "sp-externalities", + "sp-runtime-interface", + "sp-std", ] [[package]] @@ -7301,7 +7127,7 @@ dependencies = [ "moonbeam-rpc-core-types", "serde", "serde_json", - "sp-core 21.0.0", + "sp-core", ] [[package]] @@ -7358,12 +7184,12 @@ dependencies = [ "moonbeam-rpc-primitives-debug", "sc-client-api", "sc-utils", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-io", + "sp-runtime", "tokio", ] @@ -7378,11 +7204,11 @@ dependencies = [ "parity-scale-codec", "serde", "serde_json", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-api", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -7392,10 +7218,10 @@ dependencies = [ "ethereum", "parity-scale-codec", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-api", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -7420,12 +7246,12 @@ dependencies = [ "sc-utils", "serde", "sha3", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-block-builder", "sp-blockchain", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-io", + "sp-runtime", + "sp-std", "sp-transaction-pool", "tokio", "tracing", @@ -7437,7 +7263,7 @@ version = "0.6.0" dependencies = [ "ethereum-types", "fc-rpc", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system", "jsonrpsee", "moonbeam-rpc-core-txpool", "moonbeam-rpc-primitives-txpool", @@ -7446,11 +7272,11 @@ dependencies = [ "sc-transaction-pool-api", "serde", "sha3", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-blockchain", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -7966,7 +7792,7 @@ name = "orml-traits" version = "0.4.1-dev" source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.1.0#b3694e631df7f1ca16b1973122937753fcdee9d4" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", "impl-trait-for-tuples", "num-traits", "orml-utilities", @@ -7974,10 +7800,10 @@ dependencies = [ "paste", "scale-info", "serde", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "staging-xcm", ] @@ -7986,14 +7812,14 @@ name = "orml-utilities" version = "0.4.1-dev" source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.1.0#b3694e631df7f1ca16b1973122937753fcdee9d4" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", "parity-scale-codec", "scale-info", "serde", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -8001,11 +7827,11 @@ name = "orml-xcm-support" version = "0.4.1-dev" source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.1.0#b3694e631df7f1ca16b1973122937753fcdee9d4" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", "orml-traits", "parity-scale-codec", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-runtime", + "sp-std", "staging-xcm", "staging-xcm-executor", ] @@ -8016,8 +7842,8 @@ version = "0.4.1-dev" source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.1.0#b3694e631df7f1ca16b1973122937753fcdee9d4" dependencies = [ "cumulus-primitives-core", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "log", "orml-traits", "orml-xcm-support", @@ -8025,9 +7851,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-io", + "sp-runtime", + "sp-std", "staging-xcm", "staging-xcm-executor", ] @@ -8059,15 +7885,15 @@ name = "pallet-assets" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -8075,16 +7901,16 @@ name = "pallet-aura" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "log", "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto 23.0.0", + "sp-application-crypto", "sp-consensus-aura", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -8092,15 +7918,15 @@ name = "pallet-authority-discovery" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto 23.0.0", + "sp-application-crypto", "sp-authority-discovery", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -8108,13 +7934,13 @@ name = "pallet-authorship" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -8122,23 +7948,23 @@ name = "pallet-babe" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "pallet-authorship", "pallet-session", "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto 23.0.0", + "sp-application-crypto", "sp-consensus-babe", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-io", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-std 8.0.0", + "sp-staking", + "sp-std", ] [[package]] @@ -8148,19 +7974,19 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "aquamarine", "docify", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "log", "pallet-balances", "parity-scale-codec", "scale-info", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", - "sp-tracing 10.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-tracing", ] [[package]] @@ -8168,14 +7994,14 @@ name = "pallet-balances" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -8183,8 +8009,8 @@ name = "pallet-beefy" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "log", "pallet-authorship", "pallet-session", @@ -8192,10 +8018,10 @@ dependencies = [ "scale-info", "serde", "sp-consensus-beefy", - "sp-runtime 24.0.0", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-std 8.0.0", + "sp-staking", + "sp-std", ] [[package]] @@ -8203,10 +8029,10 @@ name = "pallet-beefy-mmr" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "binary-merkle-tree", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "log", "pallet-beefy", "pallet-mmr", @@ -8214,13 +8040,13 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-consensus-beefy", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-state-machine 0.28.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-state-machine", + "sp-std", ] [[package]] @@ -8228,18 +8054,20 @@ name = "pallet-block-rewards-hybrid" version = "0.1.0" dependencies = [ "astar-primitives", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", "pallet-balances", "pallet-timestamp", "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 16.0.0", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -8247,17 +8075,17 @@ name = "pallet-bounties" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -8266,21 +8094,21 @@ version = "0.1.0" dependencies = [ "assets-chain-extension-types", "env_logger 0.9.3", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "log", "num-traits", "pallet-assets", "pallet-balances", "pallet-contracts", - "pallet-contracts-primitives 24.0.0", + "pallet-contracts-primitives", "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -8288,19 +8116,19 @@ name = "pallet-chain-extension-unified-accounts" version = "0.1.0" dependencies = [ "astar-primitives", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "log", "num-traits", "pallet-contracts", - "pallet-contracts-primitives 24.0.0", + "pallet-contracts-primitives", "pallet-evm", "pallet-unified-accounts", "parity-scale-codec", "scale-info", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-runtime", + "sp-std", "unified-accounts-chain-extension-types", ] @@ -8309,18 +8137,18 @@ name = "pallet-chain-extension-xvm" version = "0.1.1" dependencies = [ "astar-primitives", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "log", "num-traits", "pallet-contracts", - "pallet-contracts-primitives 24.0.0", + "pallet-contracts-primitives", "pallet-unified-accounts", "parity-scale-codec", "scale-info", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-runtime", + "sp-std", "xvm-chain-extension-types", ] @@ -8329,27 +8157,27 @@ name = "pallet-child-bounties" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "pallet-bounties", "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-collator-selection" version = "3.3.2" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "pallet-aura", "pallet-authorship", @@ -8361,12 +8189,12 @@ dependencies = [ "scale-info", "serde", "sp-consensus-aura", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-std 8.0.0", - "sp-tracing 10.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", + "sp-tracing", ] [[package]] @@ -8374,31 +8202,32 @@ name = "pallet-collective" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-contracts" version = "4.0.0-dev" -source = "git+https://github.com/AstarNetwork/substrate?branch=astar-polkadot-v0.9.43#3cf04f2d82a9305bf2e0bd74886c27c1c60c287e" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "bitflags 1.3.2", "environmental", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", + "frame-benchmarking", + "frame-support", + "frame-system", "impl-trait-for-tuples", "log", - "pallet-contracts-primitives 7.0.0", + "pallet-balances", + "pallet-contracts-primitives", "pallet-contracts-proc-macro", "parity-scale-codec", "rand 0.8.5", @@ -8406,27 +8235,13 @@ dependencies = [ "scale-info", "serde", "smallvec 1.11.0", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-api", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "wasm-instrument 0.4.0", - "wasmi 0.28.0", - "wasmparser-nostd", -] - -[[package]] -name = "pallet-contracts-primitives" -version = "7.0.0" -source = "git+https://github.com/AstarNetwork/substrate?branch=astar-polkadot-v0.9.43#3cf04f2d82a9305bf2e0bd74886c27c1c60c287e" -dependencies = [ - "bitflags 1.3.2", - "parity-scale-codec", - "scale-info", - "sp-runtime 7.0.0", - "sp-std 5.0.0", - "sp-weights 4.0.0", + "wasmi", ] [[package]] @@ -8437,15 +8252,15 @@ dependencies = [ "bitflags 1.3.2", "parity-scale-codec", "scale-info", - "sp-runtime 24.0.0", - "sp-std 8.0.0", - "sp-weights 20.0.0", + "sp-runtime", + "sp-std", + "sp-weights", ] [[package]] name = "pallet-contracts-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/AstarNetwork/substrate?branch=astar-polkadot-v0.9.43#3cf04f2d82a9305bf2e0bd74886c27c1c60c287e" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "proc-macro2", "quote", @@ -8458,15 +8273,15 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "assert_matches", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "serde", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -8474,19 +8289,20 @@ name = "pallet-dapp-staking-migration" version = "1.0.0" dependencies = [ "astar-primitives", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", "pallet-balances", "pallet-dapp-staking-v3", "pallet-dapps-staking", "parity-scale-codec", "scale-info", - "sp-arithmetic 16.0.0", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -8495,20 +8311,20 @@ version = "0.0.1-alpha" dependencies = [ "assert_matches", "astar-primitives", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "num-traits", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 16.0.0", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -8517,9 +8333,9 @@ version = "3.10.0" dependencies = [ "assert_matches", "astar-primitives", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "num-traits", "pallet-balances", "pallet-session", @@ -8527,12 +8343,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 16.0.0", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-std 8.0.0", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -8540,17 +8356,17 @@ name = "pallet-democracy" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", "serde", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -8558,17 +8374,18 @@ name = "pallet-dynamic-evm-base-fee" version = "0.1.0" dependencies = [ "fp-evm", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "num-traits", "pallet-balances", "pallet-timestamp", "pallet-transaction-payment", "parity-scale-codec", "scale-info", - "sp-core 21.0.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-io", + "sp-runtime", ] [[package]] @@ -8576,21 +8393,21 @@ name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "log", "pallet-election-provider-support-benchmarking", "parity-scale-codec", "rand 0.8.5", "scale-info", - "sp-arithmetic 16.0.0", - "sp-core 21.0.0", - "sp-io 23.0.0", + "sp-arithmetic", + "sp-core", + "sp-io", "sp-npos-elections", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-runtime", + "sp-std", "strum 0.24.1", ] @@ -8599,13 +8416,13 @@ name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", "frame-election-provider-support", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-system", "parity-scale-codec", "sp-npos-elections", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -8613,24 +8430,24 @@ name = "pallet-elections-phragmen" version = "5.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-core 21.0.0", - "sp-io 23.0.0", + "sp-core", + "sp-io", "sp-npos-elections", - "sp-runtime 24.0.0", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-std 8.0.0", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] name = "pallet-ethereum" version = "4.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#8a5a81a24c3e0fab668483b54882757b7302926d" dependencies = [ "ethereum", "ethereum-types", @@ -8640,14 +8457,14 @@ dependencies = [ "fp-evm", "fp-rpc", "fp-storage", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "pallet-evm", "parity-scale-codec", "scale-info", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -8659,9 +8476,9 @@ dependencies = [ "ethereum-types", "fp-ethereum", "fp-evm", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "hex", "pallet-balances", "pallet-ethereum", @@ -8669,23 +8486,23 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-evm" version = "6.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#8a5a81a24c3e0fab668483b54882757b7302926d" dependencies = [ "environmental", "evm", "fp-account", "fp-evm", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "hash-db 0.16.0", "hex", "hex-literal", @@ -8694,22 +8511,22 @@ dependencies = [ "parity-scale-codec", "rlp", "scale-info", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-evm-chain-id" version = "1.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#8a5a81a24c3e0fab668483b54882757b7302926d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-runtime 24.0.0", + "sp-runtime", ] [[package]] @@ -8718,8 +8535,8 @@ version = "0.5.2" dependencies = [ "derive_more", "fp-evm", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "log", "num_enum 0.5.11", "pallet-assets", @@ -8732,16 +8549,16 @@ dependencies = [ "serde", "sha3", "slices", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-evm-precompile-blake2" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#8a5a81a24c3e0fab668483b54882757b7302926d" dependencies = [ "fp-evm", ] @@ -8749,10 +8566,10 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-bn128" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#8a5a81a24c3e0fab668483b54882757b7302926d" dependencies = [ "fp-evm", - "sp-core 21.0.0", + "sp-core", "substrate-bn", ] @@ -8764,8 +8581,8 @@ dependencies = [ "astar-primitives", "derive_more", "fp-evm", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "log", "num_enum 0.5.11", "pallet-balances", @@ -8777,11 +8594,11 @@ dependencies = [ "scale-info", "serde", "sha3", - "sp-arithmetic 16.0.0", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -8790,8 +8607,8 @@ version = "3.6.3" dependencies = [ "derive_more", "fp-evm", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "log", "num_enum 0.5.11", "pallet-balances", @@ -8803,37 +8620,37 @@ dependencies = [ "scale-info", "serde", "sha3", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-evm-precompile-dispatch" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#8a5a81a24c3e0fab668483b54882757b7302926d" dependencies = [ "fp-evm", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", "pallet-evm", "parity-scale-codec", - "sp-runtime 24.0.0", + "sp-runtime", ] [[package]] name = "pallet-evm-precompile-ed25519" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#8a5a81a24c3e0fab668483b54882757b7302926d" dependencies = [ - "ed25519-dalek 2.1.0", + "ed25519-dalek", "fp-evm", ] [[package]] name = "pallet-evm-precompile-modexp" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#8a5a81a24c3e0fab668483b54882757b7302926d" dependencies = [ "fp-evm", "num", @@ -8842,7 +8659,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-sha3fips" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#8a5a81a24c3e0fab668483b54882757b7302926d" dependencies = [ "fp-evm", "tiny-keccak", @@ -8851,11 +8668,11 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-simple" version = "2.0.0-dev" -source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#d9513e071ee356f9d83ce9e68b497447ea152e45" +source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v1.1.0#8a5a81a24c3e0fab668483b54882757b7302926d" dependencies = [ "fp-evm", "ripemd", - "sp-io 23.0.0", + "sp-io", ] [[package]] @@ -8864,8 +8681,8 @@ version = "1.2.1" dependencies = [ "derive_more", "fp-evm", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "hex-literal", "log", "num_enum 0.5.11", @@ -8876,10 +8693,10 @@ dependencies = [ "precompile-utils", "scale-info", "serde", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -8889,8 +8706,8 @@ dependencies = [ "assert_matches", "derive_more", "fp-evm", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "hex-literal", "log", "num_enum 0.5.11", @@ -8901,10 +8718,10 @@ dependencies = [ "precompile-utils", "scale-info", "serde", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -8915,8 +8732,8 @@ dependencies = [ "derive_more", "ethers", "fp-evm", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "hex", "hex-literal", "libsecp256k1", @@ -8930,10 +8747,10 @@ dependencies = [ "precompile-utils", "scale-info", "serde", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -8944,8 +8761,8 @@ dependencies = [ "astar-primitives", "derive_more", "fp-evm", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "hex-literal", "log", "num_enum 0.5.11", @@ -8962,10 +8779,10 @@ dependencies = [ "precompile-utils", "scale-info", "serde", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -8978,8 +8795,8 @@ dependencies = [ "astar-primitives", "derive_more", "fp-evm", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "hex", "hex-literal", "log", @@ -8991,10 +8808,10 @@ dependencies = [ "precompile-utils", "scale-info", "serde", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -9003,17 +8820,17 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "docify", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-std 8.0.0", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -9021,22 +8838,22 @@ name = "pallet-grandpa" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "pallet-authorship", "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto 23.0.0", + "sp-application-crypto", "sp-consensus-grandpa", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-io", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-std 8.0.0", + "sp-staking", + "sp-std", ] [[package]] @@ -9045,14 +8862,14 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "enumflags2", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -9060,19 +8877,19 @@ name = "pallet-im-online" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "pallet-authorship", "parity-scale-codec", "scale-info", - "sp-application-crypto 23.0.0", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-std 8.0.0", + "sp-application-crypto", + "sp-core", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -9080,16 +8897,16 @@ name = "pallet-indices" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-core 21.0.0", - "sp-io 23.0.0", + "sp-core", + "sp-io", "sp-keyring", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -9097,17 +8914,18 @@ name = "pallet-inflation" version = "0.1.0" dependencies = [ "astar-primitives", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -9115,13 +8933,13 @@ name = "pallet-insecure-randomness-collective-flip" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "parity-scale-codec", "safe-mix", "scale-info", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -9129,16 +8947,16 @@ name = "pallet-membership" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -9146,18 +8964,18 @@ name = "pallet-message-queue" version = "7.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-arithmetic 16.0.0", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", - "sp-weights 20.0.0", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-weights", ] [[package]] @@ -9165,17 +8983,17 @@ name = "pallet-mmr" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-core 21.0.0", - "sp-io 23.0.0", + "sp-core", + "sp-io", "sp-mmr-primitives", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -9183,15 +9001,15 @@ name = "pallet-multisig" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -9199,15 +9017,15 @@ name = "pallet-nis" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-arithmetic 16.0.0", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-arithmetic", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -9215,18 +9033,18 @@ name = "pallet-nomination-pools" version = "1.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "log", "pallet-balances", "parity-scale-codec", "scale-info", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-std 8.0.0", - "sp-tracing 10.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", + "sp-tracing", ] [[package]] @@ -9234,19 +9052,19 @@ name = "pallet-nomination-pools-benchmarking" version = "1.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "pallet-bags-list", "pallet-nomination-pools", "pallet-staking", "parity-scale-codec", "scale-info", - "sp-runtime 24.0.0", - "sp-runtime-interface 17.0.0", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-std 8.0.0", + "sp-runtime", + "sp-runtime-interface", + "sp-staking", + "sp-std", ] [[package]] @@ -9256,8 +9074,8 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "pallet-nomination-pools", "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-std 8.0.0", + "sp-api", + "sp-std", ] [[package]] @@ -9265,16 +9083,16 @@ name = "pallet-offences" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "log", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-runtime 24.0.0", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-std 8.0.0", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -9282,10 +9100,10 @@ name = "pallet-offences-benchmarking" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "log", "pallet-babe", "pallet-balances", @@ -9296,9 +9114,9 @@ dependencies = [ "pallet-staking", "parity-scale-codec", "scale-info", - "sp-runtime 24.0.0", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-std 8.0.0", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -9306,16 +9124,16 @@ name = "pallet-preimage" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -9323,14 +9141,14 @@ name = "pallet-proxy" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -9338,17 +9156,17 @@ name = "pallet-ranked-collective" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-arithmetic 16.0.0", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -9356,14 +9174,14 @@ name = "pallet-recovery" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -9372,17 +9190,17 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "assert_matches", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 16.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-arithmetic", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -9391,16 +9209,16 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "docify", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", - "sp-weights 20.0.0", + "sp-io", + "sp-runtime", + "sp-std", + "sp-weights", ] [[package]] @@ -9408,21 +9226,21 @@ name = "pallet-session" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "log", "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-io", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-state-machine 0.28.0", - "sp-std 8.0.0", - "sp-trie 22.0.0", + "sp-staking", + "sp-state-machine", + "sp-std", + "sp-trie", ] [[package]] @@ -9430,16 +9248,16 @@ name = "pallet-session-benchmarking" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "pallet-session", "pallet-staking", "parity-scale-codec", "rand 0.8.5", - "sp-runtime 24.0.0", + "sp-runtime", "sp-session", - "sp-std 8.0.0", + "sp-std", ] [[package]] @@ -9447,17 +9265,17 @@ name = "pallet-society" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", "rand_chacha 0.2.2", "scale-info", - "sp-arithmetic 16.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-arithmetic", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -9465,10 +9283,10 @@ name = "pallet-staking" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "log", "pallet-authorship", "pallet-session", @@ -9476,11 +9294,11 @@ dependencies = [ "rand_chacha 0.2.2", "scale-info", "serde", - "sp-application-crypto 23.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-std 8.0.0", + "sp-application-crypto", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -9500,7 +9318,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "log", - "sp-arithmetic 16.0.0", + "sp-arithmetic", ] [[package]] @@ -9509,7 +9327,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", ] [[package]] @@ -9517,16 +9335,16 @@ name = "pallet-state-trie-migration" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -9534,18 +9352,19 @@ name = "pallet-static-price-provider" version = "0.1.0" dependencies = [ "astar-primitives", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 16.0.0", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -9553,14 +9372,14 @@ name = "pallet-sudo" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -9568,17 +9387,17 @@ name = "pallet-timestamp" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", - "sp-storage 13.0.0", + "sp-inherents", + "sp-io", + "sp-runtime", + "sp-std", + "sp-storage", "sp-timestamp", ] @@ -9587,18 +9406,18 @@ name = "pallet-tips" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "pallet-treasury", "parity-scale-codec", "scale-info", "serde", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -9606,15 +9425,15 @@ name = "pallet-transaction-payment" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "serde", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -9625,12 +9444,12 @@ dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-blockchain", - "sp-core 21.0.0", + "sp-core", "sp-rpc", - "sp-runtime 24.0.0", - "sp-weights 20.0.0", + "sp-runtime", + "sp-weights", ] [[package]] @@ -9640,9 +9459,9 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "pallet-transaction-payment", "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-runtime 24.0.0", - "sp-weights 20.0.0", + "sp-api", + "sp-runtime", + "sp-weights", ] [[package]] @@ -9650,16 +9469,16 @@ name = "pallet-treasury" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "impl-trait-for-tuples", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -9668,9 +9487,9 @@ version = "0.1.0" dependencies = [ "astar-primitives", "ethers", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "hex", "libsecp256k1", "log", @@ -9681,10 +9500,10 @@ dependencies = [ "parity-scale-codec", "precompile-utils", "scale-info", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -9692,15 +9511,15 @@ name = "pallet-utility" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -9708,14 +9527,14 @@ name = "pallet-vesting" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -9723,33 +9542,33 @@ name = "pallet-whitelist" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-api", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-xc-asset-config" version = "1.3.0" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "pallet-balances", "pallet-timestamp", "parity-scale-codec", "scale-info", "serde", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "staging-xcm", ] @@ -9759,17 +9578,17 @@ version = "1.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "bounded-collections", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", "serde", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "staging-xcm", "staging-xcm-executor", ] @@ -9779,15 +9598,15 @@ name = "pallet-xcm-benchmarks" version = "1.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-io", + "sp-runtime", + "sp-std", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -9800,24 +9619,24 @@ dependencies = [ "astar-primitives", "environmental", "fp-evm", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "hex", "log", "pallet-balances", "pallet-contracts", - "pallet-contracts-primitives 24.0.0", + "pallet-contracts-primitives", "pallet-evm", "pallet-insecure-randomness-collective-flip", "pallet-timestamp", "parity-scale-codec", "scale-info", "serde", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -9826,12 +9645,12 @@ version = "0.1.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "cumulus-primitives-core", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -10214,8 +10033,8 @@ dependencies = [ "polkadot-primitives", "rand 0.8.5", "schnellru", - "sp-core 21.0.0", - "sp-keystore 0.27.0", + "sp-core", + "sp-keystore", "thiserror", "tracing-gum", ] @@ -10259,8 +10078,8 @@ dependencies = [ "sc-storage-monitor", "sc-sysinfo", "sc-tracing", - "sp-core 21.0.0", - "sp-io 23.0.0", + "sp-core", + "sp-io", "sp-keyring", "sp-maybe-compressed-blob", "substrate-build-script-utils", @@ -10282,9 +10101,9 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-core 21.0.0", - "sp-keystore 0.27.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-keystore", + "sp-runtime", "thiserror", "tokio-util", "tracing-gum", @@ -10297,9 +10116,9 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "parity-scale-codec", "scale-info", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -10321,8 +10140,8 @@ dependencies = [ "polkadot-primitives", "sc-network", "schnellru", - "sp-application-crypto 23.0.0", - "sp-keystore 0.27.0", + "sp-application-crypto", + "sp-keystore", "thiserror", "tracing-gum", ] @@ -10336,8 +10155,8 @@ dependencies = [ "polkadot-node-primitives", "polkadot-primitives", "reed-solomon-novelpoly", - "sp-core 21.0.0", - "sp-trie 22.0.0", + "sp-core", + "sp-trie", "thiserror", ] @@ -10356,9 +10175,9 @@ dependencies = [ "rand_chacha 0.3.1", "sc-network", "sc-network-common", - "sp-application-crypto 23.0.0", - "sp-core 21.0.0", - "sp-keystore 0.27.0", + "sp-application-crypto", + "sp-core", + "sp-keystore", "tracing-gum", ] @@ -10397,7 +10216,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-core 21.0.0", + "sp-core", "sp-maybe-compressed-blob", "thiserror", "tracing-gum", @@ -10424,10 +10243,10 @@ dependencies = [ "sc-keystore", "schnellru", "schnorrkel 0.9.1", - "sp-application-crypto 23.0.0", + "sp-application-crypto", "sp-consensus", "sp-consensus-slots", - "sp-runtime 24.0.0", + "sp-runtime", "thiserror", "tracing-gum", ] @@ -10468,7 +10287,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-statement-table", - "sp-keystore 0.27.0", + "sp-keystore", "thiserror", "tracing-gum", ] @@ -10482,7 +10301,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-keystore 0.27.0", + "sp-keystore", "thiserror", "tracing-gum", "wasm-timer", @@ -10572,7 +10391,7 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "sp-blockchain", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-inherents", "thiserror", "tracing-gum", ] @@ -10630,9 +10449,9 @@ dependencies = [ "polkadot-primitives", "rand 0.8.5", "slotmap", - "sp-core 21.0.0", + "sp-core", "sp-maybe-compressed-blob", - "sp-wasm-interface 14.0.0", + "sp-wasm-interface", "substrate-build-script-utils", "tempfile", "tokio", @@ -10650,7 +10469,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-overseer", "polkadot-primitives", - "sp-keystore 0.27.0", + "sp-keystore", "thiserror", "tracing-gum", ] @@ -10670,10 +10489,10 @@ dependencies = [ "sc-executor", "sc-executor-common", "sc-executor-wasmtime", - "sp-core 21.0.0", - "sp-externalities 0.19.0", - "sp-io 23.0.0", - "sp-tracing 10.0.0", + "sp-core", + "sp-externalities", + "sp-io", + "sp-tracing", "tokio", "tracing-gum", ] @@ -10693,9 +10512,9 @@ dependencies = [ "sc-executor", "sc-executor-common", "sc-executor-wasmtime", - "sp-io 23.0.0", + "sp-io", "sp-maybe-compressed-blob", - "sp-tracing 10.0.0", + "sp-tracing", "tikv-jemalloc-ctl", "tokio", "tracing-gum", @@ -10729,7 +10548,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-primitives", "sc-network", - "sp-core 21.0.0", + "sp-core", "thiserror", "tokio", ] @@ -10789,12 +10608,12 @@ dependencies = [ "polkadot-primitives", "schnorrkel 0.9.1", "serde", - "sp-application-crypto 23.0.0", + "sp-application-crypto", "sp-consensus-babe", - "sp-core 21.0.0", - "sp-keystore 0.27.0", + "sp-core", + "sp-keystore", "sp-maybe-compressed-blob", - "sp-runtime 24.0.0", + "sp-runtime", "thiserror", "zstd 0.12.4", ] @@ -10826,7 +10645,7 @@ dependencies = [ "sc-network", "sc-transaction-pool-api", "smallvec 1.11.0", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-authority-discovery", "sp-consensus-babe", "substrate-prometheus-endpoint", @@ -10859,9 +10678,9 @@ dependencies = [ "prioritized-metered-channel", "rand 0.8.5", "schnellru", - "sp-application-crypto 23.0.0", - "sp-core 21.0.0", - "sp-keystore 0.27.0", + "sp-application-crypto", + "sp-core", + "sp-keystore", "thiserror", "tracing-gum", ] @@ -10883,8 +10702,8 @@ dependencies = [ "polkadot-primitives", "sc-client-api", "schnellru", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-core 21.0.0", + "sp-api", + "sp-core", "tikv-jemalloc-ctl", "tracing-gum", ] @@ -10896,14 +10715,14 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "bounded-collections", "derive_more", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", "parity-scale-codec", "polkadot-core-primitives", "scale-info", "serde", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -10936,18 +10755,18 @@ dependencies = [ "polkadot-parachain-primitives", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-application-crypto 23.0.0", - "sp-arithmetic 16.0.0", + "sp-api", + "sp-application-crypto", + "sp-arithmetic", "sp-authority-discovery", "sp-consensus-slots", - "sp-core 21.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-io 23.0.0", - "sp-keystore 0.27.0", - "sp-runtime 24.0.0", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-std 8.0.0", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keystore", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -10971,13 +10790,13 @@ dependencies = [ "sc-rpc", "sc-sync-state-rpc", "sc-transaction-pool-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-keystore 0.27.0", - "sp-runtime 24.0.0", + "sp-keystore", + "sp-runtime", "substrate-frame-rpc-system", "substrate-state-trie-migration-rpc", ] @@ -10988,11 +10807,11 @@ version = "1.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "bitvec", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", "frame-election-provider-support", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -11053,25 +10872,25 @@ dependencies = [ "serde", "serde_derive", "smallvec 1.11.0", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-arithmetic 16.0.0", + "sp-api", + "sp-arithmetic", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", "sp-consensus-beefy", - "sp-core 21.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-io 23.0.0", + "sp-core", + "sp-inherents", + "sp-io", "sp-mmr-primitives", "sp-npos-elections", "sp-offchain", - "sp-runtime 24.0.0", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-std 8.0.0", - "sp-storage 13.0.0", + "sp-staking", + "sp-std", + "sp-storage", "sp-transaction-pool", - "sp-version 22.0.0", + "sp-version", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -11085,10 +10904,10 @@ version = "1.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "bitvec", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "libsecp256k1", "log", @@ -11112,15 +10931,15 @@ dependencies = [ "serde", "serde_derive", "slot-range-helper", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-core 21.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-io 23.0.0", + "sp-api", + "sp-core", + "sp-inherents", + "sp-io", "sp-npos-elections", - "sp-runtime 24.0.0", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-std 8.0.0", + "sp-staking", + "sp-std", "staging-xcm", "static_assertions", ] @@ -11130,13 +10949,13 @@ name = "polkadot-runtime-constants" version = "1.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", "polkadot-primitives", "polkadot-runtime-common", "smallvec 1.11.0", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-weights 20.0.0", + "sp-core", + "sp-runtime", + "sp-weights", ] [[package]] @@ -11145,11 +10964,11 @@ version = "1.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "bs58 0.5.0", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", "parity-scale-codec", "polkadot-primitives", - "sp-std 8.0.0", - "sp-tracing 10.0.0", + "sp-std", + "sp-tracing", ] [[package]] @@ -11160,9 +10979,9 @@ dependencies = [ "bitflags 1.3.2", "bitvec", "derive_more", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", + "frame-system", "impl-trait-for-tuples", "log", "pallet-authority-discovery", @@ -11183,16 +11002,16 @@ dependencies = [ "rustc-hex", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-application-crypto 23.0.0", - "sp-core 21.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-io 23.0.0", - "sp-keystore 0.27.0", - "sp-runtime 24.0.0", + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keystore", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-std 8.0.0", + "sp-staking", + "sp-std", "staging-xcm", "staging-xcm-executor", "static_assertions", @@ -11204,10 +11023,10 @@ version = "1.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "async-trait", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", "frame-benchmarking-cli", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "frame-system-rpc-runtime-api", "futures 0.3.28", "hex-literal", @@ -11287,7 +11106,7 @@ dependencies = [ "schnellru", "serde", "serde_json", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-authority-discovery", "sp-block-builder", "sp-blockchain", @@ -11295,21 +11114,21 @@ dependencies = [ "sp-consensus-babe", "sp-consensus-beefy", "sp-consensus-grandpa", - "sp-core 21.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-io 23.0.0", + "sp-core", + "sp-inherents", + "sp-io", "sp-keyring", - "sp-keystore 0.27.0", + "sp-keystore", "sp-mmr-primitives", "sp-offchain", - "sp-runtime 24.0.0", + "sp-runtime", "sp-session", - "sp-state-machine 0.28.0", - "sp-storage 13.0.0", + "sp-state-machine", + "sp-storage", "sp-timestamp", "sp-transaction-pool", - "sp-version 22.0.0", - "sp-weights 20.0.0", + "sp-version", + "sp-weights", "staging-kusama-runtime", "substrate-prometheus-endpoint", "thiserror", @@ -11335,8 +11154,8 @@ dependencies = [ "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-primitives", - "sp-keystore 0.27.0", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-keystore", + "sp-staking", "thiserror", "tracing-gum", ] @@ -11348,7 +11167,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "parity-scale-codec", "polkadot-primitives", - "sp-core 21.0.0", + "sp-core", ] [[package]] @@ -11436,8 +11255,8 @@ dependencies = [ "environmental", "evm", "fp-evm", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "hex", "hex-literal", "impl-trait-for-tuples", @@ -11449,10 +11268,10 @@ dependencies = [ "scale-info", "serde", "similar-asserts", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "staging-xcm", ] @@ -11462,14 +11281,14 @@ version = "0.1.0" dependencies = [ "case", "fp-evm", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", "macrotest", "num_enum 0.5.11", "prettyplease 0.2.15", "proc-macro2", "quote", - "sp-core-hashing 9.0.0", - "sp-std 8.0.0", + "sp-core-hashing", + "sp-std", "syn 1.0.109", "trybuild", ] @@ -11598,17 +11417,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "proc-macro-warning" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e99670bafb56b9a106419397343bdbc8b8742c3cc449fec6345f86173f47cd4" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "proc-macro-warning" version = "0.4.2" @@ -12208,10 +12016,10 @@ version = "1.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "binary-merkle-tree", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -12266,23 +12074,23 @@ dependencies = [ "serde", "serde_derive", "smallvec 1.11.0", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", "sp-consensus-beefy", - "sp-core 21.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-io 23.0.0", + "sp-core", + "sp-inherents", + "sp-io", "sp-mmr-primitives", "sp-offchain", - "sp-runtime 24.0.0", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-std 8.0.0", - "sp-storage 13.0.0", + "sp-staking", + "sp-std", + "sp-storage", "sp-transaction-pool", - "sp-version 22.0.0", + "sp-version", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -12295,13 +12103,13 @@ name = "rococo-runtime-constants" version = "1.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", "polkadot-primitives", "polkadot-runtime-common", "smallvec 1.11.0", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-weights 20.0.0", + "sp-core", + "sp-runtime", + "sp-weights", ] [[package]] @@ -12595,8 +12403,8 @@ version = "4.1.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "log", - "sp-core 21.0.0", - "sp-wasm-interface 14.0.0", + "sp-core", + "sp-wasm-interface", "thiserror", ] @@ -12618,12 +12426,12 @@ dependencies = [ "rand 0.8.5", "sc-client-api", "sc-network", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-authority-discovery", "sp-blockchain", - "sp-core 21.0.0", - "sp-keystore 0.27.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-keystore", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", ] @@ -12642,12 +12450,12 @@ dependencies = [ "sc-proposer-metrics", "sc-telemetry", "sc-transaction-pool-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 21.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-runtime 24.0.0", + "sp-core", + "sp-inherents", + "sp-runtime", "substrate-prometheus-endpoint", ] @@ -12658,12 +12466,12 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "parity-scale-codec", "sc-client-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core 21.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-runtime 24.0.0", + "sp-core", + "sp-inherents", + "sp-runtime", ] [[package]] @@ -12680,9 +12488,9 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-state-machine 0.28.0", + "sp-core", + "sp-runtime", + "sp-state-machine", ] [[package]] @@ -12701,7 +12509,7 @@ name = "sc-cli" version = "0.10.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "chrono", "clap", "fdlimit", @@ -12724,12 +12532,12 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core 21.0.0", + "sp-core", "sp-keyring", - "sp-keystore 0.27.0", - "sp-panic-handler 8.0.0", - "sp-runtime 24.0.0", - "sp-version 22.0.0", + "sp-keystore", + "sp-panic-handler", + "sp-runtime", + "sp-version", "thiserror", "tiny-bip39", "tokio", @@ -12748,16 +12556,16 @@ dependencies = [ "sc-executor", "sc-transaction-pool-api", "sc-utils", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 21.0.0", + "sp-core", "sp-database", - "sp-externalities 0.19.0", - "sp-runtime 24.0.0", - "sp-state-machine 0.28.0", + "sp-externalities", + "sp-runtime", + "sp-state-machine", "sp-statement-store", - "sp-storage 13.0.0", + "sp-storage", "substrate-prometheus-endpoint", ] @@ -12778,13 +12586,13 @@ dependencies = [ "sc-client-api", "sc-state-db", "schnellru", - "sp-arithmetic 16.0.0", + "sp-arithmetic", "sp-blockchain", - "sp-core 21.0.0", + "sp-core", "sp-database", - "sp-runtime 24.0.0", - "sp-state-machine 0.28.0", - "sp-trie 22.0.0", + "sp-runtime", + "sp-state-machine", + "sp-trie", ] [[package]] @@ -12802,12 +12610,12 @@ dependencies = [ "sc-client-api", "sc-utils", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-state-machine 0.28.0", + "sp-core", + "sp-runtime", + "sp-state-machine", "substrate-prometheus-endpoint", "thiserror", ] @@ -12826,17 +12634,17 @@ dependencies = [ "sc-consensus", "sc-consensus-slots", "sc-telemetry", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-application-crypto 23.0.0", + "sp-api", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-aura", "sp-consensus-slots", - "sp-core 21.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-keystore 0.27.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-inherents", + "sp-keystore", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", ] @@ -12862,17 +12670,17 @@ dependencies = [ "sc-telemetry", "sc-transaction-pool-api", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-application-crypto 23.0.0", + "sp-api", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-consensus-slots", - "sp-core 21.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-keystore 0.27.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-inherents", + "sp-keystore", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", ] @@ -12888,14 +12696,14 @@ dependencies = [ "sc-consensus-epochs", "sc-rpc-api", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-application-crypto 23.0.0", + "sp-api", + "sp-application-crypto", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core 21.0.0", - "sp-keystore 0.27.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-keystore", + "sp-runtime", "thiserror", ] @@ -12904,7 +12712,7 @@ name = "sc-consensus-beefy" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "async-channel 1.9.0", "async-trait", "fnv", @@ -12918,16 +12726,16 @@ dependencies = [ "sc-network-gossip", "sc-network-sync", "sc-utils", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-application-crypto 23.0.0", - "sp-arithmetic 16.0.0", + "sp-api", + "sp-application-crypto", + "sp-arithmetic", "sp-blockchain", "sp-consensus", "sp-consensus-beefy", - "sp-core 21.0.0", - "sp-keystore 0.27.0", + "sp-core", + "sp-keystore", "sp-mmr-primitives", - "sp-runtime 24.0.0", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", "wasm-timer", @@ -12947,8 +12755,8 @@ dependencies = [ "sc-rpc", "serde", "sp-consensus-beefy", - "sp-core 21.0.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-runtime", "thiserror", ] @@ -12962,7 +12770,7 @@ dependencies = [ "sc-client-api", "sc-consensus", "sp-blockchain", - "sp-runtime 24.0.0", + "sp-runtime", ] [[package]] @@ -12971,7 +12779,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "ahash 0.8.3", - "array-bytes 6.1.0", + "array-bytes", "async-trait", "dyn-clone", "finality-grandpa", @@ -12993,15 +12801,15 @@ dependencies = [ "sc-transaction-pool-api", "sc-utils", "serde_json", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-application-crypto 23.0.0", - "sp-arithmetic 16.0.0", + "sp-api", + "sp-application-crypto", + "sp-arithmetic", "sp-blockchain", "sp-consensus", "sp-consensus-grandpa", - "sp-core 21.0.0", - "sp-keystore 0.27.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-keystore", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", ] @@ -13021,8 +12829,8 @@ dependencies = [ "sc-rpc", "serde", "sp-blockchain", - "sp-core 21.0.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-runtime", "thiserror", ] @@ -13039,14 +12847,14 @@ dependencies = [ "sc-client-api", "sc-consensus", "sc-telemetry", - "sp-arithmetic 16.0.0", + "sp-arithmetic", "sp-blockchain", "sp-consensus", "sp-consensus-slots", - "sp-core 21.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-runtime 24.0.0", - "sp-state-machine 0.28.0", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-state-machine", ] [[package]] @@ -13059,15 +12867,15 @@ dependencies = [ "sc-executor-common", "sc-executor-wasmtime", "schnellru", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-core 21.0.0", - "sp-externalities 0.19.0", - "sp-io 23.0.0", - "sp-panic-handler 8.0.0", - "sp-runtime-interface 17.0.0", - "sp-trie 22.0.0", - "sp-version 22.0.0", - "sp-wasm-interface 14.0.0", + "sp-api", + "sp-core", + "sp-externalities", + "sp-io", + "sp-panic-handler", + "sp-runtime-interface", + "sp-trie", + "sp-version", + "sp-wasm-interface", "tracing", ] @@ -13078,7 +12886,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", - "sp-wasm-interface 14.0.0", + "sp-wasm-interface", "thiserror", "wasm-instrument 0.3.0", ] @@ -13095,8 +12903,8 @@ dependencies = [ "rustix 0.36.15", "sc-allocator", "sc-executor-common", - "sp-runtime-interface 17.0.0", - "sp-wasm-interface 14.0.0", + "sp-runtime-interface", + "sp-wasm-interface", "wasmtime", ] @@ -13113,7 +12921,7 @@ dependencies = [ "sc-network", "sc-network-common", "sp-blockchain", - "sp-runtime 24.0.0", + "sp-runtime", ] [[package]] @@ -13121,12 +12929,12 @@ name = "sc-keystore" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "parking_lot 0.12.1", "serde_json", - "sp-application-crypto 23.0.0", - "sp-core 21.0.0", - "sp-keystore 0.27.0", + "sp-application-crypto", + "sp-core", + "sp-keystore", "thiserror", ] @@ -13135,7 +12943,7 @@ name = "sc-network" version = "0.10.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "async-channel 1.9.0", "async-trait", "asynchronous-codec", @@ -13160,10 +12968,10 @@ dependencies = [ "serde", "serde_json", "smallvec 1.11.0", - "sp-arithmetic 16.0.0", + "sp-arithmetic", "sp-blockchain", - "sp-core 21.0.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", "unsigned-varint", @@ -13186,7 +12994,7 @@ dependencies = [ "sc-client-api", "sc-network", "sp-blockchain", - "sp-runtime 24.0.0", + "sp-runtime", "thiserror", "unsigned-varint", ] @@ -13205,7 +13013,7 @@ dependencies = [ "sc-consensus", "sp-consensus", "sp-consensus-grandpa", - "sp-runtime 24.0.0", + "sp-runtime", ] [[package]] @@ -13221,7 +13029,7 @@ dependencies = [ "sc-network", "sc-network-common", "schnellru", - "sp-runtime 24.0.0", + "sp-runtime", "substrate-prometheus-endpoint", "tracing", ] @@ -13231,7 +13039,7 @@ name = "sc-network-light" version = "0.10.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "async-channel 1.9.0", "futures 0.3.28", "libp2p-identity", @@ -13242,8 +13050,8 @@ dependencies = [ "sc-client-api", "sc-network", "sp-blockchain", - "sp-core 21.0.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-runtime", "thiserror", ] @@ -13252,7 +13060,7 @@ name = "sc-network-sync" version = "0.10.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "async-channel 1.9.0", "async-trait", "fork-tree", @@ -13271,12 +13079,12 @@ dependencies = [ "sc-utils", "schnellru", "smallvec 1.11.0", - "sp-arithmetic 16.0.0", + "sp-arithmetic", "sp-blockchain", "sp-consensus", "sp-consensus-grandpa", - "sp-core 21.0.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", ] @@ -13286,7 +13094,7 @@ name = "sc-network-transactions" version = "0.10.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "futures 0.3.28", "libp2p", "log", @@ -13295,7 +13103,7 @@ dependencies = [ "sc-network-common", "sc-utils", "sp-consensus", - "sp-runtime 24.0.0", + "sp-runtime", "substrate-prometheus-endpoint", ] @@ -13304,7 +13112,7 @@ name = "sc-offchain" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "bytes", "fnv", "futures 0.3.28", @@ -13323,12 +13131,12 @@ dependencies = [ "sc-network-common", "sc-transaction-pool-api", "sc-utils", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-core 21.0.0", - "sp-externalities 0.19.0", - "sp-keystore 0.27.0", + "sp-api", + "sp-core", + "sp-externalities", + "sp-keystore", "sp-offchain", - "sp-runtime 24.0.0", + "sp-runtime", "threadpool", "tracing", ] @@ -13360,16 +13168,16 @@ dependencies = [ "sc-transaction-pool-api", "sc-utils", "serde_json", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-blockchain", - "sp-core 21.0.0", - "sp-keystore 0.27.0", + "sp-core", + "sp-keystore", "sp-offchain", "sp-rpc", - "sp-runtime 24.0.0", + "sp-runtime", "sp-session", "sp-statement-store", - "sp-version 22.0.0", + "sp-version", "tokio", ] @@ -13385,10 +13193,10 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-core 21.0.0", + "sp-core", "sp-rpc", - "sp-runtime 24.0.0", - "sp-version 22.0.0", + "sp-runtime", + "sp-version", "thiserror", ] @@ -13412,7 +13220,7 @@ name = "sc-rpc-spec-v2" version = "0.10.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "futures 0.3.28", "futures-util", "hex", @@ -13425,11 +13233,11 @@ dependencies = [ "sc-transaction-pool-api", "sc-utils", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-blockchain", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-version 22.0.0", + "sp-core", + "sp-runtime", + "sp-version", "thiserror", "tokio", "tokio-stream", @@ -13476,20 +13284,20 @@ dependencies = [ "sc-utils", "serde", "serde_json", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 21.0.0", - "sp-externalities 0.19.0", - "sp-keystore 0.27.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-externalities", + "sp-keystore", + "sp-runtime", "sp-session", - "sp-state-machine 0.28.0", - "sp-storage 13.0.0", + "sp-state-machine", + "sp-storage", "sp-transaction-pool", "sp-transaction-storage-proof", - "sp-trie 22.0.0", - "sp-version 22.0.0", + "sp-trie", + "sp-version", "static_init 1.0.3", "substrate-prometheus-endpoint", "tempfile", @@ -13507,7 +13315,7 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.1", - "sp-core 21.0.0", + "sp-core", ] [[package]] @@ -13519,7 +13327,7 @@ dependencies = [ "fs4", "log", "sc-client-db", - "sp-core 21.0.0", + "sp-core", "thiserror", "tokio", ] @@ -13539,7 +13347,7 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-runtime 24.0.0", + "sp-runtime", "thiserror", ] @@ -13557,9 +13365,9 @@ dependencies = [ "sc-telemetry", "serde", "serde_json", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-io", + "sp-std", ] [[package]] @@ -13598,12 +13406,12 @@ dependencies = [ "sc-client-api", "sc-tracing-proc-macro", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-blockchain", - "sp-core 21.0.0", + "sp-core", "sp-rpc", - "sp-runtime 24.0.0", - "sp-tracing 10.0.0", + "sp-runtime", + "sp-tracing", "thiserror", "tracing", "tracing-log", @@ -13637,11 +13445,11 @@ dependencies = [ "sc-transaction-pool-api", "sc-utils", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-blockchain", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-tracing 10.0.0", + "sp-core", + "sp-runtime", + "sp-tracing", "sp-transaction-pool", "substrate-prometheus-endpoint", "thiserror", @@ -13658,8 +13466,8 @@ dependencies = [ "parity-scale-codec", "serde", "sp-blockchain", - "sp-core 21.0.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-runtime", "thiserror", ] @@ -13675,7 +13483,7 @@ dependencies = [ "log", "parking_lot 0.12.1", "prometheus", - "sp-arithmetic 16.0.0", + "sp-arithmetic", ] [[package]] @@ -14083,7 +13891,7 @@ dependencies = [ name = "shibuya-runtime" version = "5.29.0" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "astar-primitives", "astar-xcm-benchmarks", "cumulus-pallet-aura-ext", @@ -14097,10 +13905,10 @@ dependencies = [ "dapp-staking-v3-runtime-api", "fp-rpc", "fp-self-contained", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -14122,7 +13930,7 @@ dependencies = [ "pallet-collator-selection", "pallet-collective", "pallet-contracts", - "pallet-contracts-primitives 24.0.0", + "pallet-contracts-primitives", "pallet-dapp-staking-v3", "pallet-democracy", "pallet-dynamic-evm-base-fee", @@ -14173,20 +13981,20 @@ dependencies = [ "precompile-utils", "scale-info", "smallvec 1.11.0", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-arithmetic 16.0.0", + "sp-api", + "sp-arithmetic", "sp-block-builder", "sp-consensus-aura", - "sp-core 21.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-io 23.0.0", + "sp-core", + "sp-inherents", + "sp-io", "sp-offchain", - "sp-runtime 24.0.0", - "sp-runtime-interface 17.0.0", + "sp-runtime", + "sp-runtime-interface", "sp-session", - "sp-std 8.0.0", + "sp-std", "sp-transaction-pool", - "sp-version 22.0.0", + "sp-version", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -14197,7 +14005,7 @@ dependencies = [ name = "shiden-runtime" version = "5.29.0" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "astar-primitives", "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", @@ -14209,10 +14017,10 @@ dependencies = [ "cumulus-primitives-utility", "fp-rpc", "fp-self-contained", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -14232,7 +14040,7 @@ dependencies = [ "pallet-collator-selection", "pallet-collective", "pallet-contracts", - "pallet-contracts-primitives 24.0.0", + "pallet-contracts-primitives", "pallet-dapps-staking", "pallet-dynamic-evm-base-fee", "pallet-ethereum", @@ -14270,19 +14078,19 @@ dependencies = [ "precompile-utils", "scale-info", "smallvec 1.11.0", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-block-builder", "sp-consensus-aura", - "sp-core 21.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-io 23.0.0", + "sp-core", + "sp-inherents", + "sp-io", "sp-offchain", - "sp-runtime 24.0.0", - "sp-runtime-interface 17.0.0", + "sp-runtime", + "sp-runtime-interface", "sp-session", - "sp-std 8.0.0", + "sp-std", "sp-transaction-pool", - "sp-version 22.0.0", + "sp-version", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -14410,8 +14218,8 @@ dependencies = [ "enumn", "parity-scale-codec", "paste", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -14504,7 +14312,7 @@ dependencies = [ "smallvec 1.11.0", "soketto", "twox-hash", - "wasmi 0.31.1", + "wasmi", "x25519-dalek 2.0.0", "zeroize", ] @@ -14605,26 +14413,6 @@ dependencies = [ "sha-1", ] -[[package]] -name = "sp-api" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "hash-db 0.16.0", - "log", - "parity-scale-codec", - "scale-info", - "sp-api-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", - "sp-core 7.0.0", - "sp-metadata-ir 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43)", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", - "sp-std 5.0.0", - "sp-trie 7.0.0", - "sp-version 5.0.0", - "thiserror", -] - [[package]] name = "sp-api" version = "4.0.0-dev" @@ -14634,32 +14422,18 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-api-proc-macro 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-core 21.0.0", - "sp-externalities 0.19.0", - "sp-metadata-ir 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-runtime 24.0.0", - "sp-state-machine 0.28.0", - "sp-std 8.0.0", - "sp-trie 22.0.0", - "sp-version 22.0.0", + "sp-api-proc-macro", + "sp-core", + "sp-externalities", + "sp-metadata-ir", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", + "sp-version", "thiserror", ] -[[package]] -name = "sp-api-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "Inflector", - "blake2", - "expander 1.0.0", - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" @@ -14674,19 +14448,6 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "sp-application-crypto" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-std 5.0.0", -] - [[package]] name = "sp-application-crypto" version = "23.0.0" @@ -14695,23 +14456,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-std 8.0.0", -] - -[[package]] -name = "sp-arithmetic" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "integer-sqrt", - "num-traits", - "parity-scale-codec", - "scale-info", - "serde", - "sp-std 5.0.0", - "static_assertions", + "sp-core", + "sp-io", + "sp-std", ] [[package]] @@ -14724,7 +14471,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-std 8.0.0", + "sp-std", "static_assertions", ] @@ -14735,10 +14482,10 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "parity-scale-codec", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-application-crypto 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-api", + "sp-application-crypto", + "sp-runtime", + "sp-std", ] [[package]] @@ -14746,10 +14493,10 @@ name = "sp-block-builder" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-api", + "sp-inherents", + "sp-runtime", + "sp-std", ] [[package]] @@ -14762,11 +14509,11 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "schnellru", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-consensus", "sp-database", - "sp-runtime 24.0.0", - "sp-state-machine 0.28.0", + "sp-runtime", + "sp-state-machine", "thiserror", ] @@ -14778,10 +14525,10 @@ dependencies = [ "async-trait", "futures 0.3.28", "log", - "sp-core 21.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-runtime 24.0.0", - "sp-state-machine 0.28.0", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-state-machine", "thiserror", ] @@ -14793,12 +14540,12 @@ dependencies = [ "async-trait", "parity-scale-codec", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-application-crypto 23.0.0", + "sp-api", + "sp-application-crypto", "sp-consensus-slots", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-inherents", + "sp-runtime", + "sp-std", "sp-timestamp", ] @@ -14811,13 +14558,13 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-application-crypto 23.0.0", + "sp-api", + "sp-application-crypto", "sp-consensus-slots", - "sp-core 21.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-std", "sp-timestamp", ] @@ -14830,13 +14577,13 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-application-crypto 23.0.0", - "sp-core 21.0.0", - "sp-io 23.0.0", + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-io", "sp-mmr-primitives", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-runtime", + "sp-std", "strum 0.24.1", ] @@ -14850,12 +14597,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-application-crypto 23.0.0", - "sp-core 21.0.0", - "sp-keystore 0.27.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-keystore", + "sp-runtime", + "sp-std", ] [[package]] @@ -14866,60 +14613,16 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-std 8.0.0", + "sp-std", "sp-timestamp", ] -[[package]] -name = "sp-core" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "array-bytes 4.2.0", - "bitflags 1.3.2", - "blake2", - "bounded-collections", - "bs58 0.4.0", - "dyn-clonable", - "ed25519-zebra 3.1.0", - "futures 0.3.28", - "hash-db 0.16.0", - "hash256-std-hasher", - "impl-serde", - "lazy_static", - "libsecp256k1", - "log", - "merlin 2.0.1", - "parity-scale-codec", - "parking_lot 0.12.1", - "paste", - "primitive-types", - "rand 0.8.5", - "regex", - "scale-info", - "schnorrkel 0.9.1", - "secp256k1", - "secrecy", - "serde", - "sp-core-hashing 5.0.0", - "sp-debug-derive 5.0.0", - "sp-externalities 0.13.0", - "sp-runtime-interface 7.0.0", - "sp-std 5.0.0", - "sp-storage 7.0.0", - "ss58-registry", - "substrate-bip39", - "thiserror", - "tiny-bip39", - "zeroize", -] - [[package]] name = "sp-core" version = "21.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "array-bytes 6.1.0", + "array-bytes", "arrayvec 0.7.4", "bandersnatch_vrfs", "bitflags 1.3.2", @@ -14947,12 +14650,12 @@ dependencies = [ "secp256k1", "secrecy", "serde", - "sp-core-hashing 9.0.0", - "sp-debug-derive 8.0.0", - "sp-externalities 0.19.0", - "sp-runtime-interface 17.0.0", - "sp-std 8.0.0", - "sp-storage 13.0.0", + "sp-core-hashing", + "sp-debug-derive", + "sp-externalities", + "sp-runtime-interface", + "sp-std", + "sp-storage", "ss58-registry", "substrate-bip39", "thiserror", @@ -14961,20 +14664,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "sp-core-hashing" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "blake2b_simd", - "byteorder", - "digest 0.10.7", - "sha2 0.10.7", - "sha3", - "sp-std 5.0.0", - "twox-hash", -] - [[package]] name = "sp-core-hashing" version = "9.0.0" @@ -14988,24 +14677,13 @@ dependencies = [ "twox-hash", ] -[[package]] -name = "sp-core-hashing-proc-macro" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "proc-macro2", - "quote", - "sp-core-hashing 5.0.0", - "syn 2.0.48", -] - [[package]] name = "sp-core-hashing-proc-macro" version = "9.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "quote", - "sp-core-hashing 9.0.0", + "sp-core-hashing", "syn 2.0.48", ] @@ -15018,16 +14696,6 @@ dependencies = [ "parking_lot 0.12.1", ] -[[package]] -name = "sp-debug-derive" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "sp-debug-derive" version = "8.0.0" @@ -15038,17 +14706,6 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "sp-externalities" -version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "environmental", - "parity-scale-codec", - "sp-std 5.0.0", - "sp-storage 7.0.0", -] - [[package]] name = "sp-externalities" version = "0.19.0" @@ -15056,8 +14713,8 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "environmental", "parity-scale-codec", - "sp-std 8.0.0", - "sp-storage 13.0.0", + "sp-std", + "sp-storage", ] [[package]] @@ -15066,24 +14723,9 @@ version = "0.1.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "serde_json", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-runtime 24.0.0", - "sp-std 8.0.0", -] - -[[package]] -name = "sp-inherents" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "async-trait", - "impl-trait-for-tuples", - "parity-scale-codec", - "scale-info", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", - "thiserror", + "sp-api", + "sp-runtime", + "sp-std", ] [[package]] @@ -15095,57 +14737,31 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-runtime", + "sp-std", "thiserror", ] -[[package]] -name = "sp-io" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "bytes", - "ed25519 1.5.3", - "ed25519-dalek 1.0.1", - "futures 0.3.28", - "libsecp256k1", - "log", - "parity-scale-codec", - "rustversion", - "secp256k1", - "sp-core 7.0.0", - "sp-externalities 0.13.0", - "sp-keystore 0.13.0", - "sp-runtime-interface 7.0.0", - "sp-state-machine 0.13.0", - "sp-std 5.0.0", - "sp-tracing 6.0.0", - "sp-trie 7.0.0", - "tracing", - "tracing-core", -] - [[package]] name = "sp-io" version = "23.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "bytes", - "ed25519-dalek 2.1.0", + "ed25519-dalek", "libsecp256k1", "log", "parity-scale-codec", "rustversion", "secp256k1", - "sp-core 21.0.0", - "sp-externalities 0.19.0", - "sp-keystore 0.27.0", - "sp-runtime-interface 17.0.0", - "sp-state-machine 0.28.0", - "sp-std 8.0.0", - "sp-tracing 10.0.0", - "sp-trie 22.0.0", + "sp-core", + "sp-externalities", + "sp-keystore", + "sp-runtime-interface", + "sp-state-machine", + "sp-std", + "sp-tracing", + "sp-trie", "tracing", "tracing-core", ] @@ -15156,24 +14772,11 @@ version = "24.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "lazy_static", - "sp-core 21.0.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-runtime", "strum 0.24.1", ] -[[package]] -name = "sp-keystore" -version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "futures 0.3.28", - "parity-scale-codec", - "parking_lot 0.12.1", - "sp-core 7.0.0", - "sp-externalities 0.13.0", - "thiserror", -] - [[package]] name = "sp-keystore" version = "0.27.0" @@ -15181,8 +14784,8 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", - "sp-core 21.0.0", - "sp-externalities 0.19.0", + "sp-core", + "sp-externalities", "thiserror", ] @@ -15195,26 +14798,15 @@ dependencies = [ "zstd 0.12.4", ] -[[package]] -name = "sp-metadata-ir" -version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "frame-metadata 15.1.0", - "parity-scale-codec", - "scale-info", - "sp-std 5.0.0", -] - [[package]] name = "sp-metadata-ir" version = "0.1.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-metadata 16.0.0", + "frame-metadata", "parity-scale-codec", "scale-info", - "sp-std 8.0.0", + "sp-std", ] [[package]] @@ -15227,11 +14819,11 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-core 21.0.0", - "sp-debug-derive 8.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-api", + "sp-core", + "sp-debug-derive", + "sp-runtime", + "sp-std", "thiserror", ] @@ -15243,10 +14835,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 16.0.0", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-arithmetic", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -15254,19 +14846,9 @@ name = "sp-offchain" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-core 21.0.0", - "sp-runtime 24.0.0", -] - -[[package]] -name = "sp-panic-handler" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "backtrace", - "lazy_static", - "regex", + "sp-api", + "sp-core", + "sp-runtime", ] [[package]] @@ -15286,29 +14868,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "rustc-hash", "serde", - "sp-core 21.0.0", -] - -[[package]] -name = "sp-runtime" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "either", - "hash256-std-hasher", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "paste", - "rand 0.8.5", - "scale-info", - "serde", - "sp-application-crypto 7.0.0", - "sp-arithmetic 6.0.0", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-std 5.0.0", - "sp-weights 4.0.0", + "sp-core", ] [[package]] @@ -15325,30 +14885,12 @@ dependencies = [ "rand 0.8.5", "scale-info", "serde", - "sp-application-crypto 23.0.0", - "sp-arithmetic 16.0.0", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-std 8.0.0", - "sp-weights 20.0.0", -] - -[[package]] -name = "sp-runtime-interface" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "bytes", - "impl-trait-for-tuples", - "parity-scale-codec", - "primitive-types", - "sp-externalities 0.13.0", - "sp-runtime-interface-proc-macro 6.0.0", - "sp-std 5.0.0", - "sp-storage 7.0.0", - "sp-tracing 6.0.0", - "sp-wasm-interface 7.0.0", - "static_assertions", + "sp-application-crypto", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-std", + "sp-weights", ] [[package]] @@ -15360,27 +14902,15 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", - "sp-externalities 0.19.0", - "sp-runtime-interface-proc-macro 11.0.0", - "sp-std 8.0.0", - "sp-storage 13.0.0", - "sp-tracing 10.0.0", - "sp-wasm-interface 14.0.0", + "sp-externalities", + "sp-runtime-interface-proc-macro", + "sp-std", + "sp-storage", + "sp-tracing", + "sp-wasm-interface", "static_assertions", ] -[[package]] -name = "sp-runtime-interface-proc-macro" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "Inflector", - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "sp-runtime-interface-proc-macro" version = "11.0.0" @@ -15400,25 +14930,12 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "parity-scale-codec", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-core 21.0.0", - "sp-keystore 0.27.0", - "sp-runtime 24.0.0", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-std 8.0.0", -] - -[[package]] -name = "sp-staking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-api", + "sp-core", + "sp-keystore", + "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] @@ -15430,29 +14947,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", -] - -[[package]] -name = "sp-state-machine" -version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "hash-db 0.16.0", - "log", - "parity-scale-codec", - "parking_lot 0.12.1", - "rand 0.8.5", - "smallvec 1.11.0", - "sp-core 7.0.0", - "sp-externalities 0.13.0", - "sp-panic-handler 5.0.0", - "sp-std 5.0.0", - "sp-trie 7.0.0", - "thiserror", - "tracing", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -15466,11 +14963,11 @@ dependencies = [ "parking_lot 0.12.1", "rand 0.8.5", "smallvec 1.11.0", - "sp-core 21.0.0", - "sp-externalities 0.19.0", - "sp-panic-handler 8.0.0", - "sp-std 8.0.0", - "sp-trie 22.0.0", + "sp-core", + "sp-externalities", + "sp-panic-handler", + "sp-std", + "sp-trie", "thiserror", "tracing", "trie-db", @@ -15483,46 +14980,28 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "aes-gcm 0.10.2", "curve25519-dalek 4.1.1", - "ed25519-dalek 2.1.0", + "ed25519-dalek", "hkdf", "parity-scale-codec", "rand 0.8.5", "scale-info", "sha2 0.10.7", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-application-crypto 23.0.0", - "sp-core 21.0.0", - "sp-externalities 0.19.0", - "sp-runtime 24.0.0", - "sp-runtime-interface 17.0.0", - "sp-std 8.0.0", + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-externalities", + "sp-runtime", + "sp-runtime-interface", + "sp-std", "thiserror", "x25519-dalek 2.0.0", ] -[[package]] -name = "sp-std" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" - [[package]] name = "sp-std" version = "8.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" -[[package]] -name = "sp-storage" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "ref-cast", - "serde", - "sp-debug-derive 5.0.0", - "sp-std 5.0.0", -] - [[package]] name = "sp-storage" version = "13.0.0" @@ -15532,8 +15011,8 @@ dependencies = [ "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 8.0.0", - "sp-std 8.0.0", + "sp-debug-derive", + "sp-std", ] [[package]] @@ -15543,31 +15022,19 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "async-trait", "parity-scale-codec", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-inherents", + "sp-runtime", + "sp-std", "thiserror", ] -[[package]] -name = "sp-tracing" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "parity-scale-codec", - "sp-std 5.0.0", - "tracing", - "tracing-core", - "tracing-subscriber", -] - [[package]] name = "sp-tracing" version = "10.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "parity-scale-codec", - "sp-std 8.0.0", + "sp-std", "tracing", "tracing-core", "tracing-subscriber", @@ -15578,8 +15045,8 @@ name = "sp-transaction-pool" version = "4.0.0-dev" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-runtime 24.0.0", + "sp-api", + "sp-runtime", ] [[package]] @@ -15590,34 +15057,11 @@ dependencies = [ "async-trait", "parity-scale-codec", "scale-info", - "sp-core 21.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-runtime 24.0.0", - "sp-std 8.0.0", - "sp-trie 22.0.0", -] - -[[package]] -name = "sp-trie" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "ahash 0.8.3", - "hash-db 0.16.0", - "hashbrown 0.13.2", - "lazy_static", - "memory-db", - "nohash-hasher", - "parity-scale-codec", - "parking_lot 0.12.1", - "scale-info", - "schnellru", - "sp-core 7.0.0", - "sp-std 5.0.0", - "thiserror", - "tracing", - "trie-db", - "trie-root", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-std", + "sp-trie", ] [[package]] @@ -15635,31 +15079,14 @@ dependencies = [ "parking_lot 0.12.1", "scale-info", "schnellru", - "sp-core 21.0.0", - "sp-std 8.0.0", + "sp-core", + "sp-std", "thiserror", "tracing", "trie-db", "trie-root", ] -[[package]] -name = "sp-version" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "parity-wasm", - "scale-info", - "serde", - "sp-core-hashing-proc-macro 5.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", - "sp-version-proc-macro 4.0.0-dev", - "thiserror", -] - [[package]] name = "sp-version" version = "22.0.0" @@ -15670,24 +15097,13 @@ dependencies = [ "parity-wasm", "scale-info", "serde", - "sp-core-hashing-proc-macro 9.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", - "sp-version-proc-macro 8.0.0", + "sp-core-hashing-proc-macro", + "sp-runtime", + "sp-std", + "sp-version-proc-macro", "thiserror", ] -[[package]] -name = "sp-version-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "parity-scale-codec", - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "sp-version-proc-macro" version = "8.0.0" @@ -15699,20 +15115,6 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "sp-wasm-interface" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "anyhow", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "sp-std 5.0.0", - "wasmi 0.13.2", - "wasmtime", -] - [[package]] name = "sp-wasm-interface" version = "14.0.0" @@ -15722,25 +15124,10 @@ dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std 8.0.0", + "sp-std", "wasmtime", ] -[[package]] -name = "sp-weights" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "smallvec 1.11.0", - "sp-arithmetic 6.0.0", - "sp-core 7.0.0", - "sp-debug-derive 5.0.0", - "sp-std 5.0.0", -] - [[package]] name = "sp-weights" version = "20.0.0" @@ -15750,10 +15137,10 @@ dependencies = [ "scale-info", "serde", "smallvec 1.11.0", - "sp-arithmetic 16.0.0", - "sp-core 21.0.0", - "sp-debug-derive 8.0.0", - "sp-std 8.0.0", + "sp-arithmetic", + "sp-core", + "sp-debug-derive", + "sp-std", ] [[package]] @@ -15827,11 +15214,11 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "binary-merkle-tree", "bitvec", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", "frame-election-provider-support", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -15899,26 +15286,26 @@ dependencies = [ "serde", "serde_derive", "smallvec 1.11.0", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-application-crypto 23.0.0", - "sp-arithmetic 16.0.0", + "sp-api", + "sp-application-crypto", + "sp-arithmetic", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", "sp-consensus-beefy", - "sp-core 21.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-io 23.0.0", + "sp-core", + "sp-inherents", + "sp-io", "sp-mmr-primitives", "sp-npos-elections", "sp-offchain", - "sp-runtime 24.0.0", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-std 8.0.0", - "sp-storage 13.0.0", + "sp-staking", + "sp-std", + "sp-storage", "sp-transaction-pool", - "sp-version 22.0.0", + "sp-version", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -15939,7 +15326,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-weights 20.0.0", + "sp-weights", "xcm-procedural", ] @@ -15948,19 +15335,19 @@ name = "staging-xcm-builder" version = "1.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "log", "pallet-transaction-payment", "parity-scale-codec", "polkadot-parachain-primitives", "scale-info", - "sp-arithmetic 16.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", - "sp-weights 20.0.0", + "sp-arithmetic", + "sp-io", + "sp-runtime", + "sp-std", + "sp-weights", "staging-xcm", "staging-xcm-executor", ] @@ -15971,17 +15358,17 @@ version = "1.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ "environmental", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", + "frame-support", "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-arithmetic 16.0.0", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", - "sp-weights 20.0.0", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-weights", "staging-xcm", ] @@ -16156,11 +15543,11 @@ dependencies = [ "parity-scale-codec", "sc-rpc-api", "sc-transaction-pool-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core 21.0.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-runtime", ] [[package]] @@ -16185,7 +15572,7 @@ dependencies = [ "log", "sc-rpc-api", "serde", - "sp-runtime 24.0.0", + "sp-runtime", ] [[package]] @@ -16198,10 +15585,10 @@ dependencies = [ "sc-client-api", "sc-rpc-api", "serde", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-state-machine 0.28.0", - "sp-trie 22.0.0", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-trie", "trie-db", ] @@ -16917,22 +16304,22 @@ dependencies = [ "sc-executor", "serde", "serde_json", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "sp-api", "sp-consensus-aura", "sp-consensus-babe", - "sp-core 21.0.0", - "sp-debug-derive 8.0.0", - "sp-externalities 0.19.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-io 23.0.0", - "sp-keystore 0.27.0", + "sp-core", + "sp-debug-derive", + "sp-externalities", + "sp-inherents", + "sp-io", + "sp-keystore", "sp-rpc", - "sp-runtime 24.0.0", - "sp-state-machine 0.28.0", + "sp-runtime", + "sp-state-machine", "sp-timestamp", "sp-transaction-storage-proof", - "sp-version 22.0.0", - "sp-weights 20.0.0", + "sp-version", + "sp-weights", "substrate-rpc-client", "zstd 0.12.4", ] @@ -17059,8 +16446,8 @@ dependencies = [ "num_enum 0.5.11", "parity-scale-codec", "scale-info", - "sp-core 21.0.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-runtime", ] [[package]] @@ -17352,29 +16739,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wasmi" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c326c93fbf86419608361a2c925a31754cf109da1b8b55737070b4d6669422" -dependencies = [ - "parity-wasm", - "wasmi-validation", - "wasmi_core 0.2.1", -] - -[[package]] -name = "wasmi" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e61a7006b0fdf24f6bbe8dcfdad5ca1b350de80061fb2827f31c82fbbb9565a" -dependencies = [ - "spin 0.9.8", - "wasmi_arena", - "wasmi_core 0.12.0", - "wasmparser-nostd", -] - [[package]] name = "wasmi" version = "0.31.1" @@ -17384,50 +16748,16 @@ dependencies = [ "smallvec 1.11.0", "spin 0.9.8", "wasmi_arena", - "wasmi_core 0.13.0", + "wasmi_core", "wasmparser-nostd", ] -[[package]] -name = "wasmi-validation" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b" -dependencies = [ - "parity-wasm", -] - [[package]] name = "wasmi_arena" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "401c1f35e413fac1846d4843745589d9ec678977ab35a384db8ae7830525d468" -[[package]] -name = "wasmi_core" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7" -dependencies = [ - "downcast-rs", - "libm", - "memory_units", - "num-rational", - "num-traits", -] - -[[package]] -name = "wasmi_core" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624e6333e861ef49095d2d678b76ebf30b06bf37effca845be7e5b87c90071b7" -dependencies = [ - "downcast-rs", - "libm", - "num-traits", - "paste", -] - [[package]] name = "wasmi_core" version = "0.13.0" @@ -17915,11 +17245,11 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "binary-merkle-tree", "bitvec", - "frame-benchmarking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-benchmarking", "frame-election-provider-support", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", @@ -17981,25 +17311,25 @@ dependencies = [ "serde", "serde_derive", "smallvec 1.11.0", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-application-crypto 23.0.0", + "sp-api", + "sp-application-crypto", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", "sp-consensus-beefy", - "sp-core 21.0.0", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-io 23.0.0", + "sp-core", + "sp-inherents", + "sp-io", "sp-mmr-primitives", "sp-npos-elections", "sp-offchain", - "sp-runtime 24.0.0", + "sp-runtime", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "sp-std 8.0.0", - "sp-storage 13.0.0", + "sp-staking", + "sp-std", + "sp-storage", "sp-transaction-pool", - "sp-version 22.0.0", + "sp-version", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -18012,13 +17342,13 @@ name = "westend-runtime-constants" version = "1.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", "polkadot-primitives", "polkadot-runtime-common", "smallvec 1.11.0", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-weights 20.0.0", + "sp-core", + "sp-runtime", + "sp-weights", ] [[package]] @@ -18461,14 +17791,14 @@ name = "xcm-simulator" version = "1.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", "parity-scale-codec", "paste", "polkadot-core-primitives", "polkadot-parachain-primitives", "polkadot-runtime-parachains", - "sp-io 23.0.0", - "sp-std 8.0.0", + "sp-io", + "sp-std", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -18481,8 +17811,8 @@ dependencies = [ "astar-primitives", "astar-test-utils", "cumulus-pallet-xcm", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0)", + "frame-support", + "frame-system", "log", "orml-traits", "orml-xcm-support", @@ -18490,7 +17820,7 @@ dependencies = [ "pallet-assets", "pallet-balances", "pallet-contracts", - "pallet-contracts-primitives 24.0.0", + "pallet-contracts-primitives", "pallet-dapps-staking", "pallet-insecure-randomness-collective-flip", "pallet-message-queue", @@ -18506,11 +17836,11 @@ dependencies = [ "polkadot-runtime-parachains", "scale-info", "smallvec 1.11.0", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0", - "sp-tracing 10.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-tracing", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -18527,8 +17857,8 @@ dependencies = [ "hex", "polkadot-parachain-primitives", "polkadot-primitives", - "sp-core 21.0.0", - "sp-runtime 24.0.0", + "sp-core", + "sp-runtime", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -18542,8 +17872,8 @@ dependencies = [ "astar-primitives", "parity-scale-codec", "scale-info", - "sp-runtime 24.0.0", - "sp-std 8.0.0", + "sp-runtime", + "sp-std", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 56711b23f7..9f61bfd0ba 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,10 +41,6 @@ exclude = ["vendor"] # Astar runtime requires unwinding. panic = "unwind" -[patch."https://github.com/paritytech/polkadot-sdk"] -pallet-contracts = { git = "https://github.com/AstarNetwork/substrate", branch = "astar-polkadot-v0.9.43" } -pallet-contracts-primitives = { git = "https://github.com/AstarNetwork/substrate", branch = "astar-polkadot-v0.9.43" } - [workspace.package] authors = ["Stake Technologies "] edition = "2021" diff --git a/chain-extensions/pallet-assets/Cargo.toml b/chain-extensions/pallet-assets/Cargo.toml index 0bd86ecf95..fac4c51fc0 100644 --- a/chain-extensions/pallet-assets/Cargo.toml +++ b/chain-extensions/pallet-assets/Cargo.toml @@ -20,6 +20,7 @@ pallet-contracts-primitives = { workspace = true } parity-scale-codec = { workspace = true } scale-info = { workspace = true } sp-core = { workspace = true } +sp-io = { workspace = true } sp-runtime = { workspace = true } sp-std = { workspace = true } @@ -27,7 +28,6 @@ sp-std = { workspace = true } env_logger = "0.9" pallet-balances = { workspace = true } pallet-timestamp = { workspace = true } -sp-io = { workspace = true } [features] default = ["std"] @@ -40,6 +40,7 @@ std = [ "pallet-contracts-primitives/std", "scale-info/std", "sp-std/std", + "sp-io/std", "sp-core/std", "sp-runtime/std", "pallet-assets/std", diff --git a/chain-extensions/pallet-assets/src/mock.rs b/chain-extensions/pallet-assets/src/mock.rs index 61ae25c4dd..3b12da52cd 100644 --- a/chain-extensions/pallet-assets/src/mock.rs +++ b/chain-extensions/pallet-assets/src/mock.rs @@ -19,16 +19,18 @@ use crate::AssetsExtension; use frame_support::traits::{AsEnsureOriginWithArg, ConstU128, Currency, Randomness}; use frame_support::{ - parameter_types, sp_io, + parameter_types, traits::{ConstU32, ConstU64, Nothing}, weights::Weight, }; use pallet_contracts::chain_extension::RegisteredChainExtension; use pallet_contracts::{Config, DefaultAddressGenerator, Frame}; use sp_core::crypto::AccountId32; -use sp_runtime::generic; -use sp_runtime::testing::H256; -use sp_runtime::traits::{BlakeTwo256, Convert, IdentityLookup, Zero}; +use sp_runtime::{ + testing::H256, + traits::{BlakeTwo256, Convert, IdentityLookup, Zero}, + BuildStorage, Perbill, +}; pub type BlockNumber = u32; pub type Balance = u128; @@ -50,14 +52,13 @@ impl frame_system::Config for Test { type BlockLength = (); type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u32; - type BlockNumber = BlockNumber; + type Nonce = u32; + type Block = Block; type Hash = H256; type RuntimeCall = RuntimeCall; type Hashing = BlakeTwo256; type AccountId = AccountId32; type Lookup = IdentityLookup; - type Header = generic::Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -74,9 +75,11 @@ impl frame_system::Config for Test { parameter_types! { pub static UnstableInterface: bool = true; pub Schedule: pallet_contracts::Schedule = Default::default(); - pub static DepositPerByte: BalanceOf = 1; - pub const DepositPerItem: BalanceOf = 1; + pub static DepositPerByte: Balance = 1; + pub const DepositPerItem: Balance = 1; pub const DefaultDepositLimit: Balance = 1; + pub const MaxDelegateDependencies: u32 = 32; + pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(1); } pub struct DummyDeprecatedRandomness; @@ -106,6 +109,12 @@ impl pallet_contracts::Config for Test { type MaxStorageKeyLen = ConstU32<128>; type UnsafeUnstableInterface = UnstableInterface; type MaxDebugBufferLen = ConstU32<{ 2 * 1024 * 1024 }>; + type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent; + type Debug = (); + type Environment = (); + type MaxDelegateDependencies = MaxDelegateDependencies; + type Migrations = (); + type RuntimeHoldReason = RuntimeHoldReason; } impl RegisteredChainExtension for AssetsExtension { @@ -126,9 +135,9 @@ impl pallet_balances::Config for Test { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = (); - type MaxHolds = ConstU32<0>; + type MaxHolds = ConstU32<10>; type MaxFreezes = ConstU32<0>; } @@ -162,20 +171,16 @@ impl pallet_assets::Config for Test { type BenchmarkHelper = (); } -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Assets: pallet_assets::{Pallet, Call, Storage, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, - Contracts: pallet_contracts::{Pallet, Call, Storage, Event}, + System: frame_system, + Balances: pallet_balances, + Assets: pallet_assets, + Timestamp: pallet_timestamp, + Contracts: pallet_contracts, } ); @@ -217,8 +222,8 @@ impl ExtBuilder { let env = Env::new().default_filter_or("runtime=debug"); let _ = Builder::from_env(env).is_test(true).try_init(); self.set_associated_consts(); - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); pallet_balances::GenesisConfig:: { balances: vec![] } .assimilate_storage(&mut t) diff --git a/chain-extensions/xvm/src/lib.rs b/chain-extensions/xvm/src/lib.rs index 1c7e5057fb..c7b722fa14 100644 --- a/chain-extensions/xvm/src/lib.rs +++ b/chain-extensions/xvm/src/lib.rs @@ -25,12 +25,13 @@ use astar_primitives::{ evm::UnifiedAddressMapper, xvm::{CallFailure, Context, FailureError, VmId, XvmCall}, }; -use frame_support::{dispatch::Encode, weights::Weight}; +use frame_support::weights::Weight; use frame_system::RawOrigin; use pallet_contracts::chain_extension::{ ChainExtension, Environment, Ext, InitState, RetVal, ReturnFlags, }; use pallet_unified_accounts::WeightInfo; +use parity_scale_codec::Encode; use sp_runtime::DispatchError; use sp_std::marker::PhantomData; use xvm_chain_extension_types::{XvmCallArgs, XvmExecutionResult}; From a7485e210fdaa88e6763f24e8e6e91370d75fff9 Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Wed, 31 Jan 2024 22:26:30 +0530 Subject: [PATCH 07/29] feat: update all precompiles --- pallets/dapp-staking-v3/src/lib.rs | 2 +- precompiles/assets-erc20/Cargo.toml | 2 +- precompiles/assets-erc20/src/mock.rs | 20 ++++----- precompiles/assets-erc20/src/tests.rs | 4 +- precompiles/dapp-staking-v3/src/lib.rs | 10 +++-- precompiles/dapp-staking-v3/src/test/mock.rs | 34 +++++++--------- precompiles/dapps-staking/src/lib.rs | 4 +- precompiles/dapps-staking/src/mock.rs | 22 ++++------ precompiles/sr25519/src/mock.rs | 20 ++++----- precompiles/substrate-ecdsa/src/mock.rs | 20 ++++----- precompiles/unified-accounts/src/lib.rs | 3 -- precompiles/unified-accounts/src/mock.rs | 21 ++++------ precompiles/utils/Cargo.toml | 1 + precompiles/utils/tests-external/lib.rs | 2 +- precompiles/xcm/Cargo.toml | 5 ++- precompiles/xcm/src/lib.rs | 16 ++++---- precompiles/xcm/src/mock.rs | 43 +++++++++----------- precompiles/xvm/src/lib.rs | 2 +- precompiles/xvm/src/mock.rs | 20 ++++----- 19 files changed, 103 insertions(+), 148 deletions(-) diff --git a/pallets/dapp-staking-v3/src/lib.rs b/pallets/dapp-staking-v3/src/lib.rs index 5613c6eb4f..2b9c2d77b3 100644 --- a/pallets/dapp-staking-v3/src/lib.rs +++ b/pallets/dapp-staking-v3/src/lib.rs @@ -468,7 +468,7 @@ pub mod pallet { pub slot_distribution: Vec, pub tier_thresholds: Vec, pub slots_per_tier: Vec, - _config: PhantomData, + pub _config: PhantomData, } #[pallet::genesis_build] diff --git a/precompiles/assets-erc20/Cargo.toml b/precompiles/assets-erc20/Cargo.toml index c4f5f65cba..a9cc8a9d68 100644 --- a/precompiles/assets-erc20/Cargo.toml +++ b/precompiles/assets-erc20/Cargo.toml @@ -55,4 +55,4 @@ std = [ "sp-runtime/std", "sp-std/std", ] -runtime-benchmarks = [] +runtime-benchmarks = ["pallet-assets/runtime-benchmarks"] diff --git a/precompiles/assets-erc20/src/mock.rs b/precompiles/assets-erc20/src/mock.rs index d79adc7afa..d4838cf8f0 100644 --- a/precompiles/assets-erc20/src/mock.rs +++ b/precompiles/assets-erc20/src/mock.rs @@ -52,15 +52,13 @@ use precompile_utils::{ use sp_core::{ConstU32, H160, H256}; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup}, + BuildStorage, }; pub type AccountId = MockAccount; pub type AssetId = u128; pub type Balance = u128; -pub type BlockNumber = u64; -pub type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; pub type Block = frame_system::mocking::MockBlock; /// The local asset precompile address prefix. Addresses that match against this prefix will @@ -98,14 +96,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -146,7 +143,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = (); type FreezeIdentifier = (); type MaxHolds = ConstU32<0>; type MaxFreezes = ConstU32<0>; @@ -219,10 +216,7 @@ impl pallet_assets::Config for Runtime { // Configure a mock runtime to test the pallet. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Runtime { System: frame_system, Balances: pallet_balances, @@ -250,8 +244,8 @@ impl ExtBuilder { } pub(crate) fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); pallet_balances::GenesisConfig:: { diff --git a/precompiles/assets-erc20/src/tests.rs b/precompiles/assets-erc20/src/tests.rs index ab0cf49a5b..c3e05f8e48 100644 --- a/precompiles/assets-erc20/src/tests.rs +++ b/precompiles/assets-erc20/src/tests.rs @@ -258,7 +258,7 @@ fn mint_is_ok() { value: mint_amount.into(), }, ) - .expect_cost(28770756) // 1 weight => 1 gas in mock + .expect_cost(27261756) // 1 weight => 1 gas in mock .expect_log(log3( LocalAssetId(0u128), SELECTOR_LOG_TRANSFER, @@ -347,7 +347,7 @@ fn burn_is_ok() { value: burn_amount.into(), }, ) - .expect_cost(34903756) // 1 weight => 1 gas in mock + .expect_cost(34475756) // 1 weight => 1 gas in mock .expect_log(log3( LocalAssetId(0u128), SELECTOR_LOG_TRANSFER, diff --git a/precompiles/dapp-staking-v3/src/lib.rs b/precompiles/dapp-staking-v3/src/lib.rs index 5178395be5..231d96d8e8 100644 --- a/precompiles/dapp-staking-v3/src/lib.rs +++ b/precompiles/dapp-staking-v3/src/lib.rs @@ -21,13 +21,14 @@ #![cfg_attr(not(feature = "std"), no_std)] use fp_evm::PrecompileHandle; +use frame_system::pallet_prelude::BlockNumberFor; use num_enum::{IntoPrimitive, TryFromPrimitive}; use parity_scale_codec::MaxEncodedLen; use frame_support::{ - dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}, + dispatch::{GetDispatchInfo, PostDispatchInfo}, ensure, - traits::ConstU32, + traits::{ConstU32, IsType}, }; use pallet_evm::AddressMapping; @@ -39,11 +40,11 @@ use precompile_utils::{ }, }; use sp_core::{Get, H160, U256}; -use sp_runtime::traits::Zero; +use sp_runtime::traits::{Dispatchable, Zero}; use sp_std::{marker::PhantomData, prelude::*}; extern crate alloc; -use astar_primitives::{dapp_staking::SmartContractHandle, AccountId, Balance}; +use astar_primitives::{dapp_staking::SmartContractHandle, AccountId, Balance, BlockNumber}; use pallet_dapp_staking_v3::{ AccountLedgerFor, ActiveProtocolState, ContractStake, ContractStakeAmount, CurrentEraInfo, DAppInfoFor, EraInfo, EraRewardSpanFor, EraRewards, IntegratedDApps, Ledger, @@ -117,6 +118,7 @@ where R: pallet_evm::Config + pallet_dapp_staking_v3::Config + frame_system::Config, + BlockNumberFor: IsType, ::RuntimeOrigin: From>, R::RuntimeCall: Dispatchable + GetDispatchInfo, R::RuntimeCall: From>, diff --git a/precompiles/dapp-staking-v3/src/test/mock.rs b/precompiles/dapp-staking-v3/src/test/mock.rs index 36359b9457..9d8c6607f9 100644 --- a/precompiles/dapp-staking-v3/src/test/mock.rs +++ b/precompiles/dapp-staking-v3/src/test/mock.rs @@ -23,7 +23,7 @@ use frame_support::{ assert_ok, construct_runtime, parameter_types, traits::{ fungible::{Mutate as FunMutate, Unbalanced as FunUnbalanced}, - ConstU128, ConstU64, GenesisBuild, Hooks, + ConstU128, ConstU64, Hooks, }, weights::{RuntimeDbWeight, Weight}, }; @@ -34,7 +34,10 @@ use pallet_evm::{ use sp_arithmetic::{fixed_point::FixedU64, Permill}; use sp_core::{H160, H256}; use sp_io::TestExternalities; -use sp_runtime::traits::{BlakeTwo256, ConstU32, IdentityLookup}; +use sp_runtime::{ + traits::{BlakeTwo256, ConstU32, IdentityLookup}, + BuildStorage, +}; extern crate alloc; use astar_primitives::{ @@ -42,13 +45,11 @@ use astar_primitives::{ CycleConfiguration, EraNumber, PeriodNumber, SmartContract, StakingRewardHandler, }, oracle::PriceProvider, - testing::Header, AccountId, Balance, BlockNumber, }; use pallet_dapp_staking_v3::TierThreshold; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; -type Block = frame_system::mocking::MockBlock; +type Block = frame_system::mocking::MockBlockU32; pub struct AddressMapper; impl AddressMapping for AddressMapper { @@ -80,14 +81,13 @@ impl frame_system::Config for Test { type BlockWeights = (); type BlockLength = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; + type Nonce = u64; type RuntimeCall = RuntimeCall; - type BlockNumber = BlockNumber; type Hash = H256; + type Block = Block; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); @@ -111,7 +111,7 @@ impl pallet_balances::Config for Test { type DustRemoval = (); type ExistentialDeposit = ConstU128<1>; type AccountStore = System; - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = RuntimeFreezeReason; type MaxHolds = ConstU32<0>; type MaxFreezes = ConstU32<1>; @@ -267,12 +267,7 @@ impl pallet_dapp_staking_v3::Config for Test { } construct_runtime!( - pub struct Test - where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { + pub struct Test { System: frame_system, Balances: pallet_balances, Evm: pallet_evm, @@ -284,12 +279,12 @@ construct_runtime!( pub struct ExternalityBuilder; impl ExternalityBuilder { pub fn build() -> TestExternalities { - let mut storage = frame_system::GenesisConfig::default() - .build_storage::() + let mut storage = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); - >::assimilate_storage( - &pallet_dapp_staking_v3::GenesisConfig { + pallet_dapp_staking_v3::GenesisConfig::::assimilate_storage( + &pallet_dapp_staking_v3::GenesisConfig:: { reward_portion: vec![ Permill::from_percent(40), Permill::from_percent(30), @@ -318,6 +313,7 @@ impl ExternalityBuilder { TierThreshold::FixedTvlAmount { amount: 10 }, ], slots_per_tier: vec![10, 20, 30, 40], + _config: PhantomData, }, &mut storage, ) diff --git a/precompiles/dapps-staking/src/lib.rs b/precompiles/dapps-staking/src/lib.rs index a408e1c4a5..0f4e5b7226 100644 --- a/precompiles/dapps-staking/src/lib.rs +++ b/precompiles/dapps-staking/src/lib.rs @@ -24,14 +24,14 @@ use fp_evm::PrecompileHandle; use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use frame_support::{ - dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}, + dispatch::{GetDispatchInfo, PostDispatchInfo}, traits::{Currency, Get}, }; use pallet_dapps_staking::RewardDestination; use pallet_evm::AddressMapping; use precompile_utils::prelude::*; use sp_core::{ConstU32, H160, U256}; -use sp_runtime::traits::Zero; +use sp_runtime::traits::{Dispatchable, Zero}; use sp_std::marker::PhantomData; use sp_std::prelude::*; extern crate alloc; diff --git a/precompiles/dapps-staking/src/mock.rs b/precompiles/dapps-staking/src/mock.rs index e85d563580..29b7f2e767 100644 --- a/precompiles/dapps-staking/src/mock.rs +++ b/precompiles/dapps-staking/src/mock.rs @@ -34,9 +34,8 @@ use serde::{Deserialize, Serialize}; use sp_core::{H160, H256}; use sp_io::TestExternalities; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, ConstU32, IdentityLookup}, - AccountId32, + AccountId32, BuildStorage, }; extern crate alloc; @@ -48,7 +47,6 @@ pub(crate) const AST: Balance = 1_000 * MILLIAST; pub(crate) const TEST_CONTRACT: H160 = H160::repeat_byte(0x09); -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; /// Value shouldn't be less than 2 for testing purposes, otherwise we cannot test certain corner cases. @@ -160,14 +158,13 @@ impl frame_system::Config for TestRuntime { type BlockWeights = (); type BlockLength = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; + type Nonce = u64; type RuntimeCall = RuntimeCall; - type BlockNumber = BlockNumber; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId32; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = TestWeights; @@ -195,7 +192,7 @@ impl pallet_balances::Config for TestRuntime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -324,8 +321,8 @@ impl Default for ExternalityBuilder { impl ExternalityBuilder { pub fn build(self) -> TestExternalities { - let mut storage = frame_system::GenesisConfig::default() - .build_storage::() + let mut storage = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); pallet_balances::GenesisConfig:: { @@ -346,12 +343,7 @@ impl ExternalityBuilder { } construct_runtime!( - pub struct TestRuntime - where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { + pub struct TestRuntime { System: frame_system, Balances: pallet_balances, Evm: pallet_evm, diff --git a/precompiles/sr25519/src/mock.rs b/precompiles/sr25519/src/mock.rs index f8450a4192..b29c9e8801 100644 --- a/precompiles/sr25519/src/mock.rs +++ b/precompiles/sr25519/src/mock.rs @@ -35,14 +35,12 @@ use pallet_evm::{ }; use sp_core::{H160, H256}; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup}, + BuildStorage, }; pub type AccountId = TestAccount; pub type Balance = u128; -pub type BlockNumber = u64; -pub type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; pub type Block = frame_system::mocking::MockBlock; pub const PRECOMPILE_ADDRESS: H160 = H160::repeat_byte(0xBB); @@ -115,14 +113,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -186,7 +183,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = (); type MaxHolds = ConstU32<0>; type MaxFreezes = ConstU32<0>; @@ -225,10 +222,7 @@ impl pallet_evm::Config for Runtime { // Configure a mock runtime to test the pallet. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Runtime { System: frame_system, Balances: pallet_balances, @@ -242,8 +236,8 @@ pub(crate) struct ExtBuilder; impl ExtBuilder { pub(crate) fn build(self) -> sp_io::TestExternalities { - let t = frame_system::GenesisConfig::default() - .build_storage::() + let t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); let mut ext = sp_io::TestExternalities::new(t); diff --git a/precompiles/substrate-ecdsa/src/mock.rs b/precompiles/substrate-ecdsa/src/mock.rs index d0037b65f5..962d0dc2b0 100644 --- a/precompiles/substrate-ecdsa/src/mock.rs +++ b/precompiles/substrate-ecdsa/src/mock.rs @@ -35,14 +35,12 @@ use pallet_evm::{ }; use sp_core::{H160, H256}; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup}, + BuildStorage, }; pub type AccountId = TestAccount; pub type Balance = u128; -pub type BlockNumber = u64; -pub type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; pub type Block = frame_system::mocking::MockBlock; pub const PRECOMPILE_ADDRESS: H160 = H160::repeat_byte(0x3F); @@ -115,14 +113,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -186,7 +183,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = (); type MaxHolds = ConstU32<0>; type MaxFreezes = ConstU32<0>; @@ -225,10 +222,7 @@ impl pallet_evm::Config for Runtime { // Configure a mock runtime to test the pallet. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Runtime { System: frame_system, Balances: pallet_balances, @@ -242,8 +236,8 @@ pub(crate) struct ExtBuilder; impl ExtBuilder { pub(crate) fn build(self) -> sp_io::TestExternalities { - let t = frame_system::GenesisConfig::default() - .build_storage::() + let t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); let mut ext = sp_io::TestExternalities::new(t); diff --git a/precompiles/unified-accounts/src/lib.rs b/precompiles/unified-accounts/src/lib.rs index 031bdb1d49..6c85328397 100644 --- a/precompiles/unified-accounts/src/lib.rs +++ b/precompiles/unified-accounts/src/lib.rs @@ -21,7 +21,6 @@ use astar_primitives::evm::{UnifiedAddress, UnifiedAddressMapper}; use core::marker::PhantomData; use fp_evm::PrecompileHandle; -use frame_support::dispatch::Dispatchable; use frame_support::traits::IsType; use precompile_utils::prelude::*; use sp_core::{crypto::AccountId32, H256}; @@ -38,8 +37,6 @@ pub struct UnifiedAccountsPrecompile(PhantomData<(T, UA)>); impl UnifiedAccountsPrecompile where R: pallet_evm::Config + pallet_unified_accounts::Config, - <::RuntimeCall as Dispatchable>::RuntimeOrigin: - From>, ::AccountId: IsType, UA: UnifiedAddressMapper, { diff --git a/precompiles/unified-accounts/src/mock.rs b/precompiles/unified-accounts/src/mock.rs index 384f293fbb..5c40431754 100644 --- a/precompiles/unified-accounts/src/mock.rs +++ b/precompiles/unified-accounts/src/mock.rs @@ -28,9 +28,8 @@ use scale_info::TypeInfo; use serde::{Deserialize, Serialize}; use sp_core::{keccak_256, H160, H256}; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, ConstU32, IdentityLookup}, - AccountId32, + AccountId32, BuildStorage, }; use ethers::{ @@ -41,8 +40,6 @@ use ethers::{ use astar_primitives::evm::HashedDefaultMappings; pub type AccountId = AccountId32; pub type Balance = u128; -pub type BlockNumber = u64; -pub type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; pub type Block = frame_system::mocking::MockBlock; pub const PRECOMPILE_ADDRESS: H160 = H160::repeat_byte(0x7B); @@ -122,14 +119,13 @@ impl frame_system::Config for TestRuntime { type BlockWeights = (); type BlockLength = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; + type Nonce = u64; type RuntimeCall = RuntimeCall; - type BlockNumber = BlockNumber; + type Block = Block; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId32; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type DbWeight = (); @@ -183,7 +179,7 @@ impl pallet_balances::Config for TestRuntime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = (); type MaxHolds = ConstU32<0>; type MaxFreezes = ConstU32<0>; @@ -248,10 +244,7 @@ impl pallet_unified_accounts::Config for TestRuntime { // Configure a mock runtime to test the pallet. construct_runtime!( - pub enum TestRuntime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum TestRuntime { System: frame_system, Evm: pallet_evm, @@ -266,8 +259,8 @@ pub(crate) struct ExtBuilder; impl ExtBuilder { pub(crate) fn build(self) -> sp_io::TestExternalities { - let t = frame_system::GenesisConfig::default() - .build_storage::() + let t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); let mut ext = sp_io::TestExternalities::new(t); diff --git a/precompiles/utils/Cargo.toml b/precompiles/utils/Cargo.toml index 2c821e09a9..9e7b1dc67f 100644 --- a/precompiles/utils/Cargo.toml +++ b/precompiles/utils/Cargo.toml @@ -53,6 +53,7 @@ std = [ "sp-core/std", "sp-io/std", "sp-std/std", + "xcm?/std", ] codec-xcm = ["xcm"] testing = ["derive_more", "hex-literal", "scale-info", "serde", "similar-asserts", "std"] diff --git a/precompiles/utils/tests-external/lib.rs b/precompiles/utils/tests-external/lib.rs index 342e3ed067..04c20bc0bb 100644 --- a/precompiles/utils/tests-external/lib.rs +++ b/precompiles/utils/tests-external/lib.rs @@ -95,7 +95,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type ReserveIdentifier = [u8; 4]; - type RuntimeHoldReason = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = (); type MaxLocks = (); type MaxReserves = (); diff --git a/precompiles/xcm/Cargo.toml b/precompiles/xcm/Cargo.toml index e6b547697f..b2d71dd70c 100644 --- a/precompiles/xcm/Cargo.toml +++ b/precompiles/xcm/Cargo.toml @@ -22,6 +22,7 @@ pallet-assets = { workspace = true } parity-scale-codec = { workspace = true, features = ["max-encoded-len"] } sp-core = { workspace = true } sp-io = { workspace = true } +sp-runtime = { workspace = true } sp-std = { workspace = true } # Frontier @@ -46,7 +47,6 @@ precompile-utils = { workspace = true, features = ["testing", "codec-xcm"] } pallet-balances = { workspace = true } pallet-timestamp = { workspace = true } -sp-runtime = { workspace = true } xcm-builder = { workspace = true, features = ["std"] } [features] @@ -63,6 +63,7 @@ std = [ "precompile-utils/std", "sp-core/std", "sp-std/std", + "sp-runtime/std", "sp-io/std", "xcm/std", "xcm-executor/std", @@ -70,4 +71,4 @@ std = [ "orml-xcm-support/std", "orml-traits/std", ] -runtime-benchmarks = [] +runtime-benchmarks = ["pallet-xcm/runtime-benchmarks", "pallet-assets/runtime-benchmarks", "xcm-builder/runtime-benchmarks"] diff --git a/precompiles/xcm/src/lib.rs b/precompiles/xcm/src/lib.rs index 9e4914cd75..a23737db9e 100644 --- a/precompiles/xcm/src/lib.rs +++ b/precompiles/xcm/src/lib.rs @@ -21,10 +21,11 @@ use astar_primitives::xcm::XCM_SIZE_LIMIT; use fp_evm::PrecompileHandle; use frame_support::{ - dispatch::{Dispatchable, GetDispatchInfo, PostDispatchInfo}, + dispatch::{GetDispatchInfo, PostDispatchInfo}, pallet_prelude::Weight, traits::{ConstU32, Get}, }; +use sp_runtime::traits::{Dispatchable, MaybeEquivalence}; type GetXcmSizeLimit = ConstU32; use pallet_evm::AddressMapping; @@ -35,7 +36,6 @@ use sp_std::marker::PhantomData; use sp_std::prelude::*; use xcm::{latest::prelude::*, VersionedMultiAsset, VersionedMultiAssets, VersionedMultiLocation}; -use xcm_executor::traits::Convert; use pallet_evm_precompile_assets_erc20::AddressToAssetId; use precompile_utils::prelude::*; @@ -85,7 +85,7 @@ where XBalanceOf: TryFrom + Into + From, ::CurrencyId: From<::AssetId>, - C: Convert::AssetId>, + C: MaybeEquivalence::AssetId>, { #[precompile::public("assets_withdraw(address[],uint256[],bytes32,bool,uint256,uint256)")] fn assets_withdraw_native_v1( @@ -153,7 +153,7 @@ where .iter() .cloned() .filter_map(|address| { - Runtime::address_to_asset_id(address.into()).and_then(|x| C::reverse_ref(x).ok()) + Runtime::address_to_asset_id(address.into()).and_then(|x| C::convert_back(&x)) }) .collect::>(); @@ -256,9 +256,9 @@ where } else { let fee_asset_id = Runtime::address_to_asset_id(address) .ok_or(revert("Failed to resolve fee asset id from address"))?; - C::reverse_ref(fee_asset_id).map_err(|_| { - revert("Failed to resolve fee asset multilocation from local id") - })? + C::convert_back(&fee_asset_id).ok_or(revert( + "Failed to resolve fee asset multilocation from local id", + ))? } }; @@ -318,7 +318,7 @@ where if address == NATIVE_ADDRESS { Some(Here.into()) } else { - Runtime::address_to_asset_id(address).and_then(|x| C::reverse_ref(x).ok()) + Runtime::address_to_asset_id(address).and_then(|x| C::convert_back(&x)) } }) .collect(); diff --git a/precompiles/xcm/src/mock.rs b/precompiles/xcm/src/mock.rs index 4321c7fd2b..e0ac9c1458 100644 --- a/precompiles/xcm/src/mock.rs +++ b/precompiles/xcm/src/mock.rs @@ -36,10 +36,10 @@ use pallet_evm::{ use pallet_evm_precompile_assets_erc20::AddressToAssetId; use sp_core::{ConstU32, H160, H256}; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup}, + BuildStorage, }; -use sp_std::{borrow::Borrow, cell::RefCell}; +use sp_std::cell::RefCell; use xcm::prelude::XcmVersion; use xcm_builder::{ @@ -54,8 +54,6 @@ use orml_xcm_support::DisabledParachainFee; pub type AccountId = TestAccount; pub type AssetId = u128; pub type Balance = u128; -pub type BlockNumber = u64; -pub type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; pub type Block = frame_system::mocking::MockBlock; pub type CurrencyId = u128; @@ -219,14 +217,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -295,7 +292,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = (); type MaxHolds = (); type MaxFreezes = (); @@ -336,22 +333,24 @@ impl pallet_assets::Config for Runtime { } pub struct AssetIdConverter(PhantomData); -impl xcm_executor::traits::Convert for AssetIdConverter +impl sp_runtime::traits::MaybeEquivalence + for AssetIdConverter where AssetId: Clone + Eq + From, { - fn convert_ref(id: impl Borrow) -> Result { - if id.borrow().eq(&MultiLocation::parent()) { - Ok(AssetId::from(1u8)) + fn convert(a: &MultiLocation) -> Option { + if a.eq(&MultiLocation::parent()) { + Some(AssetId::from(1u8)) } else { - Err(()) + None } } - fn reverse_ref(what: impl Borrow) -> Result { - if what.borrow().eq(&AssetId::from(1u8)) { - Ok(MultiLocation::parent()) + + fn convert_back(b: &AssetId) -> Option { + if b.eq(&AssetId::from(1u8)) { + Some(MultiLocation::parent()) } else { - Err(()) + None } } } @@ -448,6 +447,7 @@ impl xcm_executor::Config for XcmConfig { type UniversalAliases = Nothing; type CallDispatcher = RuntimeCall; type SafeCallFilter = Everything; + type Aliasers = (); } parameter_types! { @@ -555,10 +555,7 @@ impl orml_xtokens::Config for Runtime { // Configure a mock runtime to test the pallet. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Runtime { System: frame_system, Balances: pallet_balances, @@ -575,8 +572,8 @@ pub(crate) struct ExtBuilder; impl ExtBuilder { pub(crate) fn build(self) -> sp_io::TestExternalities { - let t = frame_system::GenesisConfig::default() - .build_storage::() + let t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); let mut ext = sp_io::TestExternalities::new(t); diff --git a/precompiles/xvm/src/lib.rs b/precompiles/xvm/src/lib.rs index db838453dd..658b68fb7d 100644 --- a/precompiles/xvm/src/lib.rs +++ b/precompiles/xvm/src/lib.rs @@ -23,9 +23,9 @@ use alloc::format; use astar_primitives::xvm::{Context, FailureReason, VmId, XvmCall}; use fp_evm::{ExitRevert, PrecompileFailure, PrecompileHandle}; -use frame_support::dispatch::Dispatchable; use pallet_evm::{AddressMapping, GasWeightMapping}; use sp_core::U256; +use sp_runtime::traits::Dispatchable; use sp_std::marker::PhantomData; use precompile_utils::prelude::*; diff --git a/precompiles/xvm/src/mock.rs b/precompiles/xvm/src/mock.rs index 647d58e692..5d23e088d5 100644 --- a/precompiles/xvm/src/mock.rs +++ b/precompiles/xvm/src/mock.rs @@ -35,8 +35,8 @@ use pallet_evm::{ }; use sp_core::{H160, H256}; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup}, + BuildStorage, }; use sp_std::cell::RefCell; @@ -46,8 +46,6 @@ use astar_primitives::xvm::{ pub type AccountId = TestAccount; pub type Balance = u128; -pub type BlockNumber = u64; -pub type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; pub type Block = frame_system::mocking::MockBlock; pub const PRECOMPILE_ADDRESS: H160 = H160::repeat_byte(0x7B); @@ -131,14 +129,13 @@ impl frame_system::Config for Runtime { type BaseCallFilter = Everything; type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; - type Index = u64; - type BlockNumber = BlockNumber; + type Nonce = u64; + type Block = Block; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -204,7 +201,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = (); type MaxHolds = ConstU32<0>; type MaxFreezes = ConstU32<0>; @@ -292,10 +289,7 @@ impl XvmCall for MockXvmWithArgsCheck { // Configure a mock runtime to test the pallet. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Runtime { System: frame_system, Balances: pallet_balances, @@ -309,8 +303,8 @@ pub(crate) struct ExtBuilder; impl ExtBuilder { pub(crate) fn build(self) -> sp_io::TestExternalities { - let t = frame_system::GenesisConfig::default() - .build_storage::() + let t = frame_system::GenesisConfig::::default() + .build_storage() .expect("Frame system builds valid default genesis config"); WeightLimitCalledWith::reset(); From 849581a94b74a59c674a268c88a5e6e28899c44f Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Mon, 5 Feb 2024 13:48:14 +0530 Subject: [PATCH 08/29] wip: local runtime --- Cargo.toml | 2 +- chain-extensions/pallet-assets/Cargo.toml | 3 +-- pallets/block-rewards-hybrid/Cargo.toml | 4 +-- pallets/dapp-staking-v3/log.log | 1 - pallets/dynamic-evm-base-fee/Cargo.toml | 3 +-- pallets/inflation/Cargo.toml | 3 +-- pallets/inflation/src/benchmarking.rs | 1 + pallets/inflation/src/lib.rs | 2 +- pallets/static-price-provider/Cargo.toml | 3 +-- runtime/local/src/lib.rs | 33 ++++++++++++----------- 10 files changed, 25 insertions(+), 30 deletions(-) delete mode 100644 pallets/dapp-staking-v3/log.log diff --git a/Cargo.toml b/Cargo.toml index 9f61bfd0ba..081c4ba32e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -69,7 +69,7 @@ async-trait = "0.1.59" clap = { version = "4.2.5", features = ["derive"] } env_logger = "0.10.0" futures = { version = "0.3.26" } -serde = { version = "1.0.151", features = ["derive"] } +serde = { version = "1.0.151", default-features = false, features = ["derive"] } serde_json = "1.0.92" tokio = { version = "1.24.2", features = ["macros", "sync"] } url = "2.2.2" diff --git a/chain-extensions/pallet-assets/Cargo.toml b/chain-extensions/pallet-assets/Cargo.toml index fac4c51fc0..0bd86ecf95 100644 --- a/chain-extensions/pallet-assets/Cargo.toml +++ b/chain-extensions/pallet-assets/Cargo.toml @@ -20,7 +20,6 @@ pallet-contracts-primitives = { workspace = true } parity-scale-codec = { workspace = true } scale-info = { workspace = true } sp-core = { workspace = true } -sp-io = { workspace = true } sp-runtime = { workspace = true } sp-std = { workspace = true } @@ -28,6 +27,7 @@ sp-std = { workspace = true } env_logger = "0.9" pallet-balances = { workspace = true } pallet-timestamp = { workspace = true } +sp-io = { workspace = true } [features] default = ["std"] @@ -40,7 +40,6 @@ std = [ "pallet-contracts-primitives/std", "scale-info/std", "sp-std/std", - "sp-io/std", "sp-core/std", "sp-runtime/std", "pallet-assets/std", diff --git a/pallets/block-rewards-hybrid/Cargo.toml b/pallets/block-rewards-hybrid/Cargo.toml index 8d8e0fa6f4..0ec9ae7578 100644 --- a/pallets/block-rewards-hybrid/Cargo.toml +++ b/pallets/block-rewards-hybrid/Cargo.toml @@ -20,14 +20,13 @@ scale-info = { workspace = true } sp-arithmetic = { workspace = true } sp-runtime = { workspace = true } sp-std = { workspace = true } -sp-io = { workspace = true } - frame-benchmarking = { workspace = true, optional = true } [dev-dependencies] pallet-balances = { workspace = true } pallet-timestamp = { workspace = true } sp-core = { workspace = true } +sp-io = { workspace = true } [features] default = ["std"] @@ -36,7 +35,6 @@ std = [ "sp-core/std", "scale-info/std", "sp-std/std", - "sp-io/std", "serde/std", "log/std", "frame-support/std", diff --git a/pallets/dapp-staking-v3/log.log b/pallets/dapp-staking-v3/log.log deleted file mode 100644 index 9d25a91b7d..0000000000 --- a/pallets/dapp-staking-v3/log.log +++ /dev/null @@ -1 +0,0 @@ - Blocking waiting for file lock on build directory diff --git a/pallets/dynamic-evm-base-fee/Cargo.toml b/pallets/dynamic-evm-base-fee/Cargo.toml index 4fde90ddf0..864a03b054 100644 --- a/pallets/dynamic-evm-base-fee/Cargo.toml +++ b/pallets/dynamic-evm-base-fee/Cargo.toml @@ -18,7 +18,6 @@ frame-support = { workspace = true } frame-system = { workspace = true } pallet-transaction-payment = { workspace = true } sp-core = { workspace = true } -sp-io = { workspace = true } sp-runtime = { workspace = true } # Frontier @@ -28,6 +27,7 @@ fp-evm = { workspace = true } num-traits = { workspace = true } pallet-balances = { workspace = true } pallet-timestamp = { workspace = true } +sp-io = { workspace = true } [features] default = ["std"] @@ -39,7 +39,6 @@ std = [ "frame-support/std", "frame-system/std", "sp-core/std", - "sp-io/std", "sp-runtime/std", "pallet-transaction-payment/std", "pallet-balances/std", diff --git a/pallets/inflation/Cargo.toml b/pallets/inflation/Cargo.toml index eab56dd857..0ba8a6fe92 100644 --- a/pallets/inflation/Cargo.toml +++ b/pallets/inflation/Cargo.toml @@ -19,13 +19,13 @@ frame-system = { workspace = true } scale-info = { workspace = true } sp-runtime = { workspace = true } sp-std = { workspace = true } -sp-io = { workspace = true } frame-benchmarking = { workspace = true, optional = true } [dev-dependencies] pallet-balances = { workspace = true } sp-core = { workspace = true } +sp-io = { workspace = true } [features] default = ["std"] @@ -36,7 +36,6 @@ std = [ "scale-info/std", "serde/std", "sp-std/std", - "sp-io/std", "frame-support/std", "frame-system/std", "pallet-balances/std", diff --git a/pallets/inflation/src/benchmarking.rs b/pallets/inflation/src/benchmarking.rs index 4c9a7367c4..857e77593d 100644 --- a/pallets/inflation/src/benchmarking.rs +++ b/pallets/inflation/src/benchmarking.rs @@ -18,6 +18,7 @@ use super::*; +use astar_primitives::BlockNumber; use frame_benchmarking::v2::*; use frame_system::{Pallet as System, RawOrigin}; diff --git a/pallets/inflation/src/lib.rs b/pallets/inflation/src/lib.rs index 480695ad1a..5bcf460055 100644 --- a/pallets/inflation/src/lib.rs +++ b/pallets/inflation/src/lib.rs @@ -102,7 +102,7 @@ use astar_primitives::{ dapp_staking::{ CycleConfiguration, EraNumber, Observer as DappStakingObserver, StakingRewardHandler, }, - Balance, BlockNumber, + Balance, }; use frame_support::{ pallet_prelude::*, diff --git a/pallets/static-price-provider/Cargo.toml b/pallets/static-price-provider/Cargo.toml index a118ddbeba..061aaa8e38 100644 --- a/pallets/static-price-provider/Cargo.toml +++ b/pallets/static-price-provider/Cargo.toml @@ -20,13 +20,13 @@ scale-info = { workspace = true } sp-arithmetic = { workspace = true } sp-runtime = { workspace = true } sp-std = { workspace = true } -sp-io = { workspace = true } frame-benchmarking = { workspace = true, optional = true } [dev-dependencies] pallet-balances = { workspace = true } sp-core = { workspace = true } +sp-io = { workspace = true } [features] default = ["std"] @@ -37,7 +37,6 @@ std = [ "scale-info/std", "serde/std", "sp-std/std", - "sp-io/std", "frame-support/std", "frame-system/std", "pallet-balances/std", diff --git a/runtime/local/src/lib.rs b/runtime/local/src/lib.rs index ed0c061853..99adbc6c84 100644 --- a/runtime/local/src/lib.rs +++ b/runtime/local/src/lib.rs @@ -207,15 +207,13 @@ impl frame_system::Config for Runtime { /// The lookup mechanism to get account ID from whatever is passed in dispatchers. type Lookup = (AccountIdLookup, UnifiedAccounts); /// The index type for storing how many extrinsics an account has signed. - type Index = Index; + type Nonce = Index; /// The index type for blocks. - type BlockNumber = BlockNumber; + type Block = Block; /// The type for hashing blocks and tries. type Hash = Hash; /// The hashing algorithm used. type Hashing = BlakeTwo256; - /// The header type. - type Header = generic::Header; /// The ubiquitous event type. type RuntimeEvent = RuntimeEvent; /// The ubiquitous origin type. @@ -253,6 +251,7 @@ impl pallet_aura::Config for Runtime { type AuthorityId = AuraId; type DisabledValidators = (); type MaxAuthorities = ConstU32<50>; + type AllowMultipleBlocksPerSlot = ConstBool; } impl pallet_grandpa::Config for Runtime { @@ -264,6 +263,7 @@ impl pallet_grandpa::Config for Runtime { type WeightInfo = (); type MaxAuthorities = MaxAuthorities; type MaxSetIdSessionEntries = ConstU64<0>; + type MaxNominators = ConstU32<0>; } parameter_types! { @@ -297,7 +297,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = weights::pallet_balances::SubstrateWeight; - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = RuntimeFreezeReason; type MaxHolds = ConstU32<0>; type MaxFreezes = ConstU32<1>; @@ -652,7 +652,7 @@ parameter_types! { pub BlockGasLimit: U256 = U256::from( NORMAL_DISPATCH_RATIO * WEIGHT_REF_TIME_PER_SECOND / WEIGHT_PER_GAS ); - pub PrecompilesValue: Precompiles = LocalPrecompiles::<_>::new(); + pub PrecompilesValue: Precompiles = LocalPrecompiles::::new(); pub WeightPerGas: Weight = Weight::from_parts(WEIGHT_PER_GAS, 0); /// The amount of gas per PoV size. Value is calculated as: /// @@ -897,6 +897,8 @@ parameter_types! { pub const DepositPerByte: Balance = deposit(0, 1); // Fallback value if storage deposit limit not set by the user pub const DefaultDepositLimit: Balance = deposit(16, 16 * 1024); + pub const MaxDelegateDependencies: u32 = 32; + pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(30); pub Schedule: pallet_contracts::Schedule = Default::default(); } @@ -906,6 +908,7 @@ impl pallet_contracts::Config for Runtime { type Currency = Balances; type RuntimeEvent = RuntimeEvent; type RuntimeCall = RuntimeCall; + type RuntimeHoldReason = RuntimeHoldReason; /// The safest default is to allow no calls at all. /// /// Runtimes should whitelist dispatchables that are allowed to be called from contracts @@ -931,6 +934,11 @@ impl pallet_contracts::Config for Runtime { type MaxStorageKeyLen = ConstU32<128>; type UnsafeUnstableInterface = ConstBool; type MaxDebugBufferLen = ConstU32<{ 2 * 1024 * 1024 }>; + type MaxDelegateDependencies = MaxDelegateDependencies; + type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent; + type Debug = (); + type Environment = (); + type Migrations = (); } impl pallet_sudo::Config for Runtime { @@ -1082,15 +1090,8 @@ impl pallet_proxy::Config for Runtime { type AnnouncementDepositFactor = ConstU128<{ MILLIAST * 660 }>; } -// TODO: remove this once https://github.com/paritytech/substrate/issues/12161 is resolved -#[rustfmt::skip] construct_runtime!( - pub struct Runtime - where - Block = Block, - NodeBlock = generic::Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { + pub struct Runtime { System: frame_system, Utility: pallet_utility, Timestamp: pallet_timestamp, @@ -1114,8 +1115,8 @@ construct_runtime!( Assets: pallet_assets, Scheduler: pallet_scheduler, Democracy: pallet_democracy, - Council: pallet_collective::, - TechnicalCommittee: pallet_collective::, + Council: pallet_collective, + TechnicalCommittee: pallet_collective, Treasury: pallet_treasury, Xvm: pallet_xvm, Proxy: pallet_proxy, From 8694d1a35d370c32973ca70629af974131f2fc2b Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Mon, 5 Feb 2024 18:29:15 +0530 Subject: [PATCH 09/29] feat: update shibuya runtmie --- Cargo.lock | 1 + Cargo.toml | 4 +- pallets/block-rewards-hybrid/src/lib.rs | 15 ++++- pallets/collator-selection/src/lib.rs | 3 +- .../src/benchmarking.rs | 1 + pallets/dapp-staking-v3/Cargo.toml | 4 +- .../dapp-staking-v3/src/benchmarking/mod.rs | 1 + pallets/dapp-staking-v3/src/types.rs | 19 ++++++- pallets/dynamic-evm-base-fee/Cargo.toml | 2 + .../dynamic-evm-base-fee/src/benchmarking.rs | 1 + pallets/ethereum-checked/src/benchmarking.rs | 1 + pallets/inflation/src/benchmarking.rs | 1 + pallets/inflation/src/lib.rs | 17 +++++- pallets/unified-accounts/src/benchmarking.rs | 1 + primitives/src/lib.rs | 2 - runtime/astar/src/lib.rs | 8 +-- runtime/local/src/lib.rs | 8 +-- runtime/shibuya/src/lib.rs | 55 ++++++++++++------- runtime/shibuya/src/xcm_config.rs | 24 ++++---- runtime/shiden/src/lib.rs | 8 +-- 20 files changed, 118 insertions(+), 58 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3bb1095c20..e3f915979d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8386,6 +8386,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", + "sp-std", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 081c4ba32e..7b7b477a84 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -69,7 +69,7 @@ async-trait = "0.1.59" clap = { version = "4.2.5", features = ["derive"] } env_logger = "0.10.0" futures = { version = "0.3.26" } -serde = { version = "1.0.151", default-features = false, features = ["derive"] } +serde = { version = "1.0.151", default-features = false, features = ["derive", "alloc"] } serde_json = "1.0.92" tokio = { version = "1.24.2", features = ["macros", "sync"] } url = "2.2.2" @@ -188,7 +188,7 @@ ethereum = { version = "0.14.0", default-features = false } # Frontier # (wasm) fp-rpc = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0", default-features = false } -fp-self-contained = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0", default-features = false } +fp-self-contained = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0", default-features = false, features = ["serde"] } pallet-ethereum = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0", default-features = false, features = ["forbid-evm-reentrancy"] } pallet-evm = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0", default-features = false, features = ["forbid-evm-reentrancy"] } pallet-evm-precompile-blake2 = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0", default-features = false } diff --git a/pallets/block-rewards-hybrid/src/lib.rs b/pallets/block-rewards-hybrid/src/lib.rs index f78e94b509..e7859fcdad 100644 --- a/pallets/block-rewards-hybrid/src/lib.rs +++ b/pallets/block-rewards-hybrid/src/lib.rs @@ -82,6 +82,7 @@ use astar_primitives::Balance; use frame_support::pallet_prelude::*; use frame_support::traits::{Currency, Get, Imbalance, OnTimestampSet}; use frame_system::{ensure_root, pallet_prelude::*}; +use serde::{Deserialize, Serialize}; use sp_runtime::{ traits::{CheckedAdd, Zero}, Perbill, @@ -279,8 +280,18 @@ pub mod pallet { /// /// Note that if `ideal_dapps_staking_tvl` is set to `Zero`, entire `adjustable_percent` goes to the stakers. /// -#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, TypeInfo, MaxEncodedLen)] -#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] +#[derive( + PartialEq, + Eq, + Clone, + Encode, + Decode, + RuntimeDebug, + TypeInfo, + MaxEncodedLen, + Serialize, + Deserialize, +)] pub struct RewardDistributionConfig { /// Base percentage of reward that goes to treasury #[codec(compact)] diff --git a/pallets/collator-selection/src/lib.rs b/pallets/collator-selection/src/lib.rs index 2cae6ca6a2..b626bdbf6d 100644 --- a/pallets/collator-selection/src/lib.rs +++ b/pallets/collator-selection/src/lib.rs @@ -95,6 +95,7 @@ pub mod pallet { use pallet_session::SessionManager; use sp_runtime::{traits::Convert, Perbill}; use sp_staking::SessionIndex; + use sp_std::prelude::*; type BalanceOf = <::Currency as Currency<::AccountId>>::Balance; @@ -223,7 +224,7 @@ pub mod pallet { let duplicate_invulnerables = self .invulnerables .iter() - .collect::>(); + .collect::>(); assert!( duplicate_invulnerables.len() == self.invulnerables.len(), "duplicate invulnerables in genesis." diff --git a/pallets/dapp-staking-migration/src/benchmarking.rs b/pallets/dapp-staking-migration/src/benchmarking.rs index 345a622cad..24e20928e2 100644 --- a/pallets/dapp-staking-migration/src/benchmarking.rs +++ b/pallets/dapp-staking-migration/src/benchmarking.rs @@ -20,6 +20,7 @@ use super::{Pallet as Migration, *}; use frame_benchmarking::{account as benchmark_account, v2::*}; use frame_support::{assert_ok, traits::Currency}; +use sp_std::prelude::*; /// Generate an unique smart contract using the provided index as a sort-of indetifier fn smart_contract(index: u8) -> T::SmartContract { diff --git a/pallets/dapp-staking-v3/Cargo.toml b/pallets/dapp-staking-v3/Cargo.toml index c79755828d..84b1535999 100644 --- a/pallets/dapp-staking-v3/Cargo.toml +++ b/pallets/dapp-staking-v3/Cargo.toml @@ -15,7 +15,7 @@ num-traits = { workspace = true } parity-scale-codec = { workspace = true } scale-info = { workspace = true } -serde = { workspace = true, optional = true } +serde = { workspace = true } sp-arithmetic = { workspace = true } sp-core = { workspace = true } sp-io = { workspace = true } @@ -33,7 +33,7 @@ pallet-balances = { workspace = true } [features] default = ["std"] std = [ - "serde", + "serde/std", "log/std", "parity-scale-codec/std", "scale-info/std", diff --git a/pallets/dapp-staking-v3/src/benchmarking/mod.rs b/pallets/dapp-staking-v3/src/benchmarking/mod.rs index fc08855563..804db87432 100644 --- a/pallets/dapp-staking-v3/src/benchmarking/mod.rs +++ b/pallets/dapp-staking-v3/src/benchmarking/mod.rs @@ -23,6 +23,7 @@ use frame_benchmarking::v2::*; use frame_support::assert_ok; use frame_system::{Pallet as System, RawOrigin}; +use sp_std::prelude::*; use ::assert_matches::assert_matches; diff --git a/pallets/dapp-staking-v3/src/types.rs b/pallets/dapp-staking-v3/src/types.rs index 870e00223f..16e9747e18 100644 --- a/pallets/dapp-staking-v3/src/types.rs +++ b/pallets/dapp-staking-v3/src/types.rs @@ -66,6 +66,7 @@ use frame_support::{pallet_prelude::*, BoundedBTreeMap, BoundedVec}; use parity_scale_codec::{Decode, Encode}; +use serde::{Serialize, Deserialize} use sp_arithmetic::fixed_point::FixedU64; use sp_runtime::{ traits::{CheckedAdd, UniqueSaturatedInto, Zero}, @@ -1370,8 +1371,20 @@ where } /// Description of tier entry requirement. -#[derive(Encode, Decode, MaxEncodedLen, Copy, Clone, Debug, PartialEq, Eq, TypeInfo)] -#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] +#[derive( + Encode, + Decode, + MaxEncodedLen, + Copy, + Clone, + Debug, + PartialEq, + Eq, + TypeInfo, + Serialize, + Deserialize, +)] +// #[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] pub enum TierThreshold { /// Entry into tier is mandated by minimum amount of staked funds. /// Value is fixed, and is not expected to change in between periods. @@ -1530,7 +1543,7 @@ impl> TiersConfiguration { // All vector length must match number of tiers. && number_of_tiers == self.reward_portion.len() && number_of_tiers == self.tier_thresholds.len() - // Total number of slots must match the sum of slots per tier. + // Total number of slots must match the sum of slots per tier. && self.slots_per_tier.iter().fold(0, |acc, x| acc + x) == self.number_of_slots } diff --git a/pallets/dynamic-evm-base-fee/Cargo.toml b/pallets/dynamic-evm-base-fee/Cargo.toml index 864a03b054..c6ecb9208e 100644 --- a/pallets/dynamic-evm-base-fee/Cargo.toml +++ b/pallets/dynamic-evm-base-fee/Cargo.toml @@ -19,6 +19,7 @@ frame-system = { workspace = true } pallet-transaction-payment = { workspace = true } sp-core = { workspace = true } sp-runtime = { workspace = true } +sp-std = { workspace = true } # Frontier fp-evm = { workspace = true } @@ -40,6 +41,7 @@ std = [ "frame-system/std", "sp-core/std", "sp-runtime/std", + "sp-std/std", "pallet-transaction-payment/std", "pallet-balances/std", "pallet-timestamp/std", diff --git a/pallets/dynamic-evm-base-fee/src/benchmarking.rs b/pallets/dynamic-evm-base-fee/src/benchmarking.rs index 6b1312e97f..8c3d63e1b4 100644 --- a/pallets/dynamic-evm-base-fee/src/benchmarking.rs +++ b/pallets/dynamic-evm-base-fee/src/benchmarking.rs @@ -22,6 +22,7 @@ use fp_evm::FeeCalculator; use frame_benchmarking::v2::*; use frame_support::traits::Hooks; use frame_system::{pallet_prelude::*, RawOrigin}; +use sp_std::prelude::*; #[benchmarks( where diff --git a/pallets/ethereum-checked/src/benchmarking.rs b/pallets/ethereum-checked/src/benchmarking.rs index 6abf9f8075..ec189dff52 100644 --- a/pallets/ethereum-checked/src/benchmarking.rs +++ b/pallets/ethereum-checked/src/benchmarking.rs @@ -20,6 +20,7 @@ use super::*; use astar_primitives::ethereum_checked::EthereumTxInput; use frame_benchmarking::v2::*; +use sp_std::prelude::*; #[benchmarks] mod benchmarks { diff --git a/pallets/inflation/src/benchmarking.rs b/pallets/inflation/src/benchmarking.rs index 857e77593d..83fc78d693 100644 --- a/pallets/inflation/src/benchmarking.rs +++ b/pallets/inflation/src/benchmarking.rs @@ -21,6 +21,7 @@ use super::*; use astar_primitives::BlockNumber; use frame_benchmarking::v2::*; use frame_system::{Pallet as System, RawOrigin}; +use sp_std::prelude::*; /// Assert that the last event equals the provided one. fn assert_last_event(generic_event: ::RuntimeEvent) { diff --git a/pallets/inflation/src/lib.rs b/pallets/inflation/src/lib.rs index 5bcf460055..0164cfdc42 100644 --- a/pallets/inflation/src/lib.rs +++ b/pallets/inflation/src/lib.rs @@ -110,6 +110,7 @@ use frame_support::{ DefaultNoBound, }; use frame_system::{ensure_root, pallet_prelude::*}; +use serde::{Deserialize, Serialize}; use sp_runtime::{traits::CheckedAdd, Perquintill}; use sp_std::marker::PhantomData; @@ -518,8 +519,20 @@ pub struct InflationConfiguration { /// Inflation parameters. /// /// The parts of the inflation that go towards different purposes must add up to exactly 100%. -#[derive(Encode, Decode, MaxEncodedLen, Copy, Clone, Debug, PartialEq, Eq, TypeInfo)] -#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] +#[derive( + Encode, + Decode, + MaxEncodedLen, + Copy, + Clone, + Debug, + PartialEq, + Eq, + TypeInfo, + Serialize, + Deserialize, +)] +// #[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] pub struct InflationParameters { /// Maximum possible inflation rate, based on the total issuance at some point in time. /// From this value, all the other inflation parameters are derived. diff --git a/pallets/unified-accounts/src/benchmarking.rs b/pallets/unified-accounts/src/benchmarking.rs index a781b8abb4..8b2dff2b15 100644 --- a/pallets/unified-accounts/src/benchmarking.rs +++ b/pallets/unified-accounts/src/benchmarking.rs @@ -22,6 +22,7 @@ use super::*; use frame_benchmarking::v2::*; use frame_support::assert_ok; use frame_system::RawOrigin; +use sp_std::prelude::*; /// Assert that the last event equals the provided one. fn assert_last_event(generic_event: ::RuntimeEvent) { diff --git a/primitives/src/lib.rs b/primitives/src/lib.rs index bca98006df..7f7ed3302e 100644 --- a/primitives/src/lib.rs +++ b/primitives/src/lib.rs @@ -77,8 +77,6 @@ pub type Hash = sp_core::H256; /// [2^64; 2^128-1] Ecosystem assets /// 2^128-1 Relay chain token (KSM) pub type AssetId = u128; -/// Index of a transaction in the chain. -pub type Index = u32; /// Block type. pub type Block = sp_runtime::generic::Block; /// Index of a transaction in the chain. diff --git a/runtime/astar/src/lib.rs b/runtime/astar/src/lib.rs index 3dedf85630..b69c5560e4 100644 --- a/runtime/astar/src/lib.rs +++ b/runtime/astar/src/lib.rs @@ -25,7 +25,7 @@ pub use crate::precompiles::WhitelistedCalls; pub use astar_primitives::{ evm::EvmRevertCodeHandler, xcm::AssetLocationIdConverter, AccountId, Address, AssetId, Balance, - BlockNumber, Hash, Header, Index, Signature, + BlockNumber, Hash, Header, Nonce, Signature, }; use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; use frame_support::{ @@ -224,7 +224,7 @@ impl frame_system::Config for Runtime { /// The lookup mechanism to get account ID from whatever is passed in dispatchers. type Lookup = AccountIdLookup; /// The index type for storing how many extrinsics an account has signed. - type Index = Index; + type Index = Nonce; /// The index type for blocks. type BlockNumber = BlockNumber; /// The type for hashing blocks and tries. @@ -1217,8 +1217,8 @@ impl_runtime_apis! { } } - impl frame_system_rpc_runtime_api::AccountNonceApi for Runtime { - fn account_nonce(account: AccountId) -> Index { + impl frame_system_rpc_runtime_api::AccountNonceApi for Runtime { + fn account_nonce(account: AccountId) -> Nonce { System::account_nonce(account) } } diff --git a/runtime/local/src/lib.rs b/runtime/local/src/lib.rs index 99adbc6c84..4d4555bafd 100644 --- a/runtime/local/src/lib.rs +++ b/runtime/local/src/lib.rs @@ -63,7 +63,7 @@ use sp_std::{collections::btree_map::BTreeMap, prelude::*}; use astar_primitives::{ dapp_staking::{CycleConfiguration, DAppId, EraNumber, PeriodNumber, SmartContract, TierId}, evm::{EvmRevertCodeHandler, HashedDefaultMappings}, - Address, AssetId, Balance, BlockNumber, Hash, Header, Index, + Address, AssetId, Balance, BlockNumber, Hash, Header, Nonce, }; pub use astar_primitives::{AccountId, Signature}; @@ -207,7 +207,7 @@ impl frame_system::Config for Runtime { /// The lookup mechanism to get account ID from whatever is passed in dispatchers. type Lookup = (AccountIdLookup, UnifiedAccounts); /// The index type for storing how many extrinsics an account has signed. - type Nonce = Index; + type Nonce = Nonce; /// The index type for blocks. type Block = Block; /// The type for hashing blocks and tries. @@ -1365,8 +1365,8 @@ impl_runtime_apis! { } } - impl frame_system_rpc_runtime_api::AccountNonceApi for Runtime { - fn account_nonce(account: AccountId) -> Index { + impl frame_system_rpc_runtime_api::AccountNonceApi for Runtime { + fn account_nonce(account: AccountId) -> Nonce { System::account_nonce(account) } } diff --git a/runtime/shibuya/src/lib.rs b/runtime/shibuya/src/lib.rs index c6e969308b..3b8790d019 100644 --- a/runtime/shibuya/src/lib.rs +++ b/runtime/shibuya/src/lib.rs @@ -71,7 +71,7 @@ use astar_primitives::{ dapp_staking::{CycleConfiguration, DAppId, EraNumber, PeriodNumber, SmartContract, TierId}, evm::{EvmRevertCodeHandler, HashedDefaultMappings}, xcm::AssetLocationIdConverter, - Address, AssetId, BlockNumber, Hash, Header, Index, + Address, AssetId, BlockNumber, Hash, Header, Nonce, }; pub use astar_primitives::{AccountId, Balance, Signature}; @@ -261,16 +261,14 @@ impl frame_system::Config for Runtime { type RuntimeCall = RuntimeCall; /// The lookup mechanism to get account ID from whatever is passed in dispatchers. type Lookup = (AccountIdLookup, UnifiedAccounts); - /// The index type for storing how many extrinsics an account has signed. - type Index = Index; - /// The index type for blocks. - type BlockNumber = BlockNumber; + /// The nonce type for storing how many extrinsics an account has signed. + type Nonce = Nonce; + /// The type for blocks. + type Block = Block; /// The type for hashing blocks and tries. type Hash = Hash; /// The hashing algorithm used. type Hashing = BlakeTwo256; - /// The header type. - type Header = generic::Header; /// The ubiquitous event type. type RuntimeEvent = RuntimeEvent; /// The ubiquitous origin type. @@ -500,12 +498,16 @@ impl parachain_info::Config for Runtime {} parameter_types! { pub const MaxAuthorities: u32 = 250; + // Should be only enabled (`true`) when async backing is enabled + // otherwise set to `false` + pub const AllowMultipleBlocksPerSlot: bool = false; } impl pallet_aura::Config for Runtime { type AuthorityId = AuraId; type DisabledValidators = (); type MaxAuthorities = MaxAuthorities; + type AllowMultipleBlocksPerSlot = AllowMultipleBlocksPerSlot; } impl cumulus_pallet_aura_ext::Config for Runtime {} @@ -590,7 +592,7 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = frame_system::Pallet; type WeightInfo = weights::pallet_balances::SubstrateWeight; - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = RuntimeFreezeReason; type MaxHolds = ConstU32<0>; type MaxFreezes = ConstU32<1>; @@ -652,6 +654,9 @@ parameter_types! { pub const DepositPerByte: Balance = contracts_deposit(0, 1); // Fallback value if storage deposit limit not set by the user pub const DefaultDepositLimit: Balance = contracts_deposit(16, 16 * 1024); + // TODO: re-vist to make sure values are appropriate + pub const MaxDelegateDependencies: u32 = 32; + pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(30); pub Schedule: pallet_contracts::Schedule = Default::default(); } @@ -685,6 +690,19 @@ impl pallet_contracts::Config for Runtime { type MaxStorageKeyLen = ConstU32<128>; type UnsafeUnstableInterface = ConstBool; type MaxDebugBufferLen = ConstU32<{ 2 * 1024 * 1024 }>; + type MaxDelegateDependencies = MaxDelegateDependencies; + type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent; + type RuntimeHoldReason = RuntimeHoldReason; + type Debug = (); + type Environment = (); + // TODO: re-vist to make sure migration sequence is correct + type Migrations = ( + pallet_contracts::migration::v11::Migration, + pallet_contracts::migration::v12::Migration, + pallet_contracts::migration::v13::Migration, + pallet_contracts::migration::v14::Migration, + pallet_contracts::migration::v15::Migration, + ); } // These values are based on the Astar 2.0 Tokenomics Modeling report. @@ -1242,10 +1260,7 @@ impl pallet_unified_accounts::Config for Runtime { } construct_runtime!( - pub struct Runtime where - Block = Block, - NodeBlock = generic::Block, - UncheckedExtrinsic = UncheckedExtrinsic + pub struct Runtime { System: frame_system = 10, Utility: pallet_utility = 11, @@ -1577,8 +1592,8 @@ impl_runtime_apis! { } } - impl frame_system_rpc_runtime_api::AccountNonceApi for Runtime { - fn account_nonce(account: AccountId) -> Index { + impl frame_system_rpc_runtime_api::AccountNonceApi for Runtime { + fn account_nonce(account: AccountId) -> Nonce { System::account_nonce(account) } } @@ -2008,9 +2023,9 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result, sp_runtime::RuntimeString> { - use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch, TrackedStorageKey, BenchmarkError}; + use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch, BenchmarkError}; use frame_system_benchmarking::Pallet as SystemBench; - use frame_support::{traits::{WhitelistedStorageKeys, tokens::fungible::{ItemOf}}, assert_ok}; + use frame_support::{traits::{WhitelistedStorageKeys, TrackedStorageKey, tokens::fungible::{ItemOf}}, assert_ok}; use baseline::Pallet as BaselineBench; use xcm::latest::prelude::*; use xcm_builder::MintLocation; @@ -2021,9 +2036,7 @@ impl_runtime_apis! { // XCM Benchmarks impl astar_xcm_benchmarks::Config for Runtime {} impl astar_xcm_benchmarks::generic::Config for Runtime {} - impl astar_xcm_benchmarks::fungible::Config for Runtime { - type TrustedReserve = TrustedReserve; - } + impl astar_xcm_benchmarks::fungible::Config for Runtime {} impl pallet_xcm_benchmarks::Config for Runtime { type XcmConfig = xcm_config::XcmConfig; @@ -2075,6 +2088,9 @@ impl_runtime_apis! { ) -> Result<(MultiLocation, NetworkId, InteriorMultiLocation), BenchmarkError> { Err(BenchmarkError::Skip) } + fn alias_origin() -> Result<(MultiLocation, MultiLocation), BenchmarkError> { + Err(BenchmarkError::Skip) + } } parameter_types! { @@ -2092,6 +2108,7 @@ impl_runtime_apis! { type TransactAsset = ItemOf; type CheckedAccount = NoCheckingAccount; type TrustedTeleporter = NoTeleporter; + type TrustedReserve = TrustedReserve; fn get_multi_asset() -> MultiAsset { let min_balance = 100u128; diff --git a/runtime/shibuya/src/xcm_config.rs b/runtime/shibuya/src/xcm_config.rs index 4b91a10878..89ef809a45 100644 --- a/runtime/shibuya/src/xcm_config.rs +++ b/runtime/shibuya/src/xcm_config.rs @@ -28,31 +28,28 @@ use frame_support::{ weights::Weight, }; use frame_system::EnsureRoot; -use sp_runtime::traits::Convert; +use sp_runtime::traits::{Convert, MaybeEquivalence}; // Polkadot imports use xcm::latest::prelude::*; use xcm_builder::{ AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, ConvertedConcreteId, CurrencyAdapter, - EnsureXcmOrigin, FungiblesAdapter, IsConcrete, NoChecking, ParentAsSuperuser, ParentIsPreset, - RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, - SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, - UsingComponents, WeightInfoBounds, WithComputedOrigin, -}; -use xcm_executor::{ - traits::{Convert as XcmConvert, JustTry}, - XcmExecutor, + DescribeAllTerminal, DescribeFamily, EnsureXcmOrigin, FungiblesAdapter, HashedDescription, + IsConcrete, NoChecking, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, + SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, + SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, + WeightInfoBounds, WithComputedOrigin, }; +use xcm_executor::{traits::JustTry, XcmExecutor}; // ORML imports use orml_xcm_support::DisabledParachainFee; // Astar imports use astar_primitives::xcm::{ - AbsoluteAndRelativeReserveProvider, AccountIdToMultiLocation, DescribeAllTerminal, - DescribeFamily, FixedRateOfForeignAsset, HashedDescription, ReserveAssetFilter, - XcmFungibleFeeHandler, MAX_ASSETS, + AbsoluteAndRelativeReserveProvider, AccountIdToMultiLocation, FixedRateOfForeignAsset, + ReserveAssetFilter, XcmFungibleFeeHandler, MAX_ASSETS, }; parameter_types! { @@ -204,6 +201,7 @@ impl xcm_executor::Config for XcmConfig { type UniversalAliases = Nothing; type CallDispatcher = RuntimeCall; type SafeCallFilter = Everything; + type Aliasers = Nothing; } /// Local origins on this chain are allowed to dispatch XCM sends/executions. @@ -293,7 +291,7 @@ parameter_types! { pub struct AssetIdConvert; impl Convert> for AssetIdConvert { fn convert(asset_id: AssetId) -> Option { - ShibuyaAssetLocationIdConverter::reverse_ref(&asset_id).ok() + ShibuyaAssetLocationIdConverter::convert_back(&asset_id) } } diff --git a/runtime/shiden/src/lib.rs b/runtime/shiden/src/lib.rs index 81267a40a4..ab6a7d6863 100644 --- a/runtime/shiden/src/lib.rs +++ b/runtime/shiden/src/lib.rs @@ -68,7 +68,7 @@ use sp_std::prelude::*; pub use crate::precompiles::WhitelistedCalls; pub use astar_primitives::{ evm::EvmRevertCodeHandler, xcm::AssetLocationIdConverter, AccountId, Address, AssetId, Balance, - BlockNumber, Hash, Header, Index, Signature, + BlockNumber, Hash, Header, Nonce, Signature, }; pub use pallet_block_rewards_hybrid::RewardDistributionConfig; use pallet_evm_precompile_assets_erc20::AddressToAssetId; @@ -226,7 +226,7 @@ impl frame_system::Config for Runtime { /// The lookup mechanism to get account ID from whatever is passed in dispatchers. type Lookup = AccountIdLookup; /// The index type for storing how many extrinsics an account has signed. - type Index = Index; + type Index = Nonce; /// The index type for blocks. type BlockNumber = BlockNumber; /// The type for hashing blocks and tries. @@ -1213,8 +1213,8 @@ impl_runtime_apis! { } } - impl frame_system_rpc_runtime_api::AccountNonceApi for Runtime { - fn account_nonce(account: AccountId) -> Index { + impl frame_system_rpc_runtime_api::AccountNonceApi for Runtime { + fn account_nonce(account: AccountId) -> Nonce { System::account_nonce(account) } } From 5aa04334b1310216579092708be022841dc2aec3 Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Wed, 7 Feb 2024 11:33:26 +0530 Subject: [PATCH 10/29] feat: fix local runtime --- pallets/dapp-staking-v3/src/types.rs | 2 +- runtime/local/src/lib.rs | 25 +++++++++++++++---------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/pallets/dapp-staking-v3/src/types.rs b/pallets/dapp-staking-v3/src/types.rs index 16e9747e18..6f49ac0f6e 100644 --- a/pallets/dapp-staking-v3/src/types.rs +++ b/pallets/dapp-staking-v3/src/types.rs @@ -66,7 +66,7 @@ use frame_support::{pallet_prelude::*, BoundedBTreeMap, BoundedVec}; use parity_scale_codec::{Decode, Encode}; -use serde::{Serialize, Deserialize} +use serde::{Serialize, Deserialize}; use sp_arithmetic::fixed_point::FixedU64; use sp_runtime::{ traits::{CheckedAdd, UniqueSaturatedInto, Zero}, diff --git a/runtime/local/src/lib.rs b/runtime/local/src/lib.rs index 4d4555bafd..aaaa88a5da 100644 --- a/runtime/local/src/lib.rs +++ b/runtime/local/src/lib.rs @@ -206,9 +206,9 @@ impl frame_system::Config for Runtime { type RuntimeCall = RuntimeCall; /// The lookup mechanism to get account ID from whatever is passed in dispatchers. type Lookup = (AccountIdLookup, UnifiedAccounts); - /// The index type for storing how many extrinsics an account has signed. + /// The nonce type for storing how many extrinsics an account has signed. type Nonce = Nonce; - /// The index type for blocks. + /// The type for blocks. type Block = Block; /// The type for hashing blocks and tries. type Hash = Hash; @@ -245,13 +245,14 @@ impl frame_system::Config for Runtime { parameter_types! { pub const MaxAuthorities: u32 = 50; + pub const AllowMultipleBlocksPerSlot: bool = false; } impl pallet_aura::Config for Runtime { type AuthorityId = AuraId; type DisabledValidators = (); type MaxAuthorities = ConstU32<50>; - type AllowMultipleBlocksPerSlot = ConstBool; + type AllowMultipleBlocksPerSlot = AllowMultipleBlocksPerSlot; } impl pallet_grandpa::Config for Runtime { @@ -652,7 +653,7 @@ parameter_types! { pub BlockGasLimit: U256 = U256::from( NORMAL_DISPATCH_RATIO * WEIGHT_REF_TIME_PER_SECOND / WEIGHT_PER_GAS ); - pub PrecompilesValue: Precompiles = LocalPrecompiles::::new(); + pub PrecompilesValue: Precompiles = LocalPrecompiles::<_>::new(); pub WeightPerGas: Weight = Weight::from_parts(WEIGHT_PER_GAS, 0); /// The amount of gas per PoV size. Value is calculated as: /// @@ -897,6 +898,7 @@ parameter_types! { pub const DepositPerByte: Balance = deposit(0, 1); // Fallback value if storage deposit limit not set by the user pub const DefaultDepositLimit: Balance = deposit(16, 16 * 1024); + // TODO: re-vist to make sure values are appropriate pub const MaxDelegateDependencies: u32 = 32; pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(30); pub Schedule: pallet_contracts::Schedule = Default::default(); @@ -908,7 +910,6 @@ impl pallet_contracts::Config for Runtime { type Currency = Balances; type RuntimeEvent = RuntimeEvent; type RuntimeCall = RuntimeCall; - type RuntimeHoldReason = RuntimeHoldReason; /// The safest default is to allow no calls at all. /// /// Runtimes should whitelist dispatchables that are allowed to be called from contracts @@ -936,6 +937,7 @@ impl pallet_contracts::Config for Runtime { type MaxDebugBufferLen = ConstU32<{ 2 * 1024 * 1024 }>; type MaxDelegateDependencies = MaxDelegateDependencies; type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent; + type RuntimeHoldReason = RuntimeHoldReason; type Debug = (); type Environment = (); type Migrations = (); @@ -1090,8 +1092,11 @@ impl pallet_proxy::Config for Runtime { type AnnouncementDepositFactor = ConstU128<{ MILLIAST * 660 }>; } +// TODO: remove this once https://github.com/paritytech/substrate/issues/12161 is resolved +#[rustfmt::skip] construct_runtime!( - pub struct Runtime { + pub struct Runtime + { System: frame_system, Utility: pallet_utility, Timestamp: pallet_timestamp, @@ -1115,8 +1120,8 @@ construct_runtime!( Assets: pallet_assets, Scheduler: pallet_scheduler, Democracy: pallet_democracy, - Council: pallet_collective, - TechnicalCommittee: pallet_collective, + Council: pallet_collective::, + TechnicalCommittee: pallet_collective::, Treasury: pallet_treasury, Xvm: pallet_xvm, Proxy: pallet_proxy, @@ -1775,14 +1780,14 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result, sp_runtime::RuntimeString> { - use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch, TrackedStorageKey}; + use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch}; use frame_system_benchmarking::Pallet as SystemBench; use baseline::Pallet as BaselineBench; impl frame_system_benchmarking::Config for Runtime {} impl baseline::Config for Runtime {} - use frame_support::traits::WhitelistedStorageKeys; + use frame_support::traits::{WhitelistedStorageKeys, TrackedStorageKey}; let whitelist: Vec = AllPalletsWithSystem::whitelisted_storage_keys(); let mut batches = Vec::::new(); From 035fedab0930a6b7712e400176c85ab7cf34f143 Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Wed, 7 Feb 2024 16:40:09 +0530 Subject: [PATCH 11/29] feat: fix holds --- chain-extensions/pallet-assets/src/mock.rs | 2 +- pallets/astar-xcm-benchmarks/src/mock.rs | 2 +- pallets/inflation/src/mock.rs | 2 +- precompiles/xcm/src/mock.rs | 2 +- primitives/src/xcm/tests.rs | 83 ++++++++++++++-------- 5 files changed, 57 insertions(+), 34 deletions(-) diff --git a/chain-extensions/pallet-assets/src/mock.rs b/chain-extensions/pallet-assets/src/mock.rs index 3b12da52cd..c6fed3656e 100644 --- a/chain-extensions/pallet-assets/src/mock.rs +++ b/chain-extensions/pallet-assets/src/mock.rs @@ -137,7 +137,7 @@ impl pallet_balances::Config for Test { type WeightInfo = (); type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = (); - type MaxHolds = ConstU32<10>; + type MaxHolds = ConstU32<1>; type MaxFreezes = ConstU32<0>; } diff --git a/pallets/astar-xcm-benchmarks/src/mock.rs b/pallets/astar-xcm-benchmarks/src/mock.rs index d345cec9cf..28a78e0028 100644 --- a/pallets/astar-xcm-benchmarks/src/mock.rs +++ b/pallets/astar-xcm-benchmarks/src/mock.rs @@ -245,7 +245,7 @@ impl xcm_executor::Config for XcmConfig { type UniversalAliases = Nothing; type CallDispatcher = RuntimeCall; type SafeCallFilter = Everything; - type Aliasers = (); + type Aliasers = Nothing; } impl pallet_xcm_benchmarks::Config for Test { diff --git a/pallets/inflation/src/mock.rs b/pallets/inflation/src/mock.rs index 9d699b4f43..96f04dab19 100644 --- a/pallets/inflation/src/mock.rs +++ b/pallets/inflation/src/mock.rs @@ -35,7 +35,7 @@ use sp_runtime::{ BuildStorage, Perquintill, }; -use astar_primitives::{testing::Header, Balance, BlockNumber}; +use astar_primitives::{Balance, BlockNumber}; pub(crate) type AccountId = u64; /// Initial inflation params set by the mock. diff --git a/precompiles/xcm/src/mock.rs b/precompiles/xcm/src/mock.rs index e0ac9c1458..1b6554a1ca 100644 --- a/precompiles/xcm/src/mock.rs +++ b/precompiles/xcm/src/mock.rs @@ -447,7 +447,7 @@ impl xcm_executor::Config for XcmConfig { type UniversalAliases = Nothing; type CallDispatcher = RuntimeCall; type SafeCallFilter = Everything; - type Aliasers = (); + type Aliasers = Nothing; } parameter_types! { diff --git a/primitives/src/xcm/tests.rs b/primitives/src/xcm/tests.rs index 21dcfbeaef..86f5c70fdd 100644 --- a/primitives/src/xcm/tests.rs +++ b/primitives/src/xcm/tests.rs @@ -18,8 +18,9 @@ use super::*; use frame_support::assert_ok; -use sp_runtime::traits::Zero; -use xcm_executor::traits::Convert; +use sp_runtime::traits::{MaybeEquivalence, Zero}; +use xcm_builder::{DescribeAllTerminal, DescribeFamily, HashedDescription}; +use xcm_executor::traits::ConvertLocation; type AssetId = u128; @@ -79,22 +80,22 @@ fn execution_fee(weight: Weight, units_per_second: u128) -> u128 { fn asset_location_to_id() { // Test cases where the MultiLocation is valid assert_eq!( - AssetLocationIdConverter::::convert_ref(PARENT), - Ok(u128::MAX) + AssetLocationIdConverter::::convert(&PARENT), + Some(u128::MAX) ); assert_eq!( - AssetLocationIdConverter::::convert_ref(PARACHAIN), - Ok(20) + AssetLocationIdConverter::::convert(&PARACHAIN), + Some(20) ); assert_eq!( - AssetLocationIdConverter::::convert_ref(GENERAL_INDEX), - Ok(30) + AssetLocationIdConverter::::convert(&GENERAL_INDEX), + Some(30) ); // Test case where MultiLocation isn't supported assert_eq!( - AssetLocationIdConverter::::convert_ref(MultiLocation::here()), - Err(()) + AssetLocationIdConverter::::convert(&MultiLocation::here()), + None ); } @@ -102,22 +103,22 @@ fn asset_location_to_id() { fn asset_id_to_location() { // Test cases where the AssetId is valid assert_eq!( - AssetLocationIdConverter::::reverse_ref(u128::MAX), - Ok(PARENT) + AssetLocationIdConverter::::convert_back(&u128::MAX), + Some(PARENT) ); assert_eq!( - AssetLocationIdConverter::::reverse_ref(20), - Ok(PARACHAIN) + AssetLocationIdConverter::::convert_back(&20), + Some(PARACHAIN) ); assert_eq!( - AssetLocationIdConverter::::reverse_ref(30), - Ok(GENERAL_INDEX) + AssetLocationIdConverter::::convert_back(&30), + Some(GENERAL_INDEX) ); // Test case where the AssetId isn't supported assert_eq!( - AssetLocationIdConverter::::reverse_ref(0), - Err(()) + AssetLocationIdConverter::::convert_back(&0), + None ); } @@ -132,6 +133,12 @@ fn fixed_rate_of_foreign_asset_buy_is_ok() { fun: Fungibility::Fungible(total_payment), }; let weight: Weight = Weight::from_parts(1_000_000_000, 0); + let ctx = XcmContext { + // arbitary ML + origin: Some(MultiLocation::here()), + message_id: XcmHash::default(), + topic: None, + }; // Calculate the expected execution fee for the execution weight let expected_execution_fee = execution_fee( @@ -141,7 +148,7 @@ fn fixed_rate_of_foreign_asset_buy_is_ok() { assert!(expected_execution_fee > 0); // sanity check // 1. Buy weight and expect it to be successful - let result = fixed_rate_trader.buy_weight(weight, payment_multi_asset.clone().into()); + let result = fixed_rate_trader.buy_weight(weight, payment_multi_asset.clone().into(), &ctx); if let Ok(assets) = result { // We expect only one unused payment asset and specific amount assert_eq!(assets.len(), 1); @@ -172,7 +179,7 @@ fn fixed_rate_of_foreign_asset_buy_is_ok() { ); assert!(expected_execution_fee > 0); // sanity check - let result = fixed_rate_trader.buy_weight(weight, payment_multi_asset.clone().into()); + let result = fixed_rate_trader.buy_weight(weight, payment_multi_asset.clone().into(), &ctx); if let Ok(assets) = result { // We expect only one unused payment asset and specific amount assert_eq!(assets.len(), 1); @@ -213,7 +220,7 @@ fn fixed_rate_of_foreign_asset_buy_is_ok() { ); assert!(expected_execution_fee > 0); // sanity check - let result = fixed_rate_trader.buy_weight(weight, payment_multi_asset.clone().into()); + let result = fixed_rate_trader.buy_weight(weight, payment_multi_asset.clone().into(), &ctx); if let Ok(assets) = result { // We expect only one unused payment asset and specific amount assert_eq!(assets.len(), 1); @@ -248,6 +255,12 @@ fn fixed_rate_of_foreign_asset_buy_execution_fails() { fun: Fungibility::Fungible(total_payment), }; let weight: Weight = Weight::from_parts(3_000_000_000, 0); + let ctx = XcmContext { + // arbitary ML + origin: Some(MultiLocation::here()), + message_id: XcmHash::default(), + topic: None, + }; // Calculate the expected execution fee for the execution weight let expected_execution_fee = execution_fee( @@ -259,7 +272,7 @@ fn fixed_rate_of_foreign_asset_buy_execution_fails() { // Expect failure because we lack the required funds assert_eq!( - fixed_rate_trader.buy_weight(weight, payment_multi_asset.clone().into()), + fixed_rate_trader.buy_weight(weight, payment_multi_asset.clone().into(), &ctx), Err(XcmError::TooExpensive) ); @@ -269,7 +282,7 @@ fn fixed_rate_of_foreign_asset_buy_execution_fails() { fun: Fungibility::Fungible(total_payment), }; assert_eq!( - fixed_rate_trader.buy_weight(Weight::zero(), payment_multi_asset.clone().into()), + fixed_rate_trader.buy_weight(Weight::zero(), payment_multi_asset.clone().into(), &ctx), Err(XcmError::TooExpensive) ); } @@ -285,6 +298,12 @@ fn fixed_rate_of_foreign_asset_refund_is_ok() { fun: Fungibility::Fungible(total_payment), }; let weight: Weight = Weight::from_parts(1_000_000_000, 0); + let ctx = XcmContext { + // arbitary ML + origin: Some(MultiLocation::here()), + message_id: XcmHash::default(), + topic: None, + }; // Calculate the expected execution fee for the execution weight and buy it let expected_execution_fee = execution_fee( @@ -292,14 +311,14 @@ fn fixed_rate_of_foreign_asset_refund_is_ok() { ExecutionPayment::get_units_per_second(PARENT).unwrap(), ); assert!(expected_execution_fee > 0); // sanity check - assert_ok!(fixed_rate_trader.buy_weight(weight, payment_multi_asset.clone().into())); + assert_ok!(fixed_rate_trader.buy_weight(weight, payment_multi_asset.clone().into(), &ctx)); // Refund quarter and expect it to pass let weight_to_refund = weight / 4; let assets_to_refund = expected_execution_fee / 4; let (old_weight, old_consumed) = (fixed_rate_trader.weight, fixed_rate_trader.consumed); - let result = fixed_rate_trader.refund_weight(weight_to_refund); + let result = fixed_rate_trader.refund_weight(weight_to_refund, &ctx); if let Some(asset_location) = result { assert_eq!(asset_location, (PARENT, assets_to_refund).into()); @@ -310,7 +329,7 @@ fn fixed_rate_of_foreign_asset_refund_is_ok() { // Refund more than remains and expect it to pass (saturated) let assets_to_refund = fixed_rate_trader.consumed; - let result = fixed_rate_trader.refund_weight(weight + Weight::from_parts(10000, 0)); + let result = fixed_rate_trader.refund_weight(weight + Weight::from_parts(10000, 0), &ctx); if let Some(asset_location) = result { assert_eq!(asset_location, (PARENT, assets_to_refund).into()); @@ -423,10 +442,12 @@ fn hashed_description_sanity_check() { }; // Ensure derived value is same as it would be using `polkadot-v0.9.44` code. let derived_account = - HashedDescription::<[u8; 32], DescribeFamily>::convert(acc_key_20_mul); + HashedDescription::<[u8; 32], DescribeFamily>::convert_location( + &acc_key_20_mul, + ); assert_eq!( derived_account, - Ok([ + Some([ 61_u8, 117, 247, 231, 100, 219, 128, 176, 180, 200, 187, 102, 93, 107, 187, 145, 25, 146, 50, 248, 244, 153, 83, 95, 207, 165, 90, 10, 220, 39, 23, 49 ]) @@ -444,10 +465,12 @@ fn hashed_description_sanity_check() { }; // Ensure derived value is same as it would be using `polkadot-v0.9.44` code. let derived_account = - HashedDescription::<[u8; 32], DescribeFamily>::convert(acc_id_32_mul); + HashedDescription::<[u8; 32], DescribeFamily>::convert_location( + &acc_id_32_mul, + ); assert_eq!( derived_account, - Ok([ + Some([ 123, 171, 79, 159, 78, 47, 62, 233, 108, 149, 131, 249, 23, 192, 178, 52, 235, 133, 147, 145, 152, 89, 129, 92, 63, 79, 211, 235, 213, 152, 201, 205 ]) From 709390f25c4bd4a78bb6528ca24d04e58df77246 Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Wed, 7 Feb 2024 16:40:27 +0530 Subject: [PATCH 12/29] feat: update astar and shiden runtime --- runtime/astar/Cargo.toml | 1 + runtime/astar/src/lib.rs | 43 +++++++++++++++++++++----------- runtime/astar/src/xcm_config.rs | 7 +++--- runtime/shibuya/src/lib.rs | 4 +-- runtime/shiden/src/lib.rs | 43 +++++++++++++++++++++----------- runtime/shiden/src/xcm_config.rs | 21 ++++++++-------- 6 files changed, 76 insertions(+), 43 deletions(-) diff --git a/runtime/astar/Cargo.toml b/runtime/astar/Cargo.toml index edc91edf72..e1e4feadad 100644 --- a/runtime/astar/Cargo.toml +++ b/runtime/astar/Cargo.toml @@ -174,6 +174,7 @@ std = [ "pallet-sudo/std", "pallet-transaction-payment/std", "pallet-transaction-payment-rpc-runtime-api/std", + 'pallet-collective/std', "pallet-xcm/std", "parachain-info/std", "polkadot-parachain/std", diff --git a/runtime/astar/src/lib.rs b/runtime/astar/src/lib.rs index b69c5560e4..d9e993e3b7 100644 --- a/runtime/astar/src/lib.rs +++ b/runtime/astar/src/lib.rs @@ -223,16 +223,14 @@ impl frame_system::Config for Runtime { type RuntimeCall = RuntimeCall; /// The lookup mechanism to get account ID from whatever is passed in dispatchers. type Lookup = AccountIdLookup; - /// The index type for storing how many extrinsics an account has signed. - type Index = Nonce; - /// The index type for blocks. - type BlockNumber = BlockNumber; + /// The nonce type for storing how many extrinsics an account has signed. + type Nonce = Nonce; + /// The type for blocks. + type Block = Block; /// The type for hashing blocks and tries. type Hash = Hash; /// The hashing algorithm used. type Hashing = BlakeTwo256; - /// The header type. - type Header = generic::Header; /// The ubiquitous event type. type RuntimeEvent = RuntimeEvent; /// The ubiquitous origin type. @@ -384,12 +382,16 @@ impl parachain_info::Config for Runtime {} parameter_types! { pub const MaxAuthorities: u32 = 250; + // Should be only enabled (`true`) when async backing is enabled + // otherwise set to `false` + pub const AllowMultipleBlocksPerSlot: bool = false; } impl pallet_aura::Config for Runtime { type AuthorityId = AuraId; type DisabledValidators = (); type MaxAuthorities = MaxAuthorities; + type AllowMultipleBlocksPerSlot = AllowMultipleBlocksPerSlot; } impl cumulus_pallet_aura_ext::Config for Runtime {} @@ -509,9 +511,9 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = frame_system::Pallet; type WeightInfo = pallet_balances::weights::SubstrateWeight; - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = (); - type MaxHolds = ConstU32<0>; + type MaxHolds = ConstU32<1>; type MaxFreezes = ConstU32<0>; } @@ -591,6 +593,9 @@ parameter_types! { pub const DepositPerByte: Balance = contracts_deposit(0, 1); // Fallback value if storage deposit limit not set by the user pub const DefaultDepositLimit: Balance = contracts_deposit(16, 16 * 1024); + // TODO: re-vist to make sure values are appropriate + pub const MaxDelegateDependencies: u32 = 32; + pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(30); pub Schedule: pallet_contracts::Schedule = Default::default(); } @@ -611,6 +616,7 @@ impl pallet_contracts::Config for Runtime { type Currency = Balances; type RuntimeEvent = RuntimeEvent; type RuntimeCall = RuntimeCall; + type RuntimeHoldReason = RuntimeHoldReason; /// The safest default is to allow no calls at all. /// /// Runtimes should whitelist dispatchables that are allowed to be called from contracts @@ -631,6 +637,18 @@ impl pallet_contracts::Config for Runtime { type MaxStorageKeyLen = ConstU32<128>; type UnsafeUnstableInterface = ConstBool; type MaxDebugBufferLen = ConstU32<{ 2 * 1024 * 1024 }>; + type MaxDelegateDependencies = MaxDelegateDependencies; + type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent; + type Debug = (); + type Environment = (); + // TODO: re-vist to make sure migration sequence is correct + type Migrations = ( + pallet_contracts::migration::v11::Migration, + pallet_contracts::migration::v12::Migration, + pallet_contracts::migration::v13::Migration, + pallet_contracts::migration::v14::Migration, + pallet_contracts::migration::v15::Migration, + ); } // These values are based on the Astar 2.0 Tokenomics Modeling report. @@ -979,10 +997,7 @@ impl pallet_proxy::Config for Runtime { } construct_runtime!( - pub struct Runtime where - Block = Block, - NodeBlock = generic::Block, - UncheckedExtrinsic = UncheckedExtrinsic + pub struct Runtime { System: frame_system = 10, Utility: pallet_utility = 11, @@ -1620,14 +1635,14 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result, sp_runtime::RuntimeString> { - use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch, TrackedStorageKey}; + use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch}; use frame_system_benchmarking::Pallet as SystemBench; use baseline::Pallet as BaselineBench; impl frame_system_benchmarking::Config for Runtime {} impl baseline::Config for Runtime {} - use frame_support::traits::WhitelistedStorageKeys; + use frame_support::traits::{WhitelistedStorageKeys, TrackedStorageKey}; let whitelist: Vec = AllPalletsWithSystem::whitelisted_storage_keys(); let mut batches = Vec::::new(); diff --git a/runtime/astar/src/xcm_config.rs b/runtime/astar/src/xcm_config.rs index 8cc1ba9c06..536d395bc9 100644 --- a/runtime/astar/src/xcm_config.rs +++ b/runtime/astar/src/xcm_config.rs @@ -28,7 +28,7 @@ use frame_support::{ weights::Weight, }; use frame_system::EnsureRoot; -use sp_runtime::traits::Convert; +use sp_runtime::traits::{Convert, MaybeEquivalence}; // Polkadot imports use xcm::latest::prelude::*; @@ -41,7 +41,7 @@ use xcm_builder::{ SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, }; use xcm_executor::{ - traits::{Convert as XcmConvert, JustTry, WithOriginFilter}, + traits::{JustTry, WithOriginFilter}, XcmExecutor, }; @@ -268,6 +268,7 @@ impl xcm_executor::Config for XcmConfig { type UniversalAliases = Nothing; type CallDispatcher = WithOriginFilter; type SafeCallFilter = SafeCallFilter; + type Aliasers = Nothing; } /// Local origins on this chain are allowed to dispatch XCM sends/executions. @@ -360,7 +361,7 @@ parameter_types! { pub struct AssetIdConvert; impl Convert> for AssetIdConvert { fn convert(asset_id: AssetId) -> Option { - AstarAssetLocationIdConverter::reverse_ref(&asset_id).ok() + AstarAssetLocationIdConverter::convert_back(&asset_id) } } diff --git a/runtime/shibuya/src/lib.rs b/runtime/shibuya/src/lib.rs index 3b8790d019..c5bc3444dc 100644 --- a/runtime/shibuya/src/lib.rs +++ b/runtime/shibuya/src/lib.rs @@ -594,7 +594,7 @@ impl pallet_balances::Config for Runtime { type WeightInfo = weights::pallet_balances::SubstrateWeight; type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = RuntimeFreezeReason; - type MaxHolds = ConstU32<0>; + type MaxHolds = ConstU32<1>; type MaxFreezes = ConstU32<1>; } @@ -666,6 +666,7 @@ impl pallet_contracts::Config for Runtime { type Currency = Balances; type RuntimeEvent = RuntimeEvent; type RuntimeCall = RuntimeCall; + type RuntimeHoldReason = RuntimeHoldReason; /// The safest default is to allow no calls at all. /// /// Runtimes should whitelist dispatchables that are allowed to be called from contracts @@ -692,7 +693,6 @@ impl pallet_contracts::Config for Runtime { type MaxDebugBufferLen = ConstU32<{ 2 * 1024 * 1024 }>; type MaxDelegateDependencies = MaxDelegateDependencies; type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent; - type RuntimeHoldReason = RuntimeHoldReason; type Debug = (); type Environment = (); // TODO: re-vist to make sure migration sequence is correct diff --git a/runtime/shiden/src/lib.rs b/runtime/shiden/src/lib.rs index ab6a7d6863..b55bcaae5b 100644 --- a/runtime/shiden/src/lib.rs +++ b/runtime/shiden/src/lib.rs @@ -225,16 +225,14 @@ impl frame_system::Config for Runtime { type RuntimeCall = RuntimeCall; /// The lookup mechanism to get account ID from whatever is passed in dispatchers. type Lookup = AccountIdLookup; - /// The index type for storing how many extrinsics an account has signed. - type Index = Nonce; - /// The index type for blocks. - type BlockNumber = BlockNumber; + /// The nonce type for storing how many extrinsics an account has signed. + type Nonce = Nonce; + /// The type for blocks. + type Block = Block; /// The type for hashing blocks and tries. type Hash = Hash; /// The hashing algorithm used. type Hashing = BlakeTwo256; - /// The header type. - type Header = generic::Header; /// The ubiquitous event type. type RuntimeEvent = RuntimeEvent; /// The ubiquitous origin type. @@ -387,12 +385,16 @@ impl parachain_info::Config for Runtime {} parameter_types! { pub const MaxAuthorities: u32 = 250; + // Should be only enabled (`true`) when async backing is enabled + // otherwise set to `false` + pub const AllowMultipleBlocksPerSlot: bool = false; } impl pallet_aura::Config for Runtime { type AuthorityId = AuraId; type DisabledValidators = (); type MaxAuthorities = MaxAuthorities; + type AllowMultipleBlocksPerSlot = AllowMultipleBlocksPerSlot; } impl cumulus_pallet_aura_ext::Config for Runtime {} @@ -512,9 +514,9 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = frame_system::Pallet; type WeightInfo = pallet_balances::weights::SubstrateWeight; - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = (); - type MaxHolds = ConstU32<0>; + type MaxHolds = ConstU32<1>; type MaxFreezes = ConstU32<0>; } @@ -595,6 +597,9 @@ parameter_types! { pub const DepositPerByte: Balance = contracts_deposit(0, 1); // Fallback value if storage deposit limit not set by the user pub const DefaultDepositLimit: Balance = contracts_deposit(16, 16 * 1024); + // TODO: re-vist to make sure values are appropriate + pub const MaxDelegateDependencies: u32 = 32; + pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(30); pub Schedule: pallet_contracts::Schedule = Default::default(); } @@ -604,6 +609,7 @@ impl pallet_contracts::Config for Runtime { type Currency = Balances; type RuntimeEvent = RuntimeEvent; type RuntimeCall = RuntimeCall; + type RuntimeHoldReason = RuntimeHoldReason; /// The safest default is to allow no calls at all. /// /// Runtimes should whitelist dispatchables that are allowed to be called from contracts @@ -624,6 +630,18 @@ impl pallet_contracts::Config for Runtime { type MaxStorageKeyLen = ConstU32<128>; type UnsafeUnstableInterface = ConstBool; type MaxDebugBufferLen = ConstU32<{ 2 * 1024 * 1024 }>; + type MaxDelegateDependencies = MaxDelegateDependencies; + type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent; + type Debug = (); + type Environment = (); + // TODO: re-vist to make sure migration sequence is correct + type Migrations = ( + pallet_contracts::migration::v11::Migration, + pallet_contracts::migration::v12::Migration, + pallet_contracts::migration::v13::Migration, + pallet_contracts::migration::v14::Migration, + pallet_contracts::migration::v15::Migration, + ); } parameter_types! { @@ -971,10 +989,7 @@ impl pallet_proxy::Config for Runtime { } construct_runtime!( - pub struct Runtime where - Block = Block, - NodeBlock = generic::Block, - UncheckedExtrinsic = UncheckedExtrinsic + pub struct Runtime { System: frame_system = 10, Utility: pallet_utility = 11, @@ -1616,14 +1631,14 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result, sp_runtime::RuntimeString> { - use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch, TrackedStorageKey}; + use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch}; use frame_system_benchmarking::Pallet as SystemBench; use baseline::Pallet as BaselineBench; impl frame_system_benchmarking::Config for Runtime {} impl baseline::Config for Runtime {} - use frame_support::traits::WhitelistedStorageKeys; + use frame_support::traits::{WhitelistedStorageKeys, TrackedStorageKey}; let whitelist: Vec = AllPalletsWithSystem::whitelisted_storage_keys(); let mut batches = Vec::::new(); diff --git a/runtime/shiden/src/xcm_config.rs b/runtime/shiden/src/xcm_config.rs index b1c512c41f..0018c25764 100644 --- a/runtime/shiden/src/xcm_config.rs +++ b/runtime/shiden/src/xcm_config.rs @@ -28,20 +28,21 @@ use frame_support::{ weights::Weight, }; use frame_system::EnsureRoot; -use sp_runtime::traits::Convert; +use sp_runtime::traits::{Convert, MaybeEquivalence}; // Polkadot imports use xcm::latest::prelude::*; use xcm_builder::{ AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, ConvertedConcreteId, CurrencyAdapter, - EnsureXcmOrigin, FixedWeightBounds, FungiblesAdapter, IsConcrete, NoChecking, - ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, - SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, - SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, WithComputedOrigin, + DescribeAllTerminal, DescribeFamily, EnsureXcmOrigin, FixedWeightBounds, FungiblesAdapter, + HashedDescription, IsConcrete, NoChecking, ParentAsSuperuser, ParentIsPreset, + RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, + SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, + UsingComponents, WithComputedOrigin, }; use xcm_executor::{ - traits::{Convert as XcmConvert, JustTry, WithOriginFilter}, + traits::{JustTry, WithOriginFilter}, XcmExecutor, }; @@ -50,9 +51,8 @@ use orml_xcm_support::DisabledParachainFee; // Astar imports use astar_primitives::xcm::{ - AbsoluteAndRelativeReserveProvider, AccountIdToMultiLocation, DescribeAllTerminal, - DescribeFamily, FixedRateOfForeignAsset, HashedDescription, ReserveAssetFilter, - XcmFungibleFeeHandler, + AbsoluteAndRelativeReserveProvider, AccountIdToMultiLocation, FixedRateOfForeignAsset, + ReserveAssetFilter, XcmFungibleFeeHandler, }; parameter_types! { @@ -272,6 +272,7 @@ impl xcm_executor::Config for XcmConfig { type UniversalAliases = Nothing; type CallDispatcher = WithOriginFilter; type SafeCallFilter = SafeCallFilter; + type Aliasers = Nothing; } /// Local origins on this chain are allowed to dispatch XCM sends/executions. @@ -364,7 +365,7 @@ parameter_types! { pub struct AssetIdConvert; impl Convert> for AssetIdConvert { fn convert(asset_id: AssetId) -> Option { - ShidenAssetLocationIdConverter::reverse_ref(&asset_id).ok() + ShidenAssetLocationIdConverter::convert_back(&asset_id) } } From 045286204b51894f0bad72f667a502295104a9d5 Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Wed, 7 Feb 2024 16:40:38 +0530 Subject: [PATCH 13/29] feat: fix all tests --- tests/integration/src/setup.rs | 8 +-- tests/integration/src/xvm.rs | 2 +- tests/utils/src/lib.rs | 4 +- tests/xcm-simulator/src/mocks/mod.rs | 21 +++--- tests/xcm-simulator/src/mocks/parachain.rs | 65 +++++++++---------- tests/xcm-simulator/src/mocks/relay_chain.rs | 28 ++++---- tests/xcm-simulator/src/tests/experimental.rs | 3 +- 7 files changed, 64 insertions(+), 67 deletions(-) diff --git a/tests/integration/src/setup.rs b/tests/integration/src/setup.rs index 5ce81c65d2..4a0429a4d7 100644 --- a/tests/integration/src/setup.rs +++ b/tests/integration/src/setup.rs @@ -20,7 +20,7 @@ pub use frame_support::{ assert_noop, assert_ok, - traits::{GenesisBuild, OnFinalize, OnIdle, OnInitialize}, + traits::{OnFinalize, OnIdle, OnInitialize}, weights::Weight, }; pub use pallet_evm::AddressMapping; @@ -181,8 +181,8 @@ impl ExtBuilder { } pub fn build(self) -> sp_io::TestExternalities { - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); pallet_balances::GenesisConfig:: { @@ -193,7 +193,7 @@ impl ExtBuilder { #[cfg(any(feature = "shibuya"))] // Needed to trigger initial inflation config setting. - >::assimilate_storage( + as BuildStorage>::assimilate_storage( &pallet_inflation::GenesisConfig::default(), &mut t, ) diff --git a/tests/integration/src/xvm.rs b/tests/integration/src/xvm.rs index f7145f0fb0..e5c026f872 100644 --- a/tests/integration/src/xvm.rs +++ b/tests/integration/src/xvm.rs @@ -703,7 +703,7 @@ fn wasm_call_via_xvm_fails_if_storage_deposit_limit_exhausted() { reason: FailureReason::Error(FailureError::VmError(data)), .. }) => { - let error_string = "WASM call error: Module(ModuleError { index: 70, error: [22, 0, 0, 0], message: Some(\"StorageDepositLimitExhausted\") })"; + let error_string = "WASM call error: Module(ModuleError { index: 70, error: [23, 0, 0, 0], message: Some(\"StorageDepositLimitExhausted\") })"; assert_eq!(data, error_string.as_bytes()); }, _ => panic!("unexpected wasm call result"), diff --git a/tests/utils/src/lib.rs b/tests/utils/src/lib.rs index ad84cc9167..5265a9418e 100644 --- a/tests/utils/src/lib.rs +++ b/tests/utils/src/lib.rs @@ -16,12 +16,12 @@ // You should have received a copy of the GNU General Public License // along with Astar. If not, see . -use frame_support::{traits::Currency, weights::Weight}; +use frame_support::{traits::fungible::Inspect, weights::Weight}; use pallet_contracts_primitives::{Code, ReturnFlags}; use parity_scale_codec::Decode; use sp_runtime::traits::Hash; -type ContractBalanceOf = <::Currency as Currency< +type ContractBalanceOf = <::Currency as Inspect< ::AccountId, >>::Balance; diff --git a/tests/xcm-simulator/src/mocks/mod.rs b/tests/xcm-simulator/src/mocks/mod.rs index e8ea59983c..624c8d5cd0 100644 --- a/tests/xcm-simulator/src/mocks/mod.rs +++ b/tests/xcm-simulator/src/mocks/mod.rs @@ -22,14 +22,15 @@ pub(crate) mod relay_chain; use frame_support::traits::{Currency, IsType, OnFinalize, OnInitialize}; use sp_runtime::traits::{Bounded, StaticLookup}; -use sp_runtime::DispatchResult; +use sp_runtime::{BuildStorage, DispatchResult}; use xcm::latest::prelude::*; -use xcm_executor::traits::Convert; +use xcm_executor::traits::ConvertLocation; use xcm_simulator::{decl_test_network, decl_test_parachain, decl_test_relay_chain, TestExt}; pub const ALICE: sp_runtime::AccountId32 = sp_runtime::AccountId32::new([0xFAu8; 32]); pub const BOB: sp_runtime::AccountId32 = sp_runtime::AccountId32::new([0xFBu8; 32]); pub const INITIAL_BALANCE: u128 = 1_000_000_000_000_000_000_000_000; +pub const ONE: u128 = 1_000_000_000_000_000_000; pub const DAPP_STAKER_REWARD_PER_BLOCK: parachain::Balance = 1_000; pub const DAPP_STAKER_DEV_PER_BLOCK: parachain::Balance = 250; @@ -82,19 +83,19 @@ pub type ParachainXtokens = orml_xtokens::Pallet; pub fn parent_account_id() -> parachain::AccountId { let location = (Parent,); - parachain::LocationToAccountId::convert(location.into()).unwrap() + parachain::LocationToAccountId::convert_location(&location.into()).unwrap() } /// Derive parachain sovereign account on relay chain, from parachain Id pub fn child_para_account_id(para: u32) -> relay_chain::AccountId { let location = (Parachain(para),); - relay_chain::LocationToAccountId::convert(location.into()).unwrap() + relay_chain::LocationToAccountId::convert_location(&location.into()).unwrap() } /// Derive parachain sovereign account on a sibling parachain, from parachain Id pub fn sibling_para_account_id(para: u32) -> parachain::AccountId { let location = (Parent, X1(Parachain(para))); - parachain::LocationToAccountId::convert(location.into()).unwrap() + parachain::LocationToAccountId::convert_location(&location.into()).unwrap() } /// Derive parachain's account's account on a sibling parachain @@ -111,15 +112,15 @@ pub fn sibling_para_account_account_id( id: who.into(), }, ); - parachain::LocationToAccountId::convert(location.into()).unwrap() + parachain::LocationToAccountId::convert_location(&location.into()).unwrap() } /// Prepare parachain test externality pub fn para_ext(para_id: u32) -> sp_io::TestExternalities { use parachain::{MsgQueue, Runtime, System}; - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); pallet_balances::GenesisConfig:: { @@ -150,8 +151,8 @@ pub fn para_ext(para_id: u32) -> sp_io::TestExternalities { pub fn relay_ext() -> sp_io::TestExternalities { use relay_chain::{Runtime, System}; - let mut t = frame_system::GenesisConfig::default() - .build_storage::() + let mut t = frame_system::GenesisConfig::::default() + .build_storage() .unwrap(); pallet_balances::GenesisConfig:: { diff --git a/tests/xcm-simulator/src/mocks/parachain.rs b/tests/xcm-simulator/src/mocks/parachain.rs index e35e1fe2ad..f33744bead 100644 --- a/tests/xcm-simulator/src/mocks/parachain.rs +++ b/tests/xcm-simulator/src/mocks/parachain.rs @@ -39,8 +39,7 @@ use frame_system::{ use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use sp_core::H256; use sp_runtime::{ - testing::Header, - traits::{AccountIdConversion, Convert, Get, IdentityLookup}, + traits::{AccountIdConversion, Convert, Get, IdentityLookup, MaybeEquivalence}, AccountId32, Perbill, RuntimeDebug, }; use sp_std::marker::PhantomData; @@ -60,10 +59,7 @@ use xcm_builder::{ use orml_traits::location::{RelativeReserveProvider, Reserve}; use orml_xcm_support::DisabledParachainFee; -use xcm_executor::{ - traits::{Convert as XcmConvert, JustTry}, - XcmExecutor, -}; +use xcm_executor::{traits::JustTry, XcmExecutor}; use astar_primitives::xcm::{ AssetLocationIdConverter, FixedRateOfForeignAsset, ReserveAssetFilter, XcmFungibleFeeHandler, @@ -84,13 +80,12 @@ parameter_types! { impl frame_system::Config for Runtime { type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = u64; - type BlockNumber = u64; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = sp_runtime::traits::BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); @@ -124,9 +119,9 @@ impl pallet_balances::Config for Runtime { type WeightInfo = (); type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; - type HoldIdentifier = (); - type FreezeIdentifier = (); - type MaxHolds = ConstU32<0>; + type RuntimeHoldReason = RuntimeHoldReason; + type FreezeIdentifier = RuntimeFreezeReason; + type MaxHolds = ConstU32<1>; type MaxFreezes = ConstU32<0>; } @@ -213,6 +208,8 @@ parameter_types! { pub const DepositPerItem: Balance = MILLISDN / 1_000_000; pub const DepositPerByte: Balance = MILLISDN / 1_000_000; pub const DefaultDepositLimit: Balance = 1000 * MILLISDN; + pub const MaxDelegateDependencies: u32 = 32; + pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(30); pub Schedule: pallet_contracts::Schedule = Default::default(); } @@ -240,6 +237,7 @@ impl pallet_contracts::Config for Runtime { type Currency = Balances; type RuntimeEvent = RuntimeEvent; type RuntimeCall = RuntimeCall; + type RuntimeHoldReason = RuntimeHoldReason; /// The safest default is to allow no calls at all. /// /// Runtimes should whitelist dispatchables that are allowed to be called from contracts @@ -261,6 +259,11 @@ impl pallet_contracts::Config for Runtime { type MaxStorageKeyLen = ConstU32<128>; type UnsafeUnstableInterface = ConstBool; type MaxDebugBufferLen = ConstU32<{ 2 * 1024 * 1024 }>; + type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent; + type MaxDelegateDependencies = MaxDelegateDependencies; + type Migrations = (); + type Debug = (); + type Environment = (); } pub struct BurnFees; @@ -553,6 +556,7 @@ impl xcm_executor::Config for XcmConfig { type UniversalAliases = Nothing; type CallDispatcher = RuntimeCall; type SafeCallFilter = Everything; + type Aliasers = Nothing; } impl mock_msg_queue::Config for Runtime { @@ -626,7 +630,7 @@ parameter_types! { pub struct AssetIdConvert; impl Convert> for AssetIdConvert { fn convert(asset_id: AssetId) -> Option { - ShidenAssetLocationIdConverter::reverse_ref(&asset_id).ok() + ShidenAssetLocationIdConverter::convert_back(&asset_id) } } @@ -665,28 +669,23 @@ impl orml_xtokens::Config for Runtime { type ReserveProvider = AbsoluteAndRelativeReserveProvider; } -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; construct_runtime!( - pub struct Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Storage, Config, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - MsgQueue: mock_msg_queue::{Pallet, Storage, Event}, - PolkadotXcm: pallet_xcm::{Pallet, Call, Event, Origin}, - Assets: pallet_assets::{Pallet, Call, Storage, Event}, - XcAssetConfig: pallet_xc_asset_config::{Pallet, Call, Storage, Event}, - CumulusXcm: cumulus_pallet_xcm::{Pallet, Event, Origin}, - DappsStaking: pallet_dapps_staking::{Pallet, Call, Event}, - Proxy: pallet_proxy::{Pallet, Call, Event}, - Utility: pallet_utility::{Pallet, Call, Event}, - Randomness: pallet_insecure_randomness_collective_flip::{Pallet, Storage}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, - Contracts: pallet_contracts::{Pallet, Call, Storage, Event}, - Xtokens: orml_xtokens::{Pallet, Storage, Call, Event}, + pub struct Runtime { + System: frame_system, + Balances: pallet_balances, + MsgQueue: mock_msg_queue, + PolkadotXcm: pallet_xcm, + Assets: pallet_assets, + XcAssetConfig: pallet_xc_asset_config, + CumulusXcm: cumulus_pallet_xcm, + DappsStaking: pallet_dapps_staking, + Proxy: pallet_proxy, + Utility: pallet_utility, + Randomness: pallet_insecure_randomness_collective_flip, + Timestamp: pallet_timestamp, + Contracts: pallet_contracts, + Xtokens: orml_xtokens, } ); diff --git a/tests/xcm-simulator/src/mocks/relay_chain.rs b/tests/xcm-simulator/src/mocks/relay_chain.rs index 735fd7b562..63b31d39dc 100644 --- a/tests/xcm-simulator/src/mocks/relay_chain.rs +++ b/tests/xcm-simulator/src/mocks/relay_chain.rs @@ -23,7 +23,7 @@ use frame_support::{ }; use frame_system::EnsureRoot; use sp_core::H256; -use sp_runtime::{testing::Header, traits::IdentityLookup, AccountId32}; +use sp_runtime::{traits::IdentityLookup, AccountId32}; use polkadot_parachain::primitives::Id as ParaId; use polkadot_runtime_parachains::{ @@ -50,13 +50,12 @@ parameter_types! { impl frame_system::Config for Runtime { type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; - type Index = u64; - type BlockNumber = u64; + type Nonce = u64; + type Block = Block; type Hash = H256; type Hashing = ::sp_runtime::traits::BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockWeights = (); @@ -90,7 +89,7 @@ impl pallet_balances::Config for Runtime { type WeightInfo = (); type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; - type HoldIdentifier = (); + type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = (); type MaxHolds = ConstU32<0>; type MaxFreezes = ConstU32<0>; @@ -158,6 +157,7 @@ impl xcm_executor::Config for XcmConfig { type UniversalAliases = Nothing; type CallDispatcher = RuntimeCall; type SafeCallFilter = Everything; + type Aliasers = Nothing; } pub type LocalOriginToLocation = SignedToAccountId32; @@ -205,7 +205,6 @@ parameter_types! { impl origin::Config for Runtime {} -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; parameter_types! { @@ -246,18 +245,15 @@ impl pallet_message_queue::Config for Runtime { type MessageProcessor = MessageProcessor; type QueueChangeHandler = (); type WeightInfo = (); + type QueuePausedQuery = (); } construct_runtime!( - pub struct Runtime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, - { - System: frame_system::{Pallet, Call, Storage, Config, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - ParasOrigin: origin::{Pallet, Origin}, - XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event, Origin}, - MessageQueue: pallet_message_queue::{Pallet, Event}, + pub struct Runtime { + System: frame_system, + Balances: pallet_balances, + ParasOrigin: origin, + XcmPallet: pallet_xcm, + MessageQueue: pallet_message_queue, } ); diff --git a/tests/xcm-simulator/src/tests/experimental.rs b/tests/xcm-simulator/src/tests/experimental.rs index bf0d706864..6ca74cf19e 100644 --- a/tests/xcm-simulator/src/tests/experimental.rs +++ b/tests/xcm-simulator/src/tests/experimental.rs @@ -27,6 +27,7 @@ use frame_support::{assert_ok, weights::Weight}; use parity_scale_codec::Encode; use sp_runtime::traits::Bounded; use xcm::{prelude::*, v3::Response}; +use xcm_executor::traits::QueryHandler; use xcm_simulator::TestExt; const GAS_LIMIT: Weight = Weight::from_parts(100_000_000_000, 3 * 1024 * 1024); @@ -279,7 +280,7 @@ fn test_async_xcm_contract_call_no_ce() { ALICE.into(), 0, GAS_LIMIT, - None, + Some(ONE * 100), [CONSTRUCTOR_SELECTOR.to_vec(), 1.encode()].concat(), ); From 96c1404bfc27cf251e64abcfcc4523587c54617e Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Thu, 15 Feb 2024 11:53:44 +0530 Subject: [PATCH 14/29] feat: build works execpt tracing --- Cargo.lock | 2 + Cargo.toml | 3 +- bin/collator/Cargo.toml | 8 +- bin/collator/src/command.rs | 140 ++++++------------ bin/collator/src/local/chain_spec.rs | 20 ++- bin/collator/src/local/mod.rs | 2 +- bin/collator/src/local/service.rs | 64 +++++--- .../src/parachain/chain_spec/astar.rs | 17 ++- .../src/parachain/chain_spec/shibuya.rs | 26 +++- .../src/parachain/chain_spec/shiden.rs | 17 ++- bin/collator/src/parachain/mod.rs | 2 +- bin/collator/src/parachain/service.rs | 120 +++++++-------- bin/collator/src/parachain/shell_upgrade.rs | 4 +- bin/collator/src/rpc.rs | 73 ++++++++- bin/collator/src/rpc/tracing.rs | 2 +- bin/xcm-tools/src/command.rs | 20 +-- pallets/dapp-staking-v3/src/types.rs | 3 +- pallets/inflation/src/lib.rs | 3 +- runtime/astar/src/lib.rs | 1 - runtime/shibuya/src/lib.rs | 1 - runtime/shiden/src/lib.rs | 1 - vendor/evm-tracing/src/formatters/raw.rs | 2 +- vendor/evm-tracing/src/listeners/raw.rs | 6 +- vendor/evm-tracing/src/types/single.rs | 2 +- vendor/rpc/debug/Cargo.toml | 1 + vendor/rpc/debug/src/lib.rs | 6 +- 26 files changed, 301 insertions(+), 245 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e3f915979d..18ad248e62 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -638,6 +638,7 @@ dependencies = [ "cumulus-relay-chain-minimal-node", "cumulus-relay-chain-rpc-interface", "cumulus-test-relay-sproof-builder", + "fc-api", "fc-consensus", "fc-db", "fc-mapping-sync", @@ -7170,6 +7171,7 @@ version = "0.1.0" dependencies = [ "ethereum", "ethereum-types", + "fc-api", "fc-consensus", "fc-db", "fc-rpc", diff --git a/Cargo.toml b/Cargo.toml index 7b7b477a84..7f8f083734 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -206,8 +206,9 @@ fp-ethereum = { git = "https://github.com/AstarNetwork/frontier", branch = "polk # (native) fc-consensus = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0" } fc-db = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0" } +fc-api = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0" } fc-mapping-sync = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0" } -fc-rpc = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0", features = ["rpc-binary-search-estimate"] } +fc-rpc = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0", features = ["rpc-binary-search-estimate", "txpool"] } fc-rpc-core = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0" } fp-consensus = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0" } fp-storage = { git = "https://github.com/AstarNetwork/frontier", branch = "polkadot-v1.1.0" } diff --git a/bin/collator/Cargo.toml b/bin/collator/Cargo.toml index 46024a97ca..b8bbeec6b9 100644 --- a/bin/collator/Cargo.toml +++ b/bin/collator/Cargo.toml @@ -76,6 +76,7 @@ fp-rpc = { workspace = true, features = ["std"] } pallet-ethereum = { workspace = true, features = ["std"] } pallet-evm = { workspace = true, features = ["std"] } +fc-api = { workspace = true } fc-consensus = { workspace = true } fc-db = { workspace = true } fc-mapping-sync = { workspace = true } @@ -105,20 +106,19 @@ substrate-frame-rpc-system = { workspace = true } sc-cli = { workspace = true, optional = true } # cumulus dependencies -cumulus-primitives-core = { workspace = true, features = ["std"] } - cumulus-client-cli = { workspace = true } cumulus-client-consensus-aura = { workspace = true } cumulus-client-consensus-common = { workspace = true } cumulus-client-consensus-relay-chain = { workspace = true } cumulus-client-network = { workspace = true } cumulus-client-service = { workspace = true } +cumulus-primitives-core = { workspace = true, features = ["std"] } cumulus-primitives-parachain-inherent = { workspace = true } cumulus-relay-chain-inprocess-interface = { workspace = true } cumulus-relay-chain-interface = { workspace = true } cumulus-relay-chain-minimal-node = { workspace = true } cumulus-relay-chain-rpc-interface = { workspace = true } -cumulus-test-relay-sproof-builder = { workspace = true, optional = true } +cumulus-test-relay-sproof-builder = { workspace = true } # polkadot dependencies polkadot-cli = { workspace = true, optional = true } @@ -157,10 +157,10 @@ runtime-benchmarks = [ "local-runtime/runtime-benchmarks", "shibuya-runtime/runtime-benchmarks", "shiden-runtime/runtime-benchmarks", + "astar-runtime/runtime-benchmarks", "polkadot-cli/runtime-benchmarks", "polkadot-runtime-common/std", "sp-keyring", - "cumulus-test-relay-sproof-builder", "polkadot-runtime-common", "astar-primitives/runtime-benchmarks", ] diff --git a/bin/collator/src/command.rs b/bin/collator/src/command.rs index a821a7604d..1e4f4503d0 100644 --- a/bin/collator/src/command.rs +++ b/bin/collator/src/command.rs @@ -43,7 +43,7 @@ use sp_runtime::traits::AccountIdConversion; use sp_runtime::traits::Block as BlockT; use std::net::SocketAddr; -#[cfg(feature = "frame-benchmarking-cli")] +#[cfg(feature = "runtime-benchmarks")] use frame_benchmarking_cli::{BenchmarkCmd, ExtrinsicFactory, SUBSTRATE_REFERENCE_HARDWARE}; trait IdentifyChain { @@ -147,8 +147,10 @@ impl SubstrateCli for Cli { fn load_spec(&self, id: &str) -> std::result::Result, String> { load_spec(id) } +} - fn native_runtime_version(chain_spec: &Box) -> &'static RuntimeVersion { +impl Cli { + fn runtime_version(chain_spec: &Box) -> &'static RuntimeVersion { if chain_spec.is_dev() { &local_runtime::VERSION } else if chain_spec.is_astar() { @@ -202,10 +204,6 @@ impl SubstrateCli for RelayChainCli { polkadot_cli::Cli::from_iter([RelayChainCli::executable_name()].iter()).load_spec(id) } } - - fn native_runtime_version(chain_spec: &Box) -> &'static RuntimeVersion { - polkadot_cli::Cli::native_runtime_version(chain_spec) - } } /// Parse command line arguments into service configuration. @@ -459,12 +457,36 @@ pub fn run() -> Result<()> { } Some(Subcommand::ExportGenesisState(cmd)) => { let runner = cli.create_runner(cmd)?; + let spec = cli.load_spec(&cmd.shared_params.chain.clone().unwrap_or_default())?; - runner.sync_run(|_config| { - let spec = cli.load_spec(&cmd.shared_params.chain.clone().unwrap_or_default())?; - let state_version = Cli::native_runtime_version(&spec).state_version(); - cmd.run::(&*spec, state_version) - }) + if runner.config().chain_spec.is_astar() { + runner.sync_run(|config| { + let PartialComponents { client, .. } = + parachain::new_partial::( + &config, + parachain::build_import_queue, + )?; + cmd.run::(&*spec, &*client) + }) + } else if runner.config().chain_spec.is_shiden() { + runner.sync_run(|config| { + let PartialComponents { client, .. } = + parachain::new_partial::( + &config, + parachain::build_import_queue, + )?; + cmd.run::(&*spec, &*client) + }) + } else { + runner.sync_run(|config| { + let PartialComponents { client, .. } = + parachain::new_partial::( + &config, + parachain::build_import_queue, + )?; + cmd.run::(&*spec, &*client) + }) + } } Some(Subcommand::ExportGenesisWasm(cmd)) => { let runner = cli.create_runner(cmd)?; @@ -478,7 +500,7 @@ pub fn run() -> Result<()> { Some(Subcommand::Sign(cmd)) => cmd.run(), Some(Subcommand::Verify(cmd)) => cmd.run(), Some(Subcommand::Vanity(cmd)) => cmd.run(), - #[cfg(feature = "frame-benchmarking-cli")] + #[cfg(feature = "runtime-benchmarks")] Some(Subcommand::Benchmark(cmd)) => { use crate::benchmarking::*; use sp_keyring::Sr25519Keyring; @@ -490,18 +512,18 @@ pub fn run() -> Result<()> { BenchmarkCmd::Pallet(cmd) => { if chain_spec.is_astar() { runner.sync_run(|config| { - cmd.run::(config) + cmd.run::(config) }) } else if chain_spec.is_shiden() { runner.sync_run(|config| { - cmd.run::(config) + cmd.run::(config) }) } else if chain_spec.is_shibuya() { runner.sync_run(|config| { - cmd.run::(config) + cmd.run::(config) }) } else { - runner.sync_run(|config| cmd.run::(config)) + runner.sync_run(|config| cmd.run::(config)) } } BenchmarkCmd::Block(cmd) => { @@ -763,84 +785,12 @@ pub fn run() -> Result<()> { } } } - #[cfg(feature = "try-runtime")] - Some(Subcommand::TryRuntime(cmd)) => { - let runner = cli.create_runner(cmd)?; - let chain_spec = &runner.config().chain_spec; - - use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch}; - type HostFunctionsOf = ExtendedHostFunctions< - sp_io::SubstrateHostFunctions, - ::ExtendHostFunctions, - >; - - if chain_spec.is_shiden() { - runner.async_run(|config| { - let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry); - let info_provider = - try_runtime_cli::block_building_info::timestamp_with_aura_info(6000); - let task_manager = - sc_service::TaskManager::new(config.tokio_handle.clone(), registry) - .map_err(|e| { - sc_cli::Error::Service(sc_service::Error::Prometheus(e)) - })?; - Ok(( - cmd.run::, _>( - Some(info_provider), - ), - task_manager, - )) - }) - } else if chain_spec.is_shibuya() { - runner.async_run(|config| { - let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry); - let info_provider = - try_runtime_cli::block_building_info::timestamp_with_aura_info(6000); - let task_manager = - sc_service::TaskManager::new(config.tokio_handle.clone(), registry) - .map_err(|e| { - sc_cli::Error::Service(sc_service::Error::Prometheus(e)) - })?; - Ok(( - cmd.run::, _>( - Some(info_provider), - ), - task_manager, - )) - }) - } else if chain_spec.is_astar() { - runner.async_run(|config| { - let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry); - let info_provider = - try_runtime_cli::block_building_info::timestamp_with_aura_info(6000); - let task_manager = - sc_service::TaskManager::new(config.tokio_handle.clone(), registry) - .map_err(|e| { - sc_cli::Error::Service(sc_service::Error::Prometheus(e)) - })?; - Ok(( - cmd.run::, _>(Some( - info_provider, - )), - task_manager, - )) - }) - } else { - runner.async_run(|config| { - let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry); - let info_provider = - try_runtime_cli::block_building_info::timestamp_with_aura_info(6000); - let task_manager = - sc_service::TaskManager::new(config.tokio_handle.clone(), registry) - .map_err(|e| { - sc_cli::Error::Service(sc_service::Error::Prometheus(e)) - })?; - Ok(( - cmd.run::, _>(Some(info_provider)), - task_manager, - )) - }) - } + Some(Subcommand::TryRuntime(_)) => { + Err("The `try-runtime` subcommand has been migrated to a \ + standalone CLI (https://github.com/paritytech/try-runtime-cli). It is no longer \ + being maintained here and will be removed entirely some time after January 2024. \ + Please remove this subcommand from your runtime and use the standalone CLI." + .into()) } None => { let runner = cli.create_runner(&cli.run.normalize())?; @@ -885,7 +835,7 @@ pub fn run() -> Result<()> { let parachain_account = AccountIdConversion::::into_account_truncating(¶_id); - let state_version = Cli::native_runtime_version(&config.chain_spec).state_version(); + let state_version = Cli::runtime_version(&config.chain_spec).state_version(); let block: Block = generate_genesis_block(&*config.chain_spec, state_version) .map_err(|e| format!("{:?}", e))?; let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode())); diff --git a/bin/collator/src/local/chain_spec.rs b/bin/collator/src/local/chain_spec.rs index 8a510b6f67..b224142c0e 100644 --- a/bin/collator/src/local/chain_spec.rs +++ b/bin/collator/src/local/chain_spec.rs @@ -20,10 +20,10 @@ use local_runtime::{ wasm_binary_unwrap, AccountId, AuraConfig, AuraId, BalancesConfig, BlockRewardConfig, - CouncilConfig, DappStakingConfig, DemocracyConfig, EVMConfig, GenesisConfig, GrandpaConfig, - GrandpaId, InflationConfig, InflationParameters, Precompiles, RewardDistributionConfig, - Signature, SudoConfig, SystemConfig, TechnicalCommitteeConfig, TierThreshold, TreasuryConfig, - VestingConfig, AST, + CouncilConfig, DappStakingConfig, DemocracyConfig, EVMConfig, GrandpaConfig, GrandpaId, + InflationConfig, InflationParameters, Precompiles, RewardDistributionConfig, + RuntimeGenesisConfig, Signature, SudoConfig, SystemConfig, TechnicalCommitteeConfig, + TierThreshold, TreasuryConfig, VestingConfig, AST, }; use sc_service::ChainType; use sp_core::{crypto::Ss58Codec, sr25519, Pair, Public}; @@ -35,7 +35,7 @@ use sp_runtime::{ type AccountPublic = ::Signer; /// Specialized `ChainSpec` for Shiden Network. -pub type ChainSpec = sc_service::GenericChainSpec; +pub type ChainSpec = sc_service::GenericChainSpec; /// Helper function to generate a crypto pair from seed fn get_from_seed(seed: &str) -> ::Public { @@ -99,15 +99,16 @@ fn testnet_genesis( initial_authorities: Vec<(AuraId, GrandpaId)>, root_key: AccountId, endowed_accounts: Vec, -) -> GenesisConfig { +) -> RuntimeGenesisConfig { // This is supposed the be the simplest bytecode to revert without returning any data. // We will pre-deploy it under all of our precompiles to ensure they can be called from // within contracts. // (PUSH1 0x00 PUSH1 0x00 REVERT) let revert_bytecode = vec![0x60, 0x00, 0x60, 0x00, 0xFD]; - GenesisConfig { + RuntimeGenesisConfig { system: SystemConfig { code: wasm_binary_unwrap().to_vec(), + ..Default::default() }, balances: BalancesConfig { balances: endowed_accounts @@ -126,6 +127,7 @@ fn testnet_genesis( adjustable_percent: Perbill::from_percent(25), ideal_dapps_staking_tvl: Perbill::from_percent(40), }, + ..Default::default() }, vesting: VestingConfig { vesting: vec![] }, aura: AuraConfig { @@ -136,6 +138,7 @@ fn testnet_genesis( .iter() .map(|x| (x.1.clone(), 1)) .collect(), + ..Default::default() }, evm: EVMConfig { // We need _some_ code inserted at the precompile address so that @@ -153,6 +156,7 @@ fn testnet_genesis( ) }) .collect(), + ..Default::default() }, ethereum: Default::default(), sudo: SudoConfig { @@ -207,9 +211,11 @@ fn testnet_genesis( TierThreshold::FixedTvlAmount { amount: 10 * AST }, ], slots_per_tier: vec![10, 20, 30, 40], + ..Default::default() }, inflation: InflationConfig { params: InflationParameters::default(), + ..Default::default() }, } } diff --git a/bin/collator/src/local/mod.rs b/bin/collator/src/local/mod.rs index 44352c19ed..344a535fa9 100644 --- a/bin/collator/src/local/mod.rs +++ b/bin/collator/src/local/mod.rs @@ -25,4 +25,4 @@ mod service; mod chain_spec; pub use chain_spec::*; -pub use service::{new_partial, start_node, Executor, RuntimeApi}; +pub use service::{new_partial, start_node, Executor, RuntimeApi, HostFunctions}; diff --git a/bin/collator/src/local/service.rs b/bin/collator/src/local/service.rs index ad7ae3971c..44eac22469 100644 --- a/bin/collator/src/local/service.rs +++ b/bin/collator/src/local/service.rs @@ -20,13 +20,14 @@ use fc_consensus::FrontierBlockImport; use fc_rpc_core::types::{FeeHistoryCache, FilterPool}; -use futures::StreamExt; -use sc_client_api::{BlockBackend, BlockchainEvents}; +use futures::{FutureExt, StreamExt}; +use sc_client_api::{Backend, BlockBackend, BlockchainEvents}; use sc_consensus_aura::{ImportQueueParams, SlotProportion, StartAuraParams}; use sc_consensus_grandpa::SharedVoterState; use sc_executor::NativeElseWasmExecutor; use sc_service::{error::Error as ServiceError, Configuration, TaskManager}; use sc_telemetry::{Telemetry, TelemetryWorker}; +use sc_transaction_pool_api::OffchainTransactionPoolFactory; use sp_consensus_aura::sr25519::AuthorityPair as AuraPair; use std::{collections::BTreeMap, sync::Arc, time::Duration}; @@ -34,14 +35,21 @@ pub use local_runtime::RuntimeApi; use astar_primitives::*; +const GRANDPA_JUSTIFICATION_PERIOD: u32 = 512; + +/// Extra host functions +pub type HostFunctions = ( + // benchmarking host functions + frame_benchmarking::benchmarking::HostFunctions, + // evm tracing host functions + moonbeam_primitives_ext::moonbeam_ext::HostFunctions, +); + /// Local runtime native executor. pub struct Executor; impl sc_executor::NativeExecutionDispatch for Executor { - type ExtendHostFunctions = ( - frame_benchmarking::benchmarking::HostFunctions, - moonbeam_primitives_ext::moonbeam_ext::HostFunctions, - ); + type ExtendHostFunctions = HostFunctions; fn dispatch(method: &str, data: &[u8]) -> Option> { local_runtime::api::dispatch(method, data) @@ -64,7 +72,7 @@ pub fn new_partial( FullClient, FullBackend, FullSelectChain, - sc_consensus::DefaultImportQueue, + sc_consensus::DefaultImportQueue, sc_transaction_pool::FullPool, ( FrontierBlockImport< @@ -120,6 +128,7 @@ pub fn new_partial( ); let (grandpa_block_import, grandpa_link) = sc_consensus_grandpa::block_import( client.clone(), + GRANDPA_JUSTIFICATION_PERIOD, &(client.clone() as Arc<_>), select_chain.clone(), telemetry.as_ref().map(|x| x.handle()), @@ -428,7 +437,7 @@ pub fn start_node( let grandpa_config = sc_consensus_grandpa::Config { // FIXME #1578 make this available through chainspec gossip_duration: Duration::from_millis(333), - justification_period: 512, + justification_period: GRANDPA_JUSTIFICATION_PERIOD, name: Some(name), observer_enabled: false, keystore, @@ -505,11 +514,23 @@ pub fn start_node(config: Configuration) -> Result { })?; if config.offchain_worker.enabled { - sc_service::build_offchain_workers( - &config, - task_manager.spawn_handle(), - client.clone(), - network.clone(), + task_manager.spawn_handle().spawn( + "offchain-workers-runner", + "offchain-work", + sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions { + runtime_api_provider: client.clone(), + keystore: Some(keystore_container.keystore()), + offchain_db: backend.offchain_storage(), + transaction_pool: Some(OffchainTransactionPoolFactory::new( + transaction_pool.clone(), + )), + network_provider: network.clone(), + is_validator: config.role.is_authority(), + enable_http_requests: true, + custom_extensions: move |_| vec![], + }) + .run(client.clone(), task_manager.spawn_handle()) + .boxed(), ); } @@ -613,8 +634,16 @@ pub fn start_node(config: Configuration) -> Result { enable_evm_rpc: true, // enable EVM RPC for dev node by default }; - crate::rpc::create_full(deps, subscription, pubsub_notification_sinks.clone()) - .map_err::(Into::into) + let pending_consensus_data_provider = Box::new( + fc_rpc::pending::AuraConsensusDataProvider::new(client.clone()), + ); + crate::rpc::create_full( + deps, + subscription, + pubsub_notification_sinks.clone(), + pending_consensus_data_provider, + ) + .map_err::(Into::into) }) }; @@ -637,7 +666,7 @@ pub fn start_node(config: Configuration) -> Result { let proposer_factory = sc_basic_authorship::ProposerFactory::new( task_manager.spawn_handle(), client.clone(), - transaction_pool, + transaction_pool.clone(), prometheus_registry.as_ref(), telemetry.as_ref().map(|x| x.handle()), ); @@ -692,7 +721,7 @@ pub fn start_node(config: Configuration) -> Result { let grandpa_config = sc_consensus_grandpa::Config { // FIXME #1578 make this available through chainspec gossip_duration: Duration::from_millis(333), - justification_period: 512, + justification_generation_period: GRANDPA_JUSTIFICATION_PERIOD, name: Some(name), observer_enabled: false, keystore, @@ -717,6 +746,7 @@ pub fn start_node(config: Configuration) -> Result { prometheus_registry, shared_voter_state: SharedVoterState::empty(), telemetry: telemetry.as_ref().map(|x| x.handle()), + offchain_tx_pool_factory: OffchainTransactionPoolFactory::new(transaction_pool), }; // the GRANDPA voter task is considered infallible, i.e. diff --git a/bin/collator/src/parachain/chain_spec/astar.rs b/bin/collator/src/parachain/chain_spec/astar.rs index cce4ef9514..9253ea03e5 100644 --- a/bin/collator/src/parachain/chain_spec/astar.rs +++ b/bin/collator/src/parachain/chain_spec/astar.rs @@ -35,7 +35,8 @@ use super::{get_from_seed, Extensions}; const PARA_ID: u32 = 2006; /// Specialized `ChainSpec` for Astar Network. -pub type AstarChainSpec = sc_service::GenericChainSpec; +pub type AstarChainSpec = + sc_service::GenericChainSpec; /// Gen Astar chain specification for given parachain id. pub fn get_chain_spec() -> AstarChainSpec { @@ -78,12 +79,12 @@ fn session_keys(aura: AuraId) -> astar_runtime::SessionKeys { astar_runtime::SessionKeys { aura } } -/// Helper function to create GenesisConfig. +/// Helper function to create RuntimeGenesisConfig. fn make_genesis( balances: Vec<(AccountId, Balance)>, root_key: AccountId, parachain_id: ParaId, -) -> astar_runtime::GenesisConfig { +) -> astar_runtime::RuntimeGenesisConfig { let authorities = vec![ ( get_account_id_from_seed::("Alice"), @@ -101,14 +102,18 @@ fn make_genesis( // (PUSH1 0x00 PUSH1 0x00 REVERT) let revert_bytecode = vec![0x60, 0x00, 0x60, 0x00, 0xFD]; - astar_runtime::GenesisConfig { + astar_runtime::RuntimeGenesisConfig { system: SystemConfig { code: wasm_binary_unwrap().to_vec(), + ..Default::default() }, sudo: astar_runtime::SudoConfig { key: Some(root_key), }, - parachain_info: ParachainInfoConfig { parachain_id }, + parachain_info: ParachainInfoConfig { + parachain_id, + ..Default::default() + }, balances: astar_runtime::BalancesConfig { balances }, block_reward: BlockRewardConfig { // Make sure sum is 100 @@ -120,6 +125,7 @@ fn make_genesis( adjustable_percent: Perbill::from_percent(45), ideal_dapps_staking_tvl: Perbill::from_percent(40), }, + ..Default::default() }, vesting: astar_runtime::VestingConfig { vesting: vec![] }, session: astar_runtime::SessionConfig { @@ -153,6 +159,7 @@ fn make_genesis( ) }) .collect(), + ..Default::default() }, ethereum: Default::default(), polkadot_xcm: Default::default(), diff --git a/bin/collator/src/parachain/chain_spec/shibuya.rs b/bin/collator/src/parachain/chain_spec/shibuya.rs index 200d324631..e8418fc076 100644 --- a/bin/collator/src/parachain/chain_spec/shibuya.rs +++ b/bin/collator/src/parachain/chain_spec/shibuya.rs @@ -23,8 +23,8 @@ use sc_service::ChainType; use shibuya_runtime::{ wasm_binary_unwrap, AccountId, AuraConfig, AuraId, Balance, BalancesConfig, CollatorSelectionConfig, CouncilConfig, DappStakingConfig, DemocracyConfig, EVMChainIdConfig, - EVMConfig, GenesisConfig, InflationConfig, InflationParameters, ParachainInfoConfig, - Precompiles, SessionConfig, SessionKeys, Signature, SudoConfig, SystemConfig, + EVMConfig, InflationConfig, InflationParameters, ParachainInfoConfig, Precompiles, + RuntimeGenesisConfig, SessionConfig, SessionKeys, Signature, SudoConfig, SystemConfig, TechnicalCommitteeConfig, TierThreshold, TreasuryConfig, VestingConfig, SBY, }; use sp_core::{sr25519, Pair, Public}; @@ -39,7 +39,7 @@ use super::{get_from_seed, Extensions}; const PARA_ID: u32 = 1000; /// Specialized `ChainSpec` for Shibuya testnet. -pub type ShibuyaChainSpec = sc_service::GenericChainSpec; +pub type ShibuyaChainSpec = sc_service::GenericChainSpec; /// Gen Shibuya chain specification for given parachain id. pub fn get_chain_spec() -> ShibuyaChainSpec { @@ -82,12 +82,12 @@ fn session_keys(aura: AuraId) -> SessionKeys { SessionKeys { aura } } -/// Helper function to create Shibuya GenesisConfig. +/// Helper function to create Shibuya RuntimeGenesisConfig. fn make_genesis( balances: Vec<(AccountId, Balance)>, root_key: AccountId, parachain_id: ParaId, -) -> GenesisConfig { +) -> RuntimeGenesisConfig { let authorities = vec![ ( get_account_id_from_seed::("Alice"), @@ -105,14 +105,18 @@ fn make_genesis( // (PUSH1 0x00 PUSH1 0x00 REVERT) let revert_bytecode = vec![0x60, 0x00, 0x60, 0x00, 0xFD]; - GenesisConfig { + RuntimeGenesisConfig { system: SystemConfig { code: wasm_binary_unwrap().to_vec(), + ..Default::default() }, sudo: SudoConfig { key: Some(root_key), }, - parachain_info: ParachainInfoConfig { parachain_id }, + parachain_info: ParachainInfoConfig { + parachain_id, + ..Default::default() + }, balances: BalancesConfig { balances }, vesting: VestingConfig { vesting: vec![] }, session: SessionConfig { @@ -146,8 +150,12 @@ fn make_genesis( ) }) .collect(), + ..Default::default() + }, + evm_chain_id: EVMChainIdConfig { + chain_id: 0x51, + ..Default::default() }, - evm_chain_id: EVMChainIdConfig { chain_id: 0x51 }, ethereum: Default::default(), polkadot_xcm: Default::default(), assets: Default::default(), @@ -193,10 +201,12 @@ fn make_genesis( TierThreshold::FixedTvlAmount { amount: 10 * SBY }, ], slots_per_tier: vec![10, 20, 30, 40], + ..Default::default() }, // TODO: adjust this if needed inflation: InflationConfig { params: InflationParameters::default(), + ..Default::default() }, } } diff --git a/bin/collator/src/parachain/chain_spec/shiden.rs b/bin/collator/src/parachain/chain_spec/shiden.rs index e305f994c4..e0f0f73a60 100644 --- a/bin/collator/src/parachain/chain_spec/shiden.rs +++ b/bin/collator/src/parachain/chain_spec/shiden.rs @@ -36,7 +36,8 @@ use super::{get_from_seed, Extensions}; const PARA_ID: u32 = 2007; /// Specialized `ChainSpec` for Shiden Network. -pub type ShidenChainSpec = sc_service::GenericChainSpec; +pub type ShidenChainSpec = + sc_service::GenericChainSpec; /// Gen Shiden chain specification for given parachain id. pub fn get_chain_spec() -> ShidenChainSpec { @@ -79,12 +80,12 @@ fn session_keys(aura: AuraId) -> shiden_runtime::SessionKeys { shiden_runtime::SessionKeys { aura } } -/// Helper function to create GenesisConfig. +/// Helper function to create RuntimeGenesisConfig. fn make_genesis( balances: Vec<(AccountId, Balance)>, root_key: AccountId, parachain_id: ParaId, -) -> shiden_runtime::GenesisConfig { +) -> shiden_runtime::RuntimeGenesisConfig { let authorities = vec![ ( get_account_id_from_seed::("Alice"), @@ -102,14 +103,18 @@ fn make_genesis( // (PUSH1 0x00 PUSH1 0x00 REVERT) let revert_bytecode = vec![0x60, 0x00, 0x60, 0x00, 0xFD]; - shiden_runtime::GenesisConfig { + shiden_runtime::RuntimeGenesisConfig { system: SystemConfig { code: wasm_binary_unwrap().to_vec(), + ..Default::default() }, sudo: shiden_runtime::SudoConfig { key: Some(root_key), }, - parachain_info: ParachainInfoConfig { parachain_id }, + parachain_info: ParachainInfoConfig { + parachain_id, + ..Default::default() + }, balances: shiden_runtime::BalancesConfig { balances }, block_reward: BlockRewardConfig { // Make sure sum is 100 @@ -121,6 +126,7 @@ fn make_genesis( adjustable_percent: Perbill::from_percent(0), ideal_dapps_staking_tvl: Perbill::from_percent(0), }, + ..Default::default() }, vesting: shiden_runtime::VestingConfig { vesting: vec![] }, session: shiden_runtime::SessionConfig { @@ -154,6 +160,7 @@ fn make_genesis( ) }) .collect(), + ..Default::default() }, ethereum: Default::default(), polkadot_xcm: Default::default(), diff --git a/bin/collator/src/parachain/mod.rs b/bin/collator/src/parachain/mod.rs index 7a95dbcea7..a4347d6d56 100644 --- a/bin/collator/src/parachain/mod.rs +++ b/bin/collator/src/parachain/mod.rs @@ -29,5 +29,5 @@ pub mod chain_spec; pub use service::{ astar, build_import_queue, new_partial, shibuya, shiden, start_astar_node, start_shibuya_node, - start_shiden_node, + start_shiden_node, HostFunctions, }; diff --git a/bin/collator/src/parachain/service.rs b/bin/collator/src/parachain/service.rs index f8c0816080..db345524d9 100644 --- a/bin/collator/src/parachain/service.rs +++ b/bin/collator/src/parachain/service.rs @@ -20,17 +20,19 @@ use astar_primitives::*; use cumulus_client_cli::CollatorOptions; +#[allow(deprecated)] use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion}; use cumulus_client_consensus_common::{ParachainBlockImport, ParachainConsensus}; use cumulus_client_consensus_relay_chain::Verifier as RelayChainVerifier; +#[allow(deprecated)] use cumulus_client_service::{ - prepare_node_config, start_collator, start_full_node, BuildNetworkParams, StartCollatorParams, - StartFullNodeParams, + prepare_node_config, start_collator, start_relay_chain_tasks, BuildNetworkParams, + DARecoveryProfile, StartCollatorParams, StartRelayChainTasksParams, }; use cumulus_primitives_core::ParaId; use cumulus_relay_chain_inprocess_interface::build_inprocess_relay_chain; use cumulus_relay_chain_interface::{RelayChainInterface, RelayChainResult}; -use cumulus_relay_chain_minimal_node::build_minimal_relay_chain_node; +use cumulus_relay_chain_minimal_node::build_minimal_relay_chain_node_with_rpc; use fc_consensus::FrontierBlockImport; use fc_rpc_core::types::{FeeHistoryCache, FilterPool}; use futures::{lock::Mutex, StreamExt}; @@ -43,7 +45,7 @@ use sc_network_sync::SyncingService; use sc_service::{Configuration, PartialComponents, TFullBackend, TFullClient, TaskManager}; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; use sp_api::ConstructRuntimeApi; -use sp_consensus_aura::sr25519::AuthorityId as AuraId; +use sp_consensus_aura::{sr25519::AuthorityId as AuraId, AuraApi}; use sp_keystore::KeystorePtr; use sp_runtime::traits::BlakeTwo256; use sp_runtime::Percent; @@ -57,17 +59,21 @@ use crate::evm_tracing_types::{EthApi as EthApiCmd, EvmTracingConfig}; #[cfg(feature = "evm-tracing")] use crate::rpc::tracing; +/// Extra host functions +pub type HostFunctions = ( + frame_benchmarking::benchmarking::HostFunctions, + moonbeam_primitives_ext::moonbeam_ext::HostFunctions, +); + /// Astar network runtime executor. pub mod astar { + use super::HostFunctions; pub use astar_runtime::RuntimeApi; /// Shibuya runtime executor. pub struct Executor; impl sc_executor::NativeExecutionDispatch for Executor { - type ExtendHostFunctions = ( - frame_benchmarking::benchmarking::HostFunctions, - moonbeam_primitives_ext::moonbeam_ext::HostFunctions, - ); + type ExtendHostFunctions = HostFunctions; fn dispatch(method: &str, data: &[u8]) -> Option> { astar_runtime::api::dispatch(method, data) @@ -81,15 +87,13 @@ pub mod astar { /// Shiden network runtime executor. pub mod shiden { + use super::HostFunctions; pub use shiden_runtime::RuntimeApi; /// Shiden runtime executor. pub struct Executor; impl sc_executor::NativeExecutionDispatch for Executor { - type ExtendHostFunctions = ( - frame_benchmarking::benchmarking::HostFunctions, - moonbeam_primitives_ext::moonbeam_ext::HostFunctions, - ); + type ExtendHostFunctions = HostFunctions; fn dispatch(method: &str, data: &[u8]) -> Option> { shiden_runtime::api::dispatch(method, data) @@ -103,15 +107,13 @@ pub mod shiden { /// Shibuya network runtime executor. pub mod shibuya { + use super::HostFunctions; pub use shibuya_runtime::RuntimeApi; /// Shibuya runtime executor. pub struct Executor; impl sc_executor::NativeExecutionDispatch for Executor { - type ExtendHostFunctions = ( - frame_benchmarking::benchmarking::HostFunctions, - moonbeam_primitives_ext::moonbeam_ext::HostFunctions, - ); + type ExtendHostFunctions = HostFunctions; fn dispatch(method: &str, data: &[u8]) -> Option> { shibuya_runtime::api::dispatch(method, data) @@ -135,10 +137,7 @@ pub fn new_partial( TFullClient>, TFullBackend, (), - sc_consensus::DefaultImportQueue< - Block, - TFullClient>, - >, + sc_consensus::DefaultImportQueue, sc_transaction_pool::FullPool< Block, TFullClient>, @@ -168,10 +167,8 @@ where RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue + sp_api::Metadata + sp_session::SessionKeys - + sp_api::ApiExt< - Block, - StateBackend = sc_client_api::StateBackendFor, Block>, - > + sp_offchain::OffchainWorkerApi + + sp_api::ApiExt + + sp_offchain::OffchainWorkerApi + sp_block_builder::BlockBuilder + fp_rpc::EthereumRuntimeRPCApi, sc_client_api::StateBackendFor, Block>: sp_api::StateBackend, @@ -190,13 +187,7 @@ where &Configuration, Option, &TaskManager, - ) -> Result< - sc_consensus::DefaultImportQueue< - Block, - TFullClient>, - >, - sc_service::Error, - >, + ) -> Result, sc_service::Error>, { let telemetry = config .telemetry_endpoints @@ -279,13 +270,11 @@ async fn build_relay_chain_interface( Arc<(dyn RelayChainInterface + 'static)>, Option, )> { - if !collator_options.relay_chain_rpc_urls.is_empty() { - build_minimal_relay_chain_node( - polkadot_config, - task_manager, - collator_options.relay_chain_rpc_urls, - ) - .await + if let cumulus_client_cli::RelayChainMode::ExternalRpc(rpc_target_urls) = + collator_options.relay_chain_mode + { + build_minimal_relay_chain_node_with_rpc(polkadot_config, task_manager, rpc_target_urls) + .await } else { build_inprocess_relay_chain( polkadot_config, @@ -321,16 +310,15 @@ where RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue + sp_api::Metadata + sp_session::SessionKeys - + sp_api::ApiExt< - Block, - StateBackend = sc_client_api::StateBackendFor, Block>, - > + sp_offchain::OffchainWorkerApi + + sp_api::ApiExt + + sp_offchain::OffchainWorkerApi + sp_block_builder::BlockBuilder + substrate_frame_rpc_system::AccountNonceApi + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi + fp_rpc::EthereumRuntimeRPCApi + fp_rpc::ConvertTransactionRuntimeApi - + cumulus_primitives_core::CollectCollationInfo, + + cumulus_primitives_core::CollectCollationInfo + + AuraApi, sc_client_api::StateBackendFor, Block>: sp_api::StateBackend, Executor: sc_executor::NativeExecutionDispatch + 'static, BIQ: FnOnce( @@ -347,13 +335,7 @@ where &Configuration, Option, &TaskManager, - ) -> Result< - sc_consensus::DefaultImportQueue< - Block, - TFullClient>, - >, - sc_service::Error, - >, + ) -> Result, sc_service::Error>, BIC: FnOnce( Arc>>, ParachainBlockImport< @@ -416,6 +398,7 @@ where spawn_handle: task_manager.spawn_handle(), import_queue: params.import_queue, relay_chain_interface: relay_chain_interface.clone(), + sybil_resistance_level: cumulus_client_service::CollatorSybilResistance::Resistant, }) .await?; @@ -511,8 +494,17 @@ where enable_evm_rpc: additional_config.enable_evm_rpc, }; - crate::rpc::create_full(deps, subscription, pubsub_notification_sinks.clone()) - .map_err(Into::into) + let pending_consensus_data_provider = Box::new( + fc_rpc::pending::AuraConsensusDataProvider::new(client.clone()), + ); + + crate::rpc::create_full( + deps, + subscription, + pubsub_notification_sinks.clone(), + pending_consensus_data_provider, + ) + .map_err(Into::into) }) }; @@ -575,9 +567,10 @@ where sync_service, }; + #[allow(deprecated)] start_collator(params).await?; } else { - let params = StartFullNodeParams { + let params = StartRelayChainTasksParams { client: client.clone(), announce_block, task_manager: &mut task_manager, @@ -587,9 +580,10 @@ where import_queue: import_queue_service, recovery_handle: Box::new(overseer_handle), sync_service, + da_recovery_profile: DARecoveryProfile::FullNode, }; - start_full_node(params)?; + start_relay_chain_tasks(params)?; } start_network.start_network(); @@ -963,13 +957,7 @@ pub fn build_import_queue( config: &Configuration, telemetry_handle: Option, task_manager: &TaskManager, -) -> Result< - sc_consensus::DefaultImportQueue< - Block, - TFullClient>, - >, - sc_service::Error, -> +) -> Result, sc_service::Error> where RuntimeApi: ConstructRuntimeApi>> + Send @@ -978,10 +966,8 @@ where RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue + sp_api::Metadata + sp_session::SessionKeys - + sp_api::ApiExt< - Block, - StateBackend = sc_client_api::StateBackendFor, Block>, - > + sp_offchain::OffchainWorkerApi + + sp_api::ApiExt + + sp_offchain::OffchainWorkerApi + sp_block_builder::BlockBuilder + fp_rpc::EthereumRuntimeRPCApi + sp_consensus_aura::AuraApi, @@ -1254,6 +1240,7 @@ pub async fn start_astar_node( let relay_chain_for_aura = relay_chain_interface.clone(); + #[allow(deprecated)] Ok(AuraConsensus::build::< sp_consensus_aura::sr25519::AuthorityPair, _, @@ -1508,7 +1495,6 @@ pub async fn start_shiden_node( let block_import2 = block_import.clone(); let sync_oracle2 = sync_oracle.clone(); let keystore2 = keystore.clone(); - let aura_consensus = BuildOnAccess::Uninitialized(Some( Box::new(move || { let slot_duration = @@ -1526,6 +1512,7 @@ pub async fn start_shiden_node( proposer_factory.set_default_block_size_limit(additional_config.proposer_block_size_limit); proposer_factory.set_soft_deadline(Percent::from_percent(additional_config.proposer_soft_deadline_percent)); + #[allow(deprecated)] AuraConsensus::build::< sp_consensus_aura::sr25519::AuthorityPair, _, @@ -1844,6 +1831,7 @@ pub async fn start_shibuya_node( proposer_factory.set_default_block_size_limit(additional_config.proposer_block_size_limit); proposer_factory.set_soft_deadline(Percent::from_percent(additional_config.proposer_soft_deadline_percent)); + #[allow(deprecated)] Ok(AuraConsensus::build::< sp_consensus_aura::sr25519::AuthorityPair, _, diff --git a/bin/collator/src/parachain/shell_upgrade.rs b/bin/collator/src/parachain/shell_upgrade.rs index 4537366663..b52408c389 100644 --- a/bin/collator/src/parachain/shell_upgrade.rs +++ b/bin/collator/src/parachain/shell_upgrade.rs @@ -111,8 +111,8 @@ where { async fn verify( &mut self, - mut block_import: BlockImportParams, - ) -> Result, String> { + mut block_import: BlockImportParams, + ) -> Result, String> { // Skip checks that include execution, if being told so or when importing only state. // // This is done for example when gap syncing and it is expected that the block after the gap diff --git a/bin/collator/src/rpc.rs b/bin/collator/src/rpc.rs index afa4f71f7d..26c9a5de82 100644 --- a/bin/collator/src/rpc.rs +++ b/bin/collator/src/rpc.rs @@ -18,13 +18,17 @@ //! Astar RPCs implementation. +use cumulus_primitives_parachain_inherent::ParachainInherentData; +use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder; use fc_rpc::{ - Eth, EthApiServer, EthBlockDataCacheTask, EthFilter, EthFilterApiServer, EthPubSub, - EthPubSubApiServer, Net, NetApiServer, OverrideHandle, TxPool, Web3, Web3ApiServer, + pending::ConsensusDataProvider, Eth, EthApiServer, EthBlockDataCacheTask, EthFilter, + EthFilterApiServer, EthPubSub, EthPubSubApiServer, Net, NetApiServer, OverrideHandle, Web3, + Web3ApiServer, }; use fc_rpc_core::types::{FeeHistoryCache, FilterPool}; use jsonrpsee::RpcModule; use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer}; +use polkadot_primitives::PersistedValidationData; use sc_client_api::{AuxStore, Backend, BlockchainEvents, StateBackend, StorageProvider}; use sc_network::NetworkService; use sc_network_sync::SyncingService; @@ -85,6 +89,21 @@ where )?)) } +pub struct AstarEthConfig(std::marker::PhantomData<(C, BE)>); + +impl fc_rpc::EthConfig for AstarEthConfig +where + C: sc_client_api::StorageProvider + Sync + Send + 'static, + BE: Backend + 'static, +{ + // Use to override (adapt) evm call to precompiles for proper gas estimation. + // We are not aware of any of our precompile that require this. + type EstimateGasAdapter = (); + // This assumes the use of HashedMapping for address mapping + type RuntimeStorageOverride = + fc_rpc::frontier_backend_client::SystemAccountId32StorageOverride; +} + /// Full client dependencies pub struct FullDeps { /// The client instance to use. @@ -102,7 +121,7 @@ pub struct FullDeps { /// The Node authority flag pub is_authority: bool, /// Frontier Backend. - pub frontier_backend: Arc + Send + Sync>, + pub frontier_backend: Arc>, /// EthFilterApi pool. pub filter_pool: FilterPool, /// Maximum fee history cache size. @@ -127,6 +146,7 @@ pub fn create_full( fc_mapping_sync::EthereumBlockNotification, >, >, + pending_consenus_data_provider: Box>, tracing_config: EvmTracingConfig, ) -> Result, Box> where @@ -157,7 +177,12 @@ where let client = Arc::clone(&deps.client); let graph = Arc::clone(&deps.graph); - let mut io = create_full_rpc(deps, subscription_task_executor, pubsub_notification_sinks)?; + let mut io = create_full_rpc( + deps, + subscription_task_executor, + pubsub_notification_sinks, + pending_consenus_data_provider, + )?; if tracing_config.enable_txpool { io.merge(MoonbeamTxPool::new(Arc::clone(&client), graph).into_rpc())?; @@ -191,6 +216,7 @@ pub fn create_full( fc_mapping_sync::EthereumBlockNotification, >, >, + pending_consenus_data_provider: Box>, ) -> Result, Box> where C: ProvideRuntimeApi @@ -215,7 +241,12 @@ where BE::Blockchain: BlockchainBackend, A: ChainApi + 'static, { - create_full_rpc(deps, subscription_task_executor, pubsub_notification_sinks) + create_full_rpc( + deps, + subscription_task_executor, + pubsub_notification_sinks, + pending_consenus_data_provider, + ) } fn create_full_rpc( @@ -226,6 +257,7 @@ fn create_full_rpc( fc_mapping_sync::EthereumBlockNotification, >, >, + pending_consenus_data_provider: Box>, ) -> Result, Box> where C: ProvideRuntimeApi @@ -278,8 +310,31 @@ where let no_tx_converter: Option = None; + let pending_create_inherent_data_providers = move |_, _| async move { + let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); + // Create a dummy parachain inherent data provider which is required to pass + // the checks by the para chain system. We use dummy values because in the 'pending context' + // neither do we have access to the real values nor do we need them. + let (relay_parent_storage_root, relay_chain_state) = + RelayStateSproofBuilder::default().into_state_root_and_proof(); + let vfp = PersistedValidationData { + // This is a hack to make `cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases` + // happy. Relay parent number can't be bigger than u32::MAX. + relay_parent_number: u32::MAX, + relay_parent_storage_root, + ..Default::default() + }; + let parachain_inherent_data = ParachainInherentData { + validation_data: vfp, + relay_chain_state, + downward_messages: Default::default(), + horizontal_messages: Default::default(), + }; + Ok((timestamp, parachain_inherent_data)) + }; + io.merge( - Eth::new( + Eth::<_, _, _, _, _, _, _, ()>::new( client.clone(), pool.clone(), graph.clone(), @@ -295,18 +350,20 @@ where // Allow 10x max allowed weight for non-transactional calls 10, None, + pending_create_inherent_data_providers, + Some(pending_consenus_data_provider), ) + .replace_config::>() .into_rpc(), )?; let max_past_logs: u32 = 10_000; let max_stored_filters: usize = 500; - let tx_pool = TxPool::new(client.clone(), graph); io.merge( EthFilter::new( client.clone(), frontier_backend, - tx_pool.clone(), + graph.clone(), filter_pool, max_stored_filters, max_past_logs, diff --git a/bin/collator/src/rpc/tracing.rs b/bin/collator/src/rpc/tracing.rs index 038d92403f..57660e9509 100644 --- a/bin/collator/src/rpc/tracing.rs +++ b/bin/collator/src/rpc/tracing.rs @@ -46,7 +46,7 @@ pub struct SpawnTasksParams<'a, B: BlockT, C, BE> { pub task_manager: &'a TaskManager, pub client: Arc, pub substrate_backend: Arc, - pub frontier_backend: Arc + Send + Sync>, + pub frontier_backend: Arc>, pub filter_pool: Option, pub overrides: Arc>, } diff --git a/bin/xcm-tools/src/command.rs b/bin/xcm-tools/src/command.rs index 9ad9fa8458..e8cbfa929a 100644 --- a/bin/xcm-tools/src/command.rs +++ b/bin/xcm-tools/src/command.rs @@ -27,10 +27,11 @@ use polkadot_primitives::AccountId; use sp_core::hexdisplay::HexDisplay; use sp_runtime::traits::AccountIdConversion; use xcm::latest::prelude::*; -use xcm_builder::{ParentIsPreset, SiblingParachainConvertsVia}; -use xcm_executor::traits::Convert; - -use astar_primitives::xcm::{DescribeAllTerminal, DescribeFamily, HashedDescription}; +use xcm_builder::{ + DescribeAllTerminal, DescribeFamily, HashedDescription, ParentIsPreset, + SiblingParachainConvertsVia, +}; +use xcm_executor::traits::ConvertLocation; /// CLI error type. pub type Error = String; @@ -42,7 +43,7 @@ pub fn run() -> Result<(), Error> { match &cli.subcommand { Some(Subcommand::RelayChainAccount) => { let relay_account = - ParentIsPreset::::convert_ref(&MultiLocation::parent()).unwrap(); + ParentIsPreset::::convert_location(&MultiLocation::parent()).unwrap(); println!("{}", relay_account); } Some(Subcommand::SovereignAccount(cmd)) => { @@ -51,7 +52,8 @@ pub fn run() -> Result<(), Error> { parents: 1, interior: X1(Parachain(cmd.parachain_id)), }; - SiblingParachainConvertsVia::::convert_ref(&location).unwrap() + SiblingParachainConvertsVia::::convert_location(&location) + .unwrap() } else { let para_id = ParaId::from(cmd.parachain_id); AccountIdConversion::::into_account_truncating(¶_id) @@ -97,10 +99,10 @@ pub fn run() -> Result<(), Error> { } let derived_acc = - HashedDescription::>::convert( - sender_multilocation, + HashedDescription::>::convert_location( + &sender_multilocation, ); - if let Ok(derived_acc) = derived_acc { + if let Some(derived_acc) = derived_acc { println!("{}", derived_acc); } else { println!("Failed to derive account Id."); diff --git a/pallets/dapp-staking-v3/src/types.rs b/pallets/dapp-staking-v3/src/types.rs index 6f49ac0f6e..56dcc0dc4c 100644 --- a/pallets/dapp-staking-v3/src/types.rs +++ b/pallets/dapp-staking-v3/src/types.rs @@ -66,7 +66,7 @@ use frame_support::{pallet_prelude::*, BoundedBTreeMap, BoundedVec}; use parity_scale_codec::{Decode, Encode}; -use serde::{Serialize, Deserialize}; +use serde::{Deserialize, Serialize}; use sp_arithmetic::fixed_point::FixedU64; use sp_runtime::{ traits::{CheckedAdd, UniqueSaturatedInto, Zero}, @@ -1384,7 +1384,6 @@ where Serialize, Deserialize, )] -// #[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] pub enum TierThreshold { /// Entry into tier is mandated by minimum amount of staked funds. /// Value is fixed, and is not expected to change in between periods. diff --git a/pallets/inflation/src/lib.rs b/pallets/inflation/src/lib.rs index 0164cfdc42..e904dc0a20 100644 --- a/pallets/inflation/src/lib.rs +++ b/pallets/inflation/src/lib.rs @@ -199,7 +199,7 @@ pub mod pallet { #[derive(DefaultNoBound)] pub struct GenesisConfig { pub params: InflationParameters, - _config: sp_std::marker::PhantomData, + pub _config: sp_std::marker::PhantomData, } /// This should be executed **AFTER** other pallets that cause issuance to increase have been initialized. @@ -532,7 +532,6 @@ pub struct InflationConfiguration { Serialize, Deserialize, )] -// #[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] pub struct InflationParameters { /// Maximum possible inflation rate, based on the total issuance at some point in time. /// From this value, all the other inflation parameters are derived. diff --git a/runtime/astar/src/lib.rs b/runtime/astar/src/lib.rs index d9e993e3b7..35a6c1972a 100644 --- a/runtime/astar/src/lib.rs +++ b/runtime/astar/src/lib.rs @@ -643,7 +643,6 @@ impl pallet_contracts::Config for Runtime { type Environment = (); // TODO: re-vist to make sure migration sequence is correct type Migrations = ( - pallet_contracts::migration::v11::Migration, pallet_contracts::migration::v12::Migration, pallet_contracts::migration::v13::Migration, pallet_contracts::migration::v14::Migration, diff --git a/runtime/shibuya/src/lib.rs b/runtime/shibuya/src/lib.rs index c5bc3444dc..498c11f148 100644 --- a/runtime/shibuya/src/lib.rs +++ b/runtime/shibuya/src/lib.rs @@ -697,7 +697,6 @@ impl pallet_contracts::Config for Runtime { type Environment = (); // TODO: re-vist to make sure migration sequence is correct type Migrations = ( - pallet_contracts::migration::v11::Migration, pallet_contracts::migration::v12::Migration, pallet_contracts::migration::v13::Migration, pallet_contracts::migration::v14::Migration, diff --git a/runtime/shiden/src/lib.rs b/runtime/shiden/src/lib.rs index b55bcaae5b..94de4f99de 100644 --- a/runtime/shiden/src/lib.rs +++ b/runtime/shiden/src/lib.rs @@ -636,7 +636,6 @@ impl pallet_contracts::Config for Runtime { type Environment = (); // TODO: re-vist to make sure migration sequence is correct type Migrations = ( - pallet_contracts::migration::v11::Migration, pallet_contracts::migration::v12::Migration, pallet_contracts::migration::v13::Migration, pallet_contracts::migration::v14::Migration, diff --git a/vendor/evm-tracing/src/formatters/raw.rs b/vendor/evm-tracing/src/formatters/raw.rs index 785beeb3ba..024658cdca 100644 --- a/vendor/evm-tracing/src/formatters/raw.rs +++ b/vendor/evm-tracing/src/formatters/raw.rs @@ -28,7 +28,7 @@ impl super::ResponseFormatter for Formatter { None } else { Some(TransactionTrace::Raw { - step_logs: listener.step_logs, + struct_logs: listener.struct_logs, gas: listener.final_gas.into(), return_value: listener.return_value, }) diff --git a/vendor/evm-tracing/src/listeners/raw.rs b/vendor/evm-tracing/src/listeners/raw.rs index 1e14200f2c..7ee12f5d21 100644 --- a/vendor/evm-tracing/src/listeners/raw.rs +++ b/vendor/evm-tracing/src/listeners/raw.rs @@ -32,7 +32,7 @@ pub struct Listener { new_context: bool, context_stack: Vec, - pub step_logs: Vec, + pub struct_logs: Vec, pub return_value: Vec, pub final_gas: u64, pub remaining_memory_usage: Option, @@ -77,7 +77,7 @@ impl Listener { disable_stack, remaining_memory_usage: Some(raw_max_memory_usage), - step_logs: vec![], + struct_logs: vec![], return_value: vec![], final_gas: 0, @@ -229,7 +229,7 @@ impl Listener { Some(context.storage_cache.clone()) }; - self.step_logs.push(RawStepLog { + self.struct_logs.push(RawStepLog { depth: depth.into(), gas: gas.into(), gas_cost: gas_cost.into(), diff --git a/vendor/evm-tracing/src/types/single.rs b/vendor/evm-tracing/src/types/single.rs index a5dbaa91c1..3c3bb4e155 100644 --- a/vendor/evm-tracing/src/types/single.rs +++ b/vendor/evm-tracing/src/types/single.rs @@ -57,7 +57,7 @@ pub enum TransactionTrace { gas: U256, #[serde(with = "hex")] return_value: Vec, - step_logs: Vec, + struct_logs: Vec, }, /// Matches the formatter used by Blockscout. /// Is also used to built output of OpenEthereum's `trace_filter`. diff --git a/vendor/rpc/debug/Cargo.toml b/vendor/rpc/debug/Cargo.toml index a0e6e55b35..229f92fb7e 100644 --- a/vendor/rpc/debug/Cargo.toml +++ b/vendor/rpc/debug/Cargo.toml @@ -35,5 +35,6 @@ ethereum-types = { workspace = true, features = ["std"] } fc-consensus = { workspace = true } fc-db = { workspace = true } fc-rpc = { workspace = true, features = ["rpc-binary-search-estimate"] } +fc-api = { workspace = true } fc-storage = { workspace = true } fp-rpc = { workspace = true } diff --git a/vendor/rpc/debug/src/lib.rs b/vendor/rpc/debug/src/lib.rs index 8fc4ef6638..de67bb0398 100644 --- a/vendor/rpc/debug/src/lib.rs +++ b/vendor/rpc/debug/src/lib.rs @@ -142,7 +142,7 @@ where pub fn task( client: Arc, backend: Arc, - frontier_backend: Arc + Send + Sync>, + frontier_backend: Arc>, permit_pool: Arc, overrides: Arc>, raw_max_memory_usage: usize, @@ -282,7 +282,7 @@ where fn handle_block_request( client: Arc, backend: Arc, - frontier_backend: Arc + Send + Sync>, + frontier_backend: Arc>, request_block_id: RequestBlockId, params: Option, overrides: Arc>, @@ -417,7 +417,7 @@ where fn handle_transaction_request( client: Arc, backend: Arc, - frontier_backend: Arc + Send + Sync>, + frontier_backend: Arc>, transaction_hash: H256, params: Option, overrides: Arc>, From 75a09bea211aaf7ba8c3fe36f9aa7cd6bf49b56e Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Fri, 16 Feb 2024 11:49:25 +0530 Subject: [PATCH 15/29] feat: evm tracing build works --- bin/collator/src/cli.rs | 4 ++-- bin/collator/src/command.rs | 6 ++--- bin/collator/src/local/mod.rs | 2 +- bin/collator/src/local/service.rs | 33 +++++++++++++++++++++------ bin/collator/src/parachain/service.rs | 33 +++++++++++++++------------ bin/collator/src/rpc/tracing.rs | 2 +- 6 files changed, 50 insertions(+), 30 deletions(-) diff --git a/bin/collator/src/cli.rs b/bin/collator/src/cli.rs index c292a5e746..ca880580d2 100644 --- a/bin/collator/src/cli.rs +++ b/bin/collator/src/cli.rs @@ -105,8 +105,8 @@ pub enum Subcommand { Benchmark(frame_benchmarking_cli::BenchmarkCmd), /// Try some command against runtime state. - #[cfg(feature = "try-runtime")] - TryRuntime(try_runtime_cli::TryRuntimeCmd), + /// No moved to separte cli and just a placeholder command here + TryRuntime, } #[derive(Debug)] diff --git a/bin/collator/src/command.rs b/bin/collator/src/command.rs index 1e4f4503d0..cba9518c07 100644 --- a/bin/collator/src/command.rs +++ b/bin/collator/src/command.rs @@ -785,13 +785,11 @@ pub fn run() -> Result<()> { } } } - Some(Subcommand::TryRuntime(_)) => { - Err("The `try-runtime` subcommand has been migrated to a \ + Some(Subcommand::TryRuntime) => Err("The `try-runtime` subcommand has been migrated to a \ standalone CLI (https://github.com/paritytech/try-runtime-cli). It is no longer \ being maintained here and will be removed entirely some time after January 2024. \ Please remove this subcommand from your runtime and use the standalone CLI." - .into()) - } + .into()), None => { let runner = cli.create_runner(&cli.run.normalize())?; let collator_options = cli.run.collator_options(); diff --git a/bin/collator/src/local/mod.rs b/bin/collator/src/local/mod.rs index 344a535fa9..8f8c1ead19 100644 --- a/bin/collator/src/local/mod.rs +++ b/bin/collator/src/local/mod.rs @@ -25,4 +25,4 @@ mod service; mod chain_spec; pub use chain_spec::*; -pub use service::{new_partial, start_node, Executor, RuntimeApi, HostFunctions}; +pub use service::{new_partial, start_node, Executor, HostFunctions, RuntimeApi}; diff --git a/bin/collator/src/local/service.rs b/bin/collator/src/local/service.rs index 44eac22469..70eaf18381 100644 --- a/bin/collator/src/local/service.rs +++ b/bin/collator/src/local/service.rs @@ -219,11 +219,23 @@ pub fn start_node( })?; if config.offchain_worker.enabled { - sc_service::build_offchain_workers( - &config, - task_manager.spawn_handle(), - client.clone(), - network.clone(), + task_manager.spawn_handle().spawn( + "offchain-workers-runner", + "offchain-work", + sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions { + runtime_api_provider: client.clone(), + keystore: Some(keystore_container.keystore()), + offchain_db: backend.offchain_storage(), + transaction_pool: Some(OffchainTransactionPoolFactory::new( + transaction_pool.clone(), + )), + network_provider: network.clone(), + is_validator: config.role.is_authority(), + enable_http_requests: true, + custom_extensions: move |_| vec![], + }) + .run(client.clone(), task_manager.spawn_handle()) + .boxed(), ); } @@ -353,10 +365,15 @@ pub fn start_node( enable_evm_rpc: true, // enable EVM RPC for dev node by default }; + let pending_consensus_data_provider = Box::new( + fc_rpc::pending::AuraConsensusDataProvider::new(client.clone()), + ); + crate::rpc::create_full( deps, subscription, pubsub_notification_sinks.clone(), + pending_consensus_data_provider, rpc_config.clone(), ) .map_err::(Into::into) @@ -382,7 +399,7 @@ pub fn start_node( let proposer_factory = sc_basic_authorship::ProposerFactory::new( task_manager.spawn_handle(), client.clone(), - transaction_pool, + transaction_pool.clone(), prometheus_registry.as_ref(), telemetry.as_ref().map(|x| x.handle()), ); @@ -437,7 +454,7 @@ pub fn start_node( let grandpa_config = sc_consensus_grandpa::Config { // FIXME #1578 make this available through chainspec gossip_duration: Duration::from_millis(333), - justification_period: GRANDPA_JUSTIFICATION_PERIOD, + justification_generation_period: GRANDPA_JUSTIFICATION_PERIOD, name: Some(name), observer_enabled: false, keystore, @@ -462,6 +479,7 @@ pub fn start_node( prometheus_registry, shared_voter_state: SharedVoterState::empty(), telemetry: telemetry.as_ref().map(|x| x.handle()), + offchain_tx_pool_factory: OffchainTransactionPoolFactory::new(transaction_pool), }; // the GRANDPA voter task is considered infallible, i.e. @@ -637,6 +655,7 @@ pub fn start_node(config: Configuration) -> Result { let pending_consensus_data_provider = Box::new( fc_rpc::pending::AuraConsensusDataProvider::new(client.clone()), ); + crate::rpc::create_full( deps, subscription, diff --git a/bin/collator/src/parachain/service.rs b/bin/collator/src/parachain/service.rs index db345524d9..7df31837c8 100644 --- a/bin/collator/src/parachain/service.rs +++ b/bin/collator/src/parachain/service.rs @@ -633,10 +633,8 @@ where RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue + sp_api::Metadata + sp_session::SessionKeys - + sp_api::ApiExt< - Block, - StateBackend = sc_client_api::StateBackendFor, Block>, - > + sp_offchain::OffchainWorkerApi + + sp_api::ApiExt + + sp_offchain::OffchainWorkerApi + sp_block_builder::BlockBuilder + substrate_frame_rpc_system::AccountNonceApi + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi @@ -644,7 +642,8 @@ where + moonbeam_rpc_primitives_txpool::TxPoolRuntimeApi + fp_rpc::EthereumRuntimeRPCApi + fp_rpc::ConvertTransactionRuntimeApi - + cumulus_primitives_core::CollectCollationInfo, + + cumulus_primitives_core::CollectCollationInfo + + AuraApi, sc_client_api::StateBackendFor, Block>: sp_api::StateBackend, Executor: sc_executor::NativeExecutionDispatch + 'static, BIQ: FnOnce( @@ -661,13 +660,7 @@ where &Configuration, Option, &TaskManager, - ) -> Result< - sc_consensus::DefaultImportQueue< - Block, - TFullClient>, - >, - sc_service::Error, - >, + ) -> Result, sc_service::Error>, BIC: FnOnce( Arc>>, ParachainBlockImport< @@ -730,6 +723,7 @@ where spawn_handle: task_manager.spawn_handle(), import_queue: params.import_queue, relay_chain_interface: relay_chain_interface.clone(), + sybil_resistance_level: cumulus_client_service::CollatorSybilResistance::Resistant, }) .await?; @@ -851,10 +845,15 @@ where enable_evm_rpc: additional_config.enable_evm_rpc, }; + let pending_consensus_data_provider = Box::new( + fc_rpc::pending::AuraConsensusDataProvider::new(client.clone()), + ); + crate::rpc::create_full( deps, subscription, pubsub_notification_sinks.clone(), + pending_consensus_data_provider, rpc_config.clone(), ) .map_err(Into::into) @@ -919,10 +918,10 @@ where recovery_handle: Box::new(overseer_handle), sync_service, }; - + #[allow(deprecated)] start_collator(params).await?; } else { - let params = StartFullNodeParams { + let params = StartRelayChainTasksParams { client: client.clone(), announce_block, task_manager: &mut task_manager, @@ -932,9 +931,10 @@ where import_queue: import_queue_service, recovery_handle: Box::new(overseer_handle), sync_service, + da_recovery_profile: DARecoveryProfile::FullNode, }; - start_full_node(params)?; + start_relay_chain_tasks(params)?; } start_network.start_network(); @@ -1106,6 +1106,7 @@ pub async fn start_astar_node( let relay_chain_for_aura = relay_chain_interface.clone(); + #[allow(deprecated)] Ok(AuraConsensus::build::< sp_consensus_aura::sr25519::AuthorityPair, _, @@ -1350,6 +1351,7 @@ pub async fn start_shiden_node( proposer_factory.set_default_block_size_limit(additional_config.proposer_block_size_limit); proposer_factory.set_soft_deadline(Percent::from_percent(additional_config.proposer_soft_deadline_percent)); + #[allow(deprecated)] AuraConsensus::build::< sp_consensus_aura::sr25519::AuthorityPair, _, @@ -1699,6 +1701,7 @@ pub async fn start_shibuya_node( proposer_factory.set_default_block_size_limit(additional_config.proposer_block_size_limit); proposer_factory.set_soft_deadline(Percent::from_percent(additional_config.proposer_soft_deadline_percent)); + #[allow(deprecated)] Ok(AuraConsensus::build::< sp_consensus_aura::sr25519::AuthorityPair, _, diff --git a/bin/collator/src/rpc/tracing.rs b/bin/collator/src/rpc/tracing.rs index 57660e9509..06e33c3207 100644 --- a/bin/collator/src/rpc/tracing.rs +++ b/bin/collator/src/rpc/tracing.rs @@ -46,7 +46,7 @@ pub struct SpawnTasksParams<'a, B: BlockT, C, BE> { pub task_manager: &'a TaskManager, pub client: Arc, pub substrate_backend: Arc, - pub frontier_backend: Arc>, + pub frontier_backend: Arc>, pub filter_pool: Option, pub overrides: Arc>, } From a6a3fcd3f9ccc80bd7cb23be96b56aa357e09a50 Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Fri, 16 Feb 2024 11:49:46 +0530 Subject: [PATCH 16/29] feat: bump spec versions --- runtime/astar/src/lib.rs | 4 ++-- runtime/shibuya/src/lib.rs | 17 ++--------------- runtime/shiden/src/lib.rs | 4 ++-- 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/runtime/astar/src/lib.rs b/runtime/astar/src/lib.rs index 35a6c1972a..b2c1c7a649 100644 --- a/runtime/astar/src/lib.rs +++ b/runtime/astar/src/lib.rs @@ -138,7 +138,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("astar"), impl_name: create_runtime_str!("astar"), authoring_version: 1, - spec_version: 76, + spec_version: 81, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 2, @@ -1072,7 +1072,7 @@ pub type Executive = frame_executive::Executive< Migrations, >; -pub type Migrations = (); +pub type Migrations = (pallet_contracts::Migration,); type EventRecord = frame_system::EventRecord< ::RuntimeEvent, diff --git a/runtime/shibuya/src/lib.rs b/runtime/shibuya/src/lib.rs index 498c11f148..35ae400107 100644 --- a/runtime/shibuya/src/lib.rs +++ b/runtime/shibuya/src/lib.rs @@ -171,7 +171,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("shibuya"), impl_name: create_runtime_str!("shibuya"), authoring_version: 1, - spec_version: 119, + spec_version: 123, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 2, @@ -1366,20 +1366,7 @@ parameter_types! { pub const DappStakingMigrationName: &'static str = "DappStakingMigration"; } -pub type Migrations = ( - pallet_static_price_provider::InitActivePrice, - pallet_dapp_staking_v3::migrations::DappStakingV3TierRewardAsTree, - pallet_dapp_staking_v3::migrations::DappStakingV3HistoryCleanupMarkerReset, - pallet_inflation::PalletInflationShibuyaMigration, - frame_support::migrations::RemovePallet< - DappsStakingV2Name, - ::DbWeight, - >, - frame_support::migrations::RemovePallet< - DappStakingMigrationName, - ::DbWeight, - >, -); +pub type Migrations = (pallet_contracts::Migration,); pub struct NextEraProvider; impl Get<(EraNumber, Weight)> for NextEraProvider { diff --git a/runtime/shiden/src/lib.rs b/runtime/shiden/src/lib.rs index 94de4f99de..b54a707e9b 100644 --- a/runtime/shiden/src/lib.rs +++ b/runtime/shiden/src/lib.rs @@ -140,7 +140,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("shiden"), impl_name: create_runtime_str!("shiden"), authoring_version: 1, - spec_version: 116, + spec_version: 119, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 2, @@ -1068,7 +1068,7 @@ pub type Executive = frame_executive::Executive< /// All migrations that will run on the next runtime upgrade. /// /// Once done, migrations should be removed from the tuple. -pub type Migrations = (); +pub type Migrations = (pallet_contracts::Migration,); type EventRecord = frame_system::EventRecord< ::RuntimeEvent, From c43995ddddb564e332b5bc060ccc01b0b488ae0b Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Tue, 20 Feb 2024 09:42:42 +0530 Subject: [PATCH 17/29] feat: streamline genesis state export --- bin/collator/src/command.rs | 41 ++++++++++++------------------------- 1 file changed, 13 insertions(+), 28 deletions(-) diff --git a/bin/collator/src/command.rs b/bin/collator/src/command.rs index cba9518c07..80e90e3dc1 100644 --- a/bin/collator/src/command.rs +++ b/bin/collator/src/command.rs @@ -41,7 +41,7 @@ use sc_service::{ use sp_core::hexdisplay::HexDisplay; use sp_runtime::traits::AccountIdConversion; use sp_runtime::traits::Block as BlockT; -use std::net::SocketAddr; +use std::{io::Write, net::SocketAddr}; #[cfg(feature = "runtime-benchmarks")] use frame_benchmarking_cli::{BenchmarkCmd, ExtrinsicFactory, SUBSTRATE_REFERENCE_HARDWARE}; @@ -456,37 +456,22 @@ pub fn run() -> Result<()> { } } Some(Subcommand::ExportGenesisState(cmd)) => { - let runner = cli.create_runner(cmd)?; let spec = cli.load_spec(&cmd.shared_params.chain.clone().unwrap_or_default())?; + let state_version = Cli::runtime_version(&spec).state_version(); - if runner.config().chain_spec.is_astar() { - runner.sync_run(|config| { - let PartialComponents { client, .. } = - parachain::new_partial::( - &config, - parachain::build_import_queue, - )?; - cmd.run::(&*spec, &*client) - }) - } else if runner.config().chain_spec.is_shiden() { - runner.sync_run(|config| { - let PartialComponents { client, .. } = - parachain::new_partial::( - &config, - parachain::build_import_queue, - )?; - cmd.run::(&*spec, &*client) - }) + let block: Block = generate_genesis_block(&*spec, state_version)?; + let raw_header = block.header().encode(); + let output_buf = if cmd.raw { + raw_header } else { - runner.sync_run(|config| { - let PartialComponents { client, .. } = - parachain::new_partial::( - &config, - parachain::build_import_queue, - )?; - cmd.run::(&*spec, &*client) - }) + format!("0x{:?}", HexDisplay::from(&block.header().encode())).into_bytes() + }; + if let Some(output) = &cmd.output { + std::fs::write(output, output_buf)?; + } else { + std::io::stdout().write_all(&output_buf)?; } + Ok(()) } Some(Subcommand::ExportGenesisWasm(cmd)) => { let runner = cli.create_runner(cmd)?; From 673824c7ebd9757f286e33b4982ab932a4c79793 Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Tue, 20 Feb 2024 09:43:01 +0530 Subject: [PATCH 18/29] fix: max hold in local runtime --- runtime/local/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/local/src/lib.rs b/runtime/local/src/lib.rs index aaaa88a5da..0358de6fbc 100644 --- a/runtime/local/src/lib.rs +++ b/runtime/local/src/lib.rs @@ -300,7 +300,7 @@ impl pallet_balances::Config for Runtime { type WeightInfo = weights::pallet_balances::SubstrateWeight; type RuntimeHoldReason = RuntimeHoldReason; type FreezeIdentifier = RuntimeFreezeReason; - type MaxHolds = ConstU32<0>; + type MaxHolds = ConstU32<1>; type MaxFreezes = ConstU32<1>; } From ce9bb84862dc27973624beb05e06ed8f9c9559db Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Tue, 20 Feb 2024 17:42:52 +0530 Subject: [PATCH 19/29] fix: aura issue in eth pending api --- bin/collator/src/rpc.rs | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/bin/collator/src/rpc.rs b/bin/collator/src/rpc.rs index 26c9a5de82..918c3c54f6 100644 --- a/bin/collator/src/rpc.rs +++ b/bin/collator/src/rpc.rs @@ -29,7 +29,9 @@ use fc_rpc_core::types::{FeeHistoryCache, FilterPool}; use jsonrpsee::RpcModule; use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer}; use polkadot_primitives::PersistedValidationData; -use sc_client_api::{AuxStore, Backend, BlockchainEvents, StateBackend, StorageProvider}; +use sc_client_api::{ + AuxStore, Backend, BlockchainEvents, StateBackend, StorageProvider, UsageProvider, +}; use sc_network::NetworkService; use sc_network_sync::SyncingService; use sc_rpc::dev::DevApiServer; @@ -41,6 +43,7 @@ use sp_block_builder::BlockBuilder; use sp_blockchain::{ Backend as BlockchainBackend, Error as BlockChainError, HeaderBackend, HeaderMetadata, }; +use sp_consensus_aura::{sr25519::AuthorityId as AuraId, AuraApi}; use sp_runtime::traits::BlakeTwo256; use std::sync::Arc; use substrate_frame_rpc_system::{System, SystemApiServer}; @@ -221,6 +224,7 @@ pub fn create_full( where C: ProvideRuntimeApi + HeaderBackend + + UsageProvider + CallApiAt + AuxStore + StorageProvider @@ -234,7 +238,8 @@ where + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi + fp_rpc::ConvertTransactionRuntimeApi + fp_rpc::EthereumRuntimeRPCApi - + BlockBuilder, + + BlockBuilder + + AuraApi, P: TransactionPool + Sync + Send + 'static, BE: Backend + 'static, BE::State: StateBackend, @@ -261,6 +266,7 @@ fn create_full_rpc( ) -> Result, Box> where C: ProvideRuntimeApi + + UsageProvider + HeaderBackend + CallApiAt + AuxStore @@ -275,7 +281,8 @@ where + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi + fp_rpc::ConvertTransactionRuntimeApi + fp_rpc::EthereumRuntimeRPCApi - + BlockBuilder, + + BlockBuilder + + AuraApi, P: TransactionPool + Sync + Send + 'static, BE: Backend + 'static, BE::State: StateBackend, @@ -310,8 +317,16 @@ where let no_tx_converter: Option = None; + let slot_duration = sc_consensus_aura::slot_duration(&*client)?; let pending_create_inherent_data_providers = move |_, _| async move { - let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); + let current = sp_timestamp::InherentDataProvider::from_system_time(); + let next_slot = current.timestamp().as_millis() + slot_duration.as_millis(); + let timestamp = sp_timestamp::InherentDataProvider::new(next_slot.into()); + let slot = + sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( + *timestamp, + slot_duration, + ); // Create a dummy parachain inherent data provider which is required to pass // the checks by the para chain system. We use dummy values because in the 'pending context' // neither do we have access to the real values nor do we need them. @@ -330,7 +345,7 @@ where downward_messages: Default::default(), horizontal_messages: Default::default(), }; - Ok((timestamp, parachain_inherent_data)) + Ok((slot, timestamp, parachain_inherent_data)) }; io.merge( From fa491daf943144673f5dc32a8711f13e30d49397 Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Sat, 24 Feb 2024 10:27:14 +0530 Subject: [PATCH 20/29] feat: review comments --- bin/collator/src/local/service.rs | 2 ++ runtime/astar/Cargo.toml | 3 --- runtime/astar/src/lib.rs | 9 ++++----- runtime/shiden/src/lib.rs | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/bin/collator/src/local/service.rs b/bin/collator/src/local/service.rs index 70eaf18381..8e16004f60 100644 --- a/bin/collator/src/local/service.rs +++ b/bin/collator/src/local/service.rs @@ -35,6 +35,8 @@ pub use local_runtime::RuntimeApi; use astar_primitives::*; +/// The minimum period of blocks on which justifications will be +/// imported and generated. const GRANDPA_JUSTIFICATION_PERIOD: u32 = 512; /// Extra host functions diff --git a/runtime/astar/Cargo.toml b/runtime/astar/Cargo.toml index e1e4feadad..3136dc05ad 100644 --- a/runtime/astar/Cargo.toml +++ b/runtime/astar/Cargo.toml @@ -92,7 +92,6 @@ orml-xtokens = { workspace = true } array-bytes = { workspace = true } frame-benchmarking = { workspace = true, optional = true } frame-system-benchmarking = { workspace = true, optional = true } -pallet-collective = { workspace = true, optional = true } # try-runtime frame-try-runtime = { workspace = true, optional = true } @@ -174,7 +173,6 @@ std = [ "pallet-sudo/std", "pallet-transaction-payment/std", "pallet-transaction-payment-rpc-runtime-api/std", - 'pallet-collective/std', "pallet-xcm/std", "parachain-info/std", "polkadot-parachain/std", @@ -213,7 +211,6 @@ runtime-benchmarks = [ 'pallet-balances/runtime-benchmarks', "pallet-proxy/runtime-benchmarks", 'pallet-timestamp/runtime-benchmarks', - 'pallet-collective/runtime-benchmarks', "pallet-ethereum/runtime-benchmarks", "pallet-dapps-staking/runtime-benchmarks", "pallet-block-rewards-hybrid/runtime-benchmarks", diff --git a/runtime/astar/src/lib.rs b/runtime/astar/src/lib.rs index b2c1c7a649..8253880faf 100644 --- a/runtime/astar/src/lib.rs +++ b/runtime/astar/src/lib.rs @@ -382,16 +382,15 @@ impl parachain_info::Config for Runtime {} parameter_types! { pub const MaxAuthorities: u32 = 250; - // Should be only enabled (`true`) when async backing is enabled - // otherwise set to `false` - pub const AllowMultipleBlocksPerSlot: bool = false; } impl pallet_aura::Config for Runtime { type AuthorityId = AuraId; type DisabledValidators = (); type MaxAuthorities = MaxAuthorities; - type AllowMultipleBlocksPerSlot = AllowMultipleBlocksPerSlot; + // Should be only enabled (`true`) when async backing is enabled + // otherwise set to `false` + type AllowMultipleBlocksPerSlot = ConstBool; } impl cumulus_pallet_aura_ext::Config for Runtime {} @@ -1072,7 +1071,7 @@ pub type Executive = frame_executive::Executive< Migrations, >; -pub type Migrations = (pallet_contracts::Migration,); +pub type Migrations = (pallet_contracts::Migration,); type EventRecord = frame_system::EventRecord< ::RuntimeEvent, diff --git a/runtime/shiden/src/lib.rs b/runtime/shiden/src/lib.rs index b54a707e9b..b98c923b17 100644 --- a/runtime/shiden/src/lib.rs +++ b/runtime/shiden/src/lib.rs @@ -140,7 +140,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("shiden"), impl_name: create_runtime_str!("shiden"), authoring_version: 1, - spec_version: 119, + spec_version: 120, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 2, From 0e4b49af4a83b9ab1ec75cdef4ca3d33e8eb15d2 Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Tue, 27 Feb 2024 15:15:30 +0530 Subject: [PATCH 21/29] feat: copy `AllowTopLevelPaidExecutionFrom` barrier into primititves --- bin/xcm-tools/src/command.rs | 2 +- precompiles/xcm/src/mock.rs | 5 +- primitives/src/xcm/mod.rs | 73 ++++++++++++++++++++-- runtime/astar/src/xcm_config.rs | 14 ++--- runtime/shibuya/src/xcm_config.rs | 18 +++--- runtime/shiden/src/xcm_config.rs | 17 +++-- tests/xcm-simulator/src/mocks/parachain.rs | 9 +-- 7 files changed, 101 insertions(+), 37 deletions(-) diff --git a/bin/xcm-tools/src/command.rs b/bin/xcm-tools/src/command.rs index 6bfda4af80..1378307c57 100644 --- a/bin/xcm-tools/src/command.rs +++ b/bin/xcm-tools/src/command.rs @@ -20,6 +20,7 @@ use crate::cli::*; +use astar_primitives::xcm::DescribeAllTerminal; use clap::Parser; use cumulus_primitives_core::ParaId; use polkadot_parachain::primitives::Sibling; @@ -29,7 +30,6 @@ use sp_runtime::traits::AccountIdConversion; use xcm::latest::prelude::*; use xcm_builder::{DescribeFamily, HashedDescription, ParentIsPreset, SiblingParachainConvertsVia}; use xcm_executor::traits::ConvertLocation; -use astar_primitives::xcm::DescribeAllTerminal; /// CLI error type. pub type Error = String; diff --git a/precompiles/xcm/src/mock.rs b/precompiles/xcm/src/mock.rs index 1b6554a1ca..2a3ce2e908 100644 --- a/precompiles/xcm/src/mock.rs +++ b/precompiles/xcm/src/mock.rs @@ -41,10 +41,11 @@ use sp_runtime::{ }; use sp_std::cell::RefCell; +use astar_primitives::xcm::AllowTopLevelPaidExecutionFrom; use xcm::prelude::XcmVersion; use xcm_builder::{ - test_utils::TransactAsset, AllowKnownQueryResponses, AllowSubscriptionsFrom, - AllowTopLevelPaidExecutionFrom, FixedWeightBounds, SignedToAccountId32, TakeWeightCredit, + test_utils::TransactAsset, AllowKnownQueryResponses, AllowSubscriptionsFrom, FixedWeightBounds, + SignedToAccountId32, TakeWeightCredit, }; use xcm_executor::XcmExecutor; // orml imports diff --git a/primitives/src/xcm/mod.rs b/primitives/src/xcm/mod.rs index a45080981e..c7ab998b5c 100644 --- a/primitives/src/xcm/mod.rs +++ b/primitives/src/xcm/mod.rs @@ -33,17 +33,18 @@ use crate::AccountId; use frame_support::{ - traits::{tokens::fungibles, ContainsPair, Get}, + ensure, + traits::{tokens::fungibles, Contains, ContainsPair, Get, ProcessMessageError}, weights::constants::WEIGHT_REF_TIME_PER_SECOND, }; use parity_scale_codec::Encode; use sp_runtime::traits::{Bounded, Convert, MaybeEquivalence, Zero}; -use sp_std::marker::PhantomData; +use sp_std::{marker::PhantomData, vec::Vec}; // Polkadot imports use xcm::latest::{prelude::*, Weight}; -use xcm_builder::TakeRevenue; -use xcm_executor::traits::{MatchesFungibles, WeightTrader}; +use xcm_builder::{CreateMatcher, MatchXcm, TakeRevenue}; +use xcm_executor::traits::{MatchesFungibles, Properties, ShouldExecute, WeightTrader}; // ORML imports use orml_traits::location::{RelativeReserveProvider, Reserve}; @@ -268,7 +269,7 @@ impl< } } -// TODO: remove this after uplift to `polkadot-v0.9.44` or beyond, and replace it with code in XCM builder. +// TODO: remove this after uplift to `polkadot-v1.3.0` or beyond, and replace it with code in XCM builder. pub struct DescribeBodyTerminal; impl xcm_builder::DescribeLocation for DescribeBodyTerminal { @@ -316,3 +317,65 @@ impl> Reserve }) } } + +// Copying the barrier here due to this issue - https://github.com/paritytech/polkadot-sdk/issues/1638 +// The fix was introduced in v1.3.0 via this PR - https://github.com/paritytech/polkadot-sdk/pull/1733 +// Below is the exact same copy from the fix PR. + +const MAX_ASSETS_FOR_BUY_EXECUTION: usize = 2; + +/// Allows execution from `origin` if it is contained in `T` (i.e. `T::Contains(origin)`) taking +/// payments into account. +/// +/// Only allows for `TeleportAsset`, `WithdrawAsset`, `ClaimAsset` and `ReserveAssetDeposit` XCMs +/// because they are the only ones that place assets in the Holding Register to pay for execution. +pub struct AllowTopLevelPaidExecutionFrom(PhantomData); +impl> ShouldExecute for AllowTopLevelPaidExecutionFrom { + fn should_execute( + origin: &MultiLocation, + instructions: &mut [Instruction], + max_weight: Weight, + _properties: &mut Properties, + ) -> Result<(), ProcessMessageError> { + log::trace!( + target: "xcm::barriers", + "AllowTopLevelPaidExecutionFrom origin: {:?}, instructions: {:?}, max_weight: {:?}, properties: {:?}", + origin, instructions, max_weight, _properties, + ); + + ensure!(T::contains(origin), ProcessMessageError::Unsupported); + // We will read up to 5 instructions. This allows up to 3 `ClearOrigin` instructions. We + // allow for more than one since anything beyond the first is a no-op and it's conceivable + // that composition of operations might result in more than one being appended. + let end = instructions.len().min(5); + instructions[..end] + .matcher() + .match_next_inst(|inst| match inst { + ReceiveTeleportedAsset(..) | ReserveAssetDeposited(..) => Ok(()), + WithdrawAsset(ref assets) if assets.len() <= MAX_ASSETS_FOR_BUY_EXECUTION => Ok(()), + ClaimAsset { ref assets, .. } if assets.len() <= MAX_ASSETS_FOR_BUY_EXECUTION => { + Ok(()) + } + _ => Err(ProcessMessageError::BadFormat), + })? + .skip_inst_while(|inst| matches!(inst, ClearOrigin))? + .match_next_inst(|inst| match inst { + BuyExecution { + weight_limit: Limited(ref mut weight), + .. + } if weight.all_gte(max_weight) => { + *weight = max_weight; + Ok(()) + } + BuyExecution { + ref mut weight_limit, + .. + } if weight_limit == &Unlimited => { + *weight_limit = Limited(max_weight); + Ok(()) + } + _ => Err(ProcessMessageError::Overweight(max_weight)), + })?; + Ok(()) + } +} diff --git a/runtime/astar/src/xcm_config.rs b/runtime/astar/src/xcm_config.rs index 095f7b3fad..4432429d01 100644 --- a/runtime/astar/src/xcm_config.rs +++ b/runtime/astar/src/xcm_config.rs @@ -34,11 +34,11 @@ use sp_runtime::traits::{Convert, MaybeEquivalence}; use xcm::latest::prelude::*; use xcm_builder::{ Account32Hash, AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, - AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, ConvertedConcreteId, CurrencyAdapter, - EnsureXcmOrigin, FixedWeightBounds, FungiblesAdapter, IsConcrete, NoChecking, - ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, - SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, - SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, + AllowUnpaidExecutionFrom, ConvertedConcreteId, CurrencyAdapter, EnsureXcmOrigin, + FixedWeightBounds, FungiblesAdapter, IsConcrete, NoChecking, ParentAsSuperuser, ParentIsPreset, + RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, + SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, + UsingComponents, }; use xcm_executor::{ traits::{JustTry, WithOriginFilter}, @@ -50,8 +50,8 @@ use orml_xcm_support::DisabledParachainFee; // Astar imports use astar_primitives::xcm::{ - AbsoluteAndRelativeReserveProvider, AccountIdToMultiLocation, FixedRateOfForeignAsset, - ReserveAssetFilter, XcmFungibleFeeHandler, + AbsoluteAndRelativeReserveProvider, AccountIdToMultiLocation, AllowTopLevelPaidExecutionFrom, + FixedRateOfForeignAsset, ReserveAssetFilter, XcmFungibleFeeHandler, }; parameter_types! { diff --git a/runtime/shibuya/src/xcm_config.rs b/runtime/shibuya/src/xcm_config.rs index 449f63de73..4c46ecdef1 100644 --- a/runtime/shibuya/src/xcm_config.rs +++ b/runtime/shibuya/src/xcm_config.rs @@ -33,13 +33,12 @@ use sp_runtime::traits::{Convert, MaybeEquivalence}; // Polkadot imports use xcm::latest::prelude::*; use xcm_builder::{ - AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, - AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, ConvertedConcreteId, CurrencyAdapter, - DescribeFamily, EnsureXcmOrigin, FungiblesAdapter, HashedDescription, IsConcrete, NoChecking, - ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, - SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, - SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, WeightInfoBounds, - WithComputedOrigin, + AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowUnpaidExecutionFrom, + ConvertedConcreteId, CurrencyAdapter, DescribeFamily, EnsureXcmOrigin, FungiblesAdapter, + HashedDescription, IsConcrete, NoChecking, ParentAsSuperuser, ParentIsPreset, + RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, + SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, + UsingComponents, WeightInfoBounds, WithComputedOrigin, }; use xcm_executor::{traits::JustTry, XcmExecutor}; @@ -48,8 +47,9 @@ use orml_xcm_support::DisabledParachainFee; // Astar imports use astar_primitives::xcm::{ - AbsoluteAndRelativeReserveProvider, AccountIdToMultiLocation, DescribeAllTerminal, - FixedRateOfForeignAsset, ReserveAssetFilter, XcmFungibleFeeHandler, MAX_ASSETS, + AbsoluteAndRelativeReserveProvider, AccountIdToMultiLocation, AllowTopLevelPaidExecutionFrom, + DescribeAllTerminal, FixedRateOfForeignAsset, ReserveAssetFilter, XcmFungibleFeeHandler, + MAX_ASSETS, }; parameter_types! { diff --git a/runtime/shiden/src/xcm_config.rs b/runtime/shiden/src/xcm_config.rs index 2f9a78315b..0a3cef6df4 100644 --- a/runtime/shiden/src/xcm_config.rs +++ b/runtime/shiden/src/xcm_config.rs @@ -33,13 +33,12 @@ use sp_runtime::traits::{Convert, MaybeEquivalence}; // Polkadot imports use xcm::latest::prelude::*; use xcm_builder::{ - AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, - AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, ConvertedConcreteId, CurrencyAdapter, - DescribeFamily, EnsureXcmOrigin, FixedWeightBounds, FungiblesAdapter, HashedDescription, - IsConcrete, NoChecking, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, - SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, - SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, - WithComputedOrigin, + AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowUnpaidExecutionFrom, + ConvertedConcreteId, CurrencyAdapter, DescribeFamily, EnsureXcmOrigin, FixedWeightBounds, + FungiblesAdapter, HashedDescription, IsConcrete, NoChecking, ParentAsSuperuser, ParentIsPreset, + RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, + SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, + UsingComponents, WithComputedOrigin, }; use xcm_executor::{ traits::{JustTry, WithOriginFilter}, @@ -51,8 +50,8 @@ use orml_xcm_support::DisabledParachainFee; // Astar imports use astar_primitives::xcm::{ - AbsoluteAndRelativeReserveProvider, AccountIdToMultiLocation, DescribeAllTerminal, - FixedRateOfForeignAsset, ReserveAssetFilter, XcmFungibleFeeHandler, + AbsoluteAndRelativeReserveProvider, AccountIdToMultiLocation, AllowTopLevelPaidExecutionFrom, + DescribeAllTerminal, FixedRateOfForeignAsset, ReserveAssetFilter, XcmFungibleFeeHandler, }; parameter_types! { diff --git a/tests/xcm-simulator/src/mocks/parachain.rs b/tests/xcm-simulator/src/mocks/parachain.rs index 08efdb4e63..467b2effe9 100644 --- a/tests/xcm-simulator/src/mocks/parachain.rs +++ b/tests/xcm-simulator/src/mocks/parachain.rs @@ -49,9 +49,9 @@ use super::msg_queue::*; use xcm::latest::prelude::{AssetId as XcmAssetId, *}; use xcm_builder::{ Account32Hash, AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, - AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, ConvertedConcreteId, CurrencyAdapter, - EnsureXcmOrigin, FixedRateOfFungible, FixedWeightBounds, FungiblesAdapter, IsConcrete, - NoChecking, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, + AllowUnpaidExecutionFrom, ConvertedConcreteId, CurrencyAdapter, EnsureXcmOrigin, + FixedRateOfFungible, FixedWeightBounds, FungiblesAdapter, IsConcrete, NoChecking, + ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, WithComputedOrigin, }; @@ -62,7 +62,8 @@ use orml_xcm_support::DisabledParachainFee; use xcm_executor::{traits::JustTry, XcmExecutor}; use astar_primitives::xcm::{ - AssetLocationIdConverter, FixedRateOfForeignAsset, ReserveAssetFilter, XcmFungibleFeeHandler, + AllowTopLevelPaidExecutionFrom, AssetLocationIdConverter, FixedRateOfForeignAsset, + ReserveAssetFilter, XcmFungibleFeeHandler, }; pub type AccountId = AccountId32; From 0062a9be9aab0b2a54ecb3ac0fdb4e60c1484ece Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Tue, 27 Feb 2024 19:46:58 +0530 Subject: [PATCH 22/29] fix: build error --- bin/collator/src/rpc.rs | 2 ++ runtime/astar/src/lib.rs | 2 -- runtime/local/src/lib.rs | 1 - runtime/shibuya/src/lib.rs | 2 -- runtime/shiden/src/lib.rs | 2 -- 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/bin/collator/src/rpc.rs b/bin/collator/src/rpc.rs index 918c3c54f6..99d47e0189 100644 --- a/bin/collator/src/rpc.rs +++ b/bin/collator/src/rpc.rs @@ -155,6 +155,7 @@ pub fn create_full( where C: ProvideRuntimeApi + HeaderBackend + + UsageProvider + CallApiAt + AuxStore + StorageProvider @@ -169,6 +170,7 @@ where + fp_rpc::ConvertTransactionRuntimeApi + fp_rpc::EthereumRuntimeRPCApi + BlockBuilder + + AuraApi + moonbeam_rpc_primitives_debug::DebugRuntimeApi + moonbeam_rpc_primitives_txpool::TxPoolRuntimeApi, P: TransactionPool + Sync + Send + 'static, diff --git a/runtime/astar/src/lib.rs b/runtime/astar/src/lib.rs index d172978774..fc38e0ed46 100644 --- a/runtime/astar/src/lib.rs +++ b/runtime/astar/src/lib.rs @@ -664,7 +664,6 @@ parameter_types! { pub const DepositPerByte: Balance = contracts_deposit(0, 1); // Fallback value if storage deposit limit not set by the user pub const DefaultDepositLimit: Balance = contracts_deposit(16, 16 * 1024); - // TODO: re-vist to make sure values are appropriate pub const MaxDelegateDependencies: u32 = 32; pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(30); pub Schedule: pallet_contracts::Schedule = Default::default(); @@ -712,7 +711,6 @@ impl pallet_contracts::Config for Runtime { type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent; type Debug = (); type Environment = (); - // TODO: re-vist to make sure migration sequence is correct type Migrations = ( pallet_contracts::migration::v12::Migration, pallet_contracts::migration::v13::Migration, diff --git a/runtime/local/src/lib.rs b/runtime/local/src/lib.rs index cbedb29dc0..e7d477edab 100644 --- a/runtime/local/src/lib.rs +++ b/runtime/local/src/lib.rs @@ -900,7 +900,6 @@ parameter_types! { pub const DepositPerByte: Balance = deposit(0, 1); // Fallback value if storage deposit limit not set by the user pub const DefaultDepositLimit: Balance = deposit(16, 16 * 1024); - // TODO: re-vist to make sure values are appropriate pub const MaxDelegateDependencies: u32 = 32; pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(30); pub Schedule: pallet_contracts::Schedule = Default::default(); diff --git a/runtime/shibuya/src/lib.rs b/runtime/shibuya/src/lib.rs index 894772b1a9..58daabc93d 100644 --- a/runtime/shibuya/src/lib.rs +++ b/runtime/shibuya/src/lib.rs @@ -672,7 +672,6 @@ parameter_types! { pub const DepositPerByte: Balance = contracts_deposit(0, 1); // Fallback value if storage deposit limit not set by the user pub const DefaultDepositLimit: Balance = contracts_deposit(16, 16 * 1024); - // TODO: re-vist to make sure values are appropriate pub const MaxDelegateDependencies: u32 = 32; pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(30); pub Schedule: pallet_contracts::Schedule = Default::default(); @@ -713,7 +712,6 @@ impl pallet_contracts::Config for Runtime { type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent; type Debug = (); type Environment = (); - // TODO: re-vist to make sure migration sequence is correct type Migrations = ( pallet_contracts::migration::v12::Migration, pallet_contracts::migration::v13::Migration, diff --git a/runtime/shiden/src/lib.rs b/runtime/shiden/src/lib.rs index f4c307c082..0028a573b6 100644 --- a/runtime/shiden/src/lib.rs +++ b/runtime/shiden/src/lib.rs @@ -630,7 +630,6 @@ parameter_types! { pub const DepositPerByte: Balance = contracts_deposit(0, 1); // Fallback value if storage deposit limit not set by the user pub const DefaultDepositLimit: Balance = contracts_deposit(16, 16 * 1024); - // TODO: re-vist to make sure values are appropriate pub const MaxDelegateDependencies: u32 = 32; pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(30); pub Schedule: pallet_contracts::Schedule = Default::default(); @@ -667,7 +666,6 @@ impl pallet_contracts::Config for Runtime { type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent; type Debug = (); type Environment = (); - // TODO: re-vist to make sure migration sequence is correct type Migrations = ( pallet_contracts::migration::v12::Migration, pallet_contracts::migration::v13::Migration, From f3240f0487365d78698e9d24820e88633638372a Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Tue, 27 Feb 2024 21:17:10 +0530 Subject: [PATCH 23/29] fix: make taplo happy --- pallets/astar-xcm-benchmarks/Cargo.toml | 2 +- pallets/block-rewards-hybrid/Cargo.toml | 2 +- vendor/rpc/debug/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pallets/astar-xcm-benchmarks/Cargo.toml b/pallets/astar-xcm-benchmarks/Cargo.toml index 37f7df417d..db29f90c9e 100644 --- a/pallets/astar-xcm-benchmarks/Cargo.toml +++ b/pallets/astar-xcm-benchmarks/Cargo.toml @@ -18,8 +18,8 @@ frame-support = { workspace = true } frame-system = { workspace = true } parity-scale-codec = { workspace = true, optional = true, features = ["derive"] } scale-info = { workspace = true } -sp-std = { workspace = true } sp-runtime = { workspace = true } +sp-std = { workspace = true } # Polkadot / XCM pallet-xcm-benchmarks = { workspace = true } diff --git a/pallets/block-rewards-hybrid/Cargo.toml b/pallets/block-rewards-hybrid/Cargo.toml index 0ec9ae7578..1c654578e8 100644 --- a/pallets/block-rewards-hybrid/Cargo.toml +++ b/pallets/block-rewards-hybrid/Cargo.toml @@ -14,13 +14,13 @@ parity-scale-codec = { workspace = true } serde = { workspace = true } astar-primitives = { workspace = true } +frame-benchmarking = { workspace = true, optional = true } frame-support = { workspace = true } frame-system = { workspace = true } scale-info = { workspace = true } sp-arithmetic = { workspace = true } sp-runtime = { workspace = true } sp-std = { workspace = true } -frame-benchmarking = { workspace = true, optional = true } [dev-dependencies] pallet-balances = { workspace = true } diff --git a/vendor/rpc/debug/Cargo.toml b/vendor/rpc/debug/Cargo.toml index 229f92fb7e..ba3e0ee12b 100644 --- a/vendor/rpc/debug/Cargo.toml +++ b/vendor/rpc/debug/Cargo.toml @@ -32,9 +32,9 @@ sp-runtime = { workspace = true, features = ["std"] } # Frontier ethereum = { workspace = true, features = ["with-codec"] } ethereum-types = { workspace = true, features = ["std"] } +fc-api = { workspace = true } fc-consensus = { workspace = true } fc-db = { workspace = true } fc-rpc = { workspace = true, features = ["rpc-binary-search-estimate"] } -fc-api = { workspace = true } fc-storage = { workspace = true } fp-rpc = { workspace = true } From f40c1f887b4376b44e7d62f5d872f059d2aed44e Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Thu, 29 Feb 2024 09:45:32 +0530 Subject: [PATCH 24/29] fix: review comments --- runtime/astar/src/lib.rs | 2 +- runtime/shibuya/src/lib.rs | 2 +- runtime/shiden/src/lib.rs | 29 +++++++++++++++++++++++++++-- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/runtime/astar/src/lib.rs b/runtime/astar/src/lib.rs index fc38e0ed46..7c2054dcbe 100644 --- a/runtime/astar/src/lib.rs +++ b/runtime/astar/src/lib.rs @@ -148,7 +148,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("astar"), impl_name: create_runtime_str!("astar"), authoring_version: 1, - spec_version: 81, + spec_version: 80, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 2, diff --git a/runtime/shibuya/src/lib.rs b/runtime/shibuya/src/lib.rs index 58daabc93d..701afc77f4 100644 --- a/runtime/shibuya/src/lib.rs +++ b/runtime/shibuya/src/lib.rs @@ -173,7 +173,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("shibuya"), impl_name: create_runtime_str!("shibuya"), authoring_version: 1, - spec_version: 123, + spec_version: 122, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 2, diff --git a/runtime/shiden/src/lib.rs b/runtime/shiden/src/lib.rs index 0028a573b6..be49b51e6b 100644 --- a/runtime/shiden/src/lib.rs +++ b/runtime/shiden/src/lib.rs @@ -149,7 +149,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("shiden"), impl_name: create_runtime_str!("shiden"), authoring_version: 1, - spec_version: 120, + spec_version: 119, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 2, @@ -1111,7 +1111,32 @@ parameter_types! { /// All migrations that will run on the next runtime upgrade. /// /// Once done, migrations should be removed from the tuple. -pub type Migrations = (pallet_contracts::Migration,); +pub type Migrations = ( + // Part of shiden-119 + frame_support::migrations::RemovePallet< + DappStakingMigrationName, + ::DbWeight, + >, + // Part of shiden-119 + RecalculationEraFix, +); + +use frame_support::traits::OnRuntimeUpgrade; +pub struct RecalculationEraFix; +impl OnRuntimeUpgrade for RecalculationEraFix { + fn on_runtime_upgrade() -> Weight { + let first_dapp_staking_v3_era = 743; + + let expected_recalculation_era = + InflationCycleConfig::eras_per_cycle().saturating_add(first_dapp_staking_v3_era); + + pallet_inflation::ActiveInflationConfig::::mutate(|config| { + config.recalculation_era = expected_recalculation_era; + }); + + ::DbWeight::get().reads_writes(1, 1) + } +} type EventRecord = frame_system::EventRecord< ::RuntimeEvent, From 79104e1815ce9fd6fe0cabffed4701ce12210c29 Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Thu, 29 Feb 2024 09:46:52 +0530 Subject: [PATCH 25/29] fix: add contract migration back into shiden --- runtime/shiden/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/runtime/shiden/src/lib.rs b/runtime/shiden/src/lib.rs index be49b51e6b..ca2f24f83a 100644 --- a/runtime/shiden/src/lib.rs +++ b/runtime/shiden/src/lib.rs @@ -1119,6 +1119,7 @@ pub type Migrations = ( >, // Part of shiden-119 RecalculationEraFix, + pallet_contracts::Migration, ); use frame_support::traits::OnRuntimeUpgrade; From 3c2c7a278fd7454bfe5800bfd7a3df5df9988ba2 Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Thu, 29 Feb 2024 14:27:21 +0530 Subject: [PATCH 26/29] feat: remove `BlockNumberFor` clauses --- .../src/benchmarking.rs | 10 +-- pallets/dapp-staking-migration/src/lib.rs | 36 ++------ .../dapp-staking-v3/src/benchmarking/mod.rs | 9 +- .../dapp-staking-v3/src/benchmarking/utils.rs | 82 ++++--------------- pallets/dapp-staking-v3/src/lib.rs | 46 +++-------- pallets/dapp-staking-v3/src/migrations.rs | 4 +- pallets/inflation/src/benchmarking.rs | 10 +-- 7 files changed, 46 insertions(+), 151 deletions(-) diff --git a/pallets/dapp-staking-migration/src/benchmarking.rs b/pallets/dapp-staking-migration/src/benchmarking.rs index 24e20928e2..0a1f4da9fc 100644 --- a/pallets/dapp-staking-migration/src/benchmarking.rs +++ b/pallets/dapp-staking-migration/src/benchmarking.rs @@ -33,10 +33,7 @@ fn smart_contract(index: u8) -> T::SmartContrac } /// Initialize the old dApp staking pallet with some storage. -pub(super) fn initial_config() -where - BlockNumberFor: IsType, -{ +pub(super) fn initial_config() { let dapps_number = ::MaxNumberOfContracts::get(); let dapps_number = (dapps_number as u8).min(100); @@ -69,10 +66,7 @@ where } } -#[benchmarks( - where - BlockNumberFor: IsType, -)] +#[benchmarks] mod benchmarks { use super::*; diff --git a/pallets/dapp-staking-migration/src/lib.rs b/pallets/dapp-staking-migration/src/lib.rs index 7dec9ffdaa..b199300d88 100644 --- a/pallets/dapp-staking-migration/src/lib.rs +++ b/pallets/dapp-staking-migration/src/lib.rs @@ -98,8 +98,6 @@ pub mod pallet { pub trait Config: // Tight coupling, but it's fine since pallet is supposed to be just temporary and will be removed after migration. frame_system::Config + pallet_dapp_staking_v3::Config + pallet_dapps_staking::Config - where - BlockNumberFor: IsType, { /// The overarching event type. type RuntimeEvent: From> + IsType<::RuntimeEvent>; @@ -114,10 +112,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(crate) fn deposit_event)] - pub enum Event - where - BlockNumberFor: IsType, - { + pub enum Event { /// Number of entries migrated from v2 over to v3 EntriesMigrated(u32), /// Number of entries deleted from v2 @@ -125,10 +120,7 @@ pub mod pallet { } #[pallet::call] - impl Pallet - where - BlockNumberFor: IsType, - { + impl Pallet { /// Attempt to execute migration steps, consuming up to the specified amount of weight. /// If no weight is specified, max allowed weight is used. /// @@ -161,10 +153,7 @@ pub mod pallet { } #[pallet::hooks] - impl Hooks> for Pallet - where - BlockNumberFor: IsType, - { + impl Hooks> for Pallet { fn integrity_test() { assert!(Pallet::::max_call_weight().all_gte(Pallet::::min_call_weight())); @@ -175,10 +164,7 @@ pub mod pallet { } } - impl Pallet - where - BlockNumberFor: IsType, - { + impl Pallet { /// Execute migrations steps until the specified weight limit has been consumed. /// /// Depending on the number of entries migrated and/or deleted, appropriate events are emitted. @@ -533,13 +519,8 @@ pub mod pallet { } } - pub struct DappStakingMigrationHandler(PhantomData) - where - BlockNumberFor: IsType; - impl frame_support::traits::OnRuntimeUpgrade for DappStakingMigrationHandler - where - BlockNumberFor: IsType, - { + pub struct DappStakingMigrationHandler(PhantomData); + impl frame_support::traits::OnRuntimeUpgrade for DappStakingMigrationHandler { fn on_runtime_upgrade() -> Weight { // When upgrade happens, we need to put dApp staking v3 into maintenance mode immediately. // For the old pallet, since the storage cleanup is going to happen, maintenance mode must be ensured @@ -732,10 +713,7 @@ pub mod pallet { #[cfg(feature = "try-runtime")] /// Used to help with `try-runtime` testing. #[derive(Encode, Decode)] -struct Helper -where - BlockNumberFor: IsType, -{ +struct Helper { /// Vec of devs, with their associated smart contract & total reserved balance developers: Vec<( T::AccountId, diff --git a/pallets/dapp-staking-v3/src/benchmarking/mod.rs b/pallets/dapp-staking-v3/src/benchmarking/mod.rs index 9b66070aa8..72500c710c 100644 --- a/pallets/dapp-staking-v3/src/benchmarking/mod.rs +++ b/pallets/dapp-staking-v3/src/benchmarking/mod.rs @@ -35,10 +35,7 @@ use utils::*; // // Without this optimization, benchmarks can take hours to execute for production runtimes. -#[benchmarks( - where - BlockNumberFor: IsType, -)] +#[benchmarks()] mod benchmarks { use super::*; @@ -307,10 +304,10 @@ mod benchmarks { // Hack // In order to speed up the benchmark, we reduce how long it takes to unlock the chunks - let mut counter = 1; + let mut counter = 1u32; Ledger::::mutate(&staker, |ledger| { ledger.unlocking.iter_mut().for_each(|unlocking| { - unlocking.unlock_block = (System::::block_number() + counter.into()).into(); + unlocking.unlock_block = (System::::block_number() + counter.into()).saturated_into(); }); counter += 1; }); diff --git a/pallets/dapp-staking-v3/src/benchmarking/utils.rs b/pallets/dapp-staking-v3/src/benchmarking/utils.rs index bedf47dd70..5d520d276e 100644 --- a/pallets/dapp-staking-v3/src/benchmarking/utils.rs +++ b/pallets/dapp-staking-v3/src/benchmarking/utils.rs @@ -24,13 +24,10 @@ use frame_system::Pallet as System; /// Run to the specified block number. /// Function assumes first block has been initialized. -pub(super) fn run_to_block(n: BlockNumberFor) -where - BlockNumberFor: IsType, -{ +pub(super) fn run_to_block(n: BlockNumberFor) { while System::::block_number() < n { DappStaking::::on_finalize(System::::block_number()); - System::::set_block_number(System::::block_number() + 1.into()); + System::::set_block_number(System::::block_number() + 1u32.into()); // This is performed outside of dapps staking but we expect it before on_initialize DappStaking::::on_initialize(System::::block_number()); } @@ -38,20 +35,14 @@ where /// Run for the specified number of blocks. /// Function assumes first block has been initialized. -pub(super) fn run_for_blocks(n: BlockNumberFor) -where - BlockNumberFor: IsType, -{ +pub(super) fn run_for_blocks(n: BlockNumberFor) { run_to_block::(System::::block_number() + n); } /// Advance blocks until the specified era has been reached. /// /// Function has no effect if era is already passed. -pub(super) fn advance_to_era(era: EraNumber) -where - BlockNumberFor: IsType, -{ +pub(super) fn advance_to_era(era: EraNumber) { assert!(era >= ActiveProtocolState::::get().era); while ActiveProtocolState::::get().era < era { run_for_blocks::(One::one()); @@ -61,10 +52,7 @@ where /// Advance blocks until the specified era has been reached. /// /// Relies on the `force` approach to advance one era per block. -pub(super) fn force_advance_to_era(era: EraNumber) -where - BlockNumberFor: IsType, -{ +pub(super) fn force_advance_to_era(era: EraNumber) { assert!(era > ActiveProtocolState::::get().era); while ActiveProtocolState::::get().era < era { assert_ok!(DappStaking::::force( @@ -76,18 +64,12 @@ where } /// Advance blocks until next era has been reached. -pub(super) fn _advance_to_next_era() -where - BlockNumberFor: IsType, -{ +pub(super) fn _advance_to_next_era() { advance_to_era::(ActiveProtocolState::::get().era + 1); } /// Advance to next era, in the next block using the `force` approach. -pub(crate) fn force_advance_to_next_era() -where - BlockNumberFor: IsType, -{ +pub(crate) fn force_advance_to_next_era() { assert_ok!(DappStaking::::force( RawOrigin::Root.into(), ForcingType::Era @@ -98,10 +80,7 @@ where /// Advance blocks until next period has been reached. /// /// Relies on the `force` approach to advance one subperiod per block. -pub(super) fn force_advance_to_next_period() -where - BlockNumberFor: IsType, -{ +pub(super) fn force_advance_to_next_period() { let init_period_number = ActiveProtocolState::::get().period_number(); while ActiveProtocolState::::get().period_number() == init_period_number { assert_ok!(DappStaking::::force( @@ -113,10 +92,7 @@ where } /// Advance to the specified period, using the `force` approach. -pub(super) fn force_advance_to_period(period: PeriodNumber) -where - BlockNumberFor: IsType, -{ +pub(super) fn force_advance_to_period(period: PeriodNumber) { assert!(period >= ActiveProtocolState::::get().period_number()); while ActiveProtocolState::::get().period_number() < period { force_advance_to_next_subperiod::(); @@ -124,10 +100,7 @@ where } /// Use the `force` approach to advance to the next subperiod immediately in the next block. -pub(super) fn force_advance_to_next_subperiod() -where - BlockNumberFor: IsType, -{ +pub(super) fn force_advance_to_next_subperiod() { assert_ok!(DappStaking::::force( RawOrigin::Root.into(), ForcingType::Subperiod @@ -148,18 +121,12 @@ pub(super) const NUMBER_OF_SLOTS: u32 = 100; pub(super) const SEED: u32 = 9000; /// Assert that the last event equals the provided one. -pub(super) fn assert_last_event(generic_event: ::RuntimeEvent) -where - BlockNumberFor: IsType, -{ +pub(super) fn assert_last_event(generic_event: ::RuntimeEvent) { frame_system::Pallet::::assert_last_event(generic_event.into()); } // Return all dApp staking events from the event buffer. -pub(super) fn dapp_staking_events() -> Vec> -where - BlockNumberFor: IsType, -{ +pub(super) fn dapp_staking_events() -> Vec> { System::::events() .into_iter() .map(|r| r.event) @@ -171,10 +138,7 @@ where /// /// **NOTE:** This assumes similar tier configuration for all runtimes. /// If we decide to change this, we'll need to provide a more generic init function. -pub(super) fn initial_config() -where - BlockNumberFor: IsType, -{ +pub(super) fn initial_config() { let era_length = T::CycleConfiguration::blocks_per_era(); let voting_period_length_in_eras = T::CycleConfiguration::eras_per_voting_subperiod(); @@ -244,10 +208,7 @@ where } /// Maximum number of contracts that 'makes sense' - considers both contract number limit & number of slots. -pub(super) fn max_number_of_contracts() -> u32 -where - BlockNumberFor: IsType, -{ +pub(super) fn max_number_of_contracts() -> u32 { T::MaxNumberOfContracts::get().min(NUMBER_OF_SLOTS).into() } @@ -255,10 +216,7 @@ where /// /// Stake amounts are decided in such a way to maximize tier filling rate. /// This means that all of the contracts should end up in some tier. -pub(super) fn prepare_contracts_for_tier_assignment(x: u32) -where - BlockNumberFor: IsType, -{ +pub(super) fn prepare_contracts_for_tier_assignment(x: u32) { let developer: T::AccountId = whitelisted_caller(); for id in 0..x { let smart_contract = T::BenchmarkHelper::get_smart_contract(id as u32); @@ -308,20 +266,14 @@ fn trivial_fisher_yates_shuffle(vector: &mut Vec, random_seed: u64) { /// Returns max amount of rewards that can be claimed in a single claim reward call from a past period. /// /// Bounded by era reward span length & number of eras per period (not length but absolute number). -pub(super) fn max_claim_size_past_period() -> u32 -where - BlockNumberFor: IsType, -{ +pub(super) fn max_claim_size_past_period() -> u32 { T::EraRewardSpanLength::get().min(T::CycleConfiguration::eras_per_build_and_earn_subperiod()) } /// Returns max amount of rewards that can be claimed in a single claim reward call from an ongoing period. /// /// Bounded by era reward span length & number of eras per period (not length but absolute number). -pub(super) fn max_claim_size_ongoing_period() -> u32 -where - BlockNumberFor: IsType, -{ +pub(super) fn max_claim_size_ongoing_period() -> u32 { T::EraRewardSpanLength::get() .min(T::CycleConfiguration::eras_per_build_and_earn_subperiod() - 1) } diff --git a/pallets/dapp-staking-v3/src/lib.rs b/pallets/dapp-staking-v3/src/lib.rs index 581bca4f18..ad42055cd9 100644 --- a/pallets/dapp-staking-v3/src/lib.rs +++ b/pallets/dapp-staking-v3/src/lib.rs @@ -46,7 +46,7 @@ use frame_support::{ use frame_system::pallet_prelude::*; use sp_runtime::{ traits::{BadOrigin, One, Saturating, UniqueSaturatedInto, Zero}, - Perbill, Permill, + Perbill, Permill, SaturatedConversion, }; pub use sp_std::vec::Vec; @@ -106,10 +106,7 @@ pub mod pallet { } #[pallet::config] - pub trait Config: frame_system::Config - where - BlockNumberFor: IsType, - { + pub trait Config: frame_system::Config { /// The overarching event type. type RuntimeEvent: From> + IsType<::RuntimeEvent> @@ -198,10 +195,7 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub(crate) fn deposit_event)] - pub enum Event - where - BlockNumberFor: IsType, - { + pub enum Event { /// Maintenance mode has been either enabled or disabled. MaintenanceMode { enabled: bool }, /// New era has started. @@ -464,10 +458,7 @@ pub mod pallet { pub type HistoryCleanupMarker = StorageValue<_, CleanupMarker, ValueQuery>; #[pallet::type_value] - pub fn DefaultSafeguard() -> bool - where - BlockNumberFor: IsType, - { + pub fn DefaultSafeguard() -> bool { // In production, safeguard is enabled by default. true } @@ -489,10 +480,7 @@ pub mod pallet { } #[pallet::genesis_build] - impl BuildGenesisConfig for GenesisConfig - where - BlockNumberFor: IsType, - { + impl BuildGenesisConfig for GenesisConfig { fn build(&self) { // Prepare tier parameters & verify their correctness let tier_params = TierParameters:: { @@ -554,12 +542,10 @@ pub mod pallet { } #[pallet::hooks] - impl Hooks> for Pallet - where - BlockNumberFor: IsType, - { + impl Hooks> for Pallet { fn on_initialize(now: BlockNumberFor) -> Weight { - Self::era_and_period_handler(now.into(), TierAssignment::Real) + let now = now.saturated_into(); + Self::era_and_period_handler(now, TierAssignment::Real) } fn on_idle(_block: BlockNumberFor, remaining_weight: Weight) -> Weight { @@ -597,10 +583,7 @@ pub mod pallet { } #[pallet::call] - impl Pallet - where - BlockNumberFor: IsType, - { + impl Pallet { /// Wrapper around _legacy-like_ `unbond_and_unstake`. /// /// Used to support legacy Ledger users so they can start the unlocking process for their funds. @@ -892,7 +875,7 @@ pub mod pallet { let current_block = frame_system::Pallet::::block_number(); let unlock_block = current_block.saturating_add(Self::unlocking_period().into()); ledger - .add_unlocking_chunk(amount_to_unlock, unlock_block.into()) + .add_unlocking_chunk(amount_to_unlock, unlock_block.saturated_into()) .map_err(|_| Error::::TooManyUnlockingChunks)?; // Update storage @@ -919,7 +902,7 @@ pub mod pallet { let mut ledger = Ledger::::get(&account); let current_block = frame_system::Pallet::::block_number(); - let amount = ledger.claim_unlocked(current_block.into()); + let amount = ledger.claim_unlocked(current_block.saturated_into()); ensure!(amount > Zero::zero(), Error::::NoUnlockedChunksToClaim); // In case it's full unlock, account is exiting dApp staking, ensure all storage is cleaned up. @@ -1558,7 +1541,7 @@ pub mod pallet { // Ensure a 'change' happens on the next block ActiveProtocolState::::mutate(|state| { let current_block = frame_system::Pallet::::block_number(); - state.next_era_start = current_block.saturating_add(One::one()).into(); + state.next_era_start = current_block.saturating_add(One::one()).saturated_into(); match forcing_type { ForcingType::Era => (), @@ -1580,10 +1563,7 @@ pub mod pallet { } } - impl Pallet - where - BlockNumberFor: IsType, - { + impl Pallet { /// `true` if the account is a staker, `false` otherwise. pub fn is_staker(account: &T::AccountId) -> bool { Ledger::::contains_key(account) diff --git a/pallets/dapp-staking-v3/src/migrations.rs b/pallets/dapp-staking-v3/src/migrations.rs index 8efcd53936..e7a08aa5e0 100644 --- a/pallets/dapp-staking-v3/src/migrations.rs +++ b/pallets/dapp-staking-v3/src/migrations.rs @@ -30,8 +30,6 @@ impl< )>, P: Get, > OnRuntimeUpgrade for DAppStakingV3InitConfig -where - BlockNumberFor: IsType, { fn on_runtime_upgrade() -> Weight { if Pallet::::on_chain_storage_version() >= STORAGE_VERSION { @@ -48,7 +46,7 @@ where let period_number = 1; let protocol_state = ProtocolState { era: init_era, - next_era_start: now.saturating_add(voting_period_length.into()).into(), + next_era_start: now.saturating_add(voting_period_length.into()).saturated_into(), period_info: PeriodInfo { number: period_number, subperiod: Subperiod::Voting, diff --git a/pallets/inflation/src/benchmarking.rs b/pallets/inflation/src/benchmarking.rs index 2df7f3d430..eac85fffbc 100644 --- a/pallets/inflation/src/benchmarking.rs +++ b/pallets/inflation/src/benchmarking.rs @@ -18,7 +18,6 @@ use super::*; -use astar_primitives::BlockNumber; use frame_benchmarking::v2::*; use frame_system::{Pallet as System, RawOrigin}; use sp_std::prelude::*; @@ -69,10 +68,7 @@ fn initial_config() { T::Currency::make_free_balance_be(&dummy_account, 1_000_000_000_000_000_000_000); } -#[benchmarks( - where - BlockNumberFor: IsType -)] +#[benchmarks] mod benchmarks { use super::*; @@ -110,7 +106,7 @@ mod benchmarks { #[block] { Pallet::::block_before_new_era(init_recalculation_era); - Pallet::::on_finalize(1.into()); + Pallet::::on_finalize(1u32.into()); } assert!(ActiveInflationConfig::::get().recalculation_era > init_recalculation_era); @@ -124,7 +120,7 @@ mod benchmarks { let init_issuance = T::Currency::total_issuance(); DoRecalculation::::kill(); - let block = 1.into(); + let block = 1u32.into(); #[block] { Pallet::::on_initialize(block); From 01c22a20db76754d7534526f745ed2feb35fd7b9 Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Fri, 1 Mar 2024 11:41:24 +0530 Subject: [PATCH 27/29] fix: format --- pallets/dapp-staking-v3/src/benchmarking/mod.rs | 3 ++- pallets/dapp-staking-v3/src/migrations.rs | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pallets/dapp-staking-v3/src/benchmarking/mod.rs b/pallets/dapp-staking-v3/src/benchmarking/mod.rs index 72500c710c..3b5970a1ab 100644 --- a/pallets/dapp-staking-v3/src/benchmarking/mod.rs +++ b/pallets/dapp-staking-v3/src/benchmarking/mod.rs @@ -307,7 +307,8 @@ mod benchmarks { let mut counter = 1u32; Ledger::::mutate(&staker, |ledger| { ledger.unlocking.iter_mut().for_each(|unlocking| { - unlocking.unlock_block = (System::::block_number() + counter.into()).saturated_into(); + unlocking.unlock_block = + (System::::block_number() + counter.into()).saturated_into(); }); counter += 1; }); diff --git a/pallets/dapp-staking-v3/src/migrations.rs b/pallets/dapp-staking-v3/src/migrations.rs index e7a08aa5e0..47505c70e5 100644 --- a/pallets/dapp-staking-v3/src/migrations.rs +++ b/pallets/dapp-staking-v3/src/migrations.rs @@ -46,7 +46,9 @@ impl< let period_number = 1; let protocol_state = ProtocolState { era: init_era, - next_era_start: now.saturating_add(voting_period_length.into()).saturated_into(), + next_era_start: now + .saturating_add(voting_period_length.into()) + .saturated_into(), period_info: PeriodInfo { number: period_number, subperiod: Subperiod::Voting, From 8c447547fa6d8d71bff9587fa68cb281454ee266 Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Fri, 1 Mar 2024 13:37:05 +0530 Subject: [PATCH 28/29] fix: make clippy happy --- pallets/dapp-staking-migration/src/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/pallets/dapp-staking-migration/src/lib.rs b/pallets/dapp-staking-migration/src/lib.rs index b199300d88..f82f900ab6 100644 --- a/pallets/dapp-staking-migration/src/lib.rs +++ b/pallets/dapp-staking-migration/src/lib.rs @@ -57,7 +57,6 @@ use frame_support::{ traits::{Get, LockableCurrency, ReservableCurrency}, }; -use astar_primitives::BlockNumber; use frame_system::{pallet_prelude::*, RawOrigin}; use pallet_dapps_staking::{Ledger as OldLedger, RegisteredDapps as OldRegisteredDapps}; use parity_scale_codec::{Decode, Encode}; From 7439a413314ad9da31b5bca4989d6542ac29033a Mon Sep 17 00:00:00 2001 From: Ashutosh Varma Date: Fri, 1 Mar 2024 15:05:10 +0530 Subject: [PATCH 29/29] feat: update `CodeHashLockupDepositPercent` value --- pallets/xvm/src/mock.rs | 2 +- runtime/astar/src/lib.rs | 2 +- runtime/local/src/lib.rs | 2 +- runtime/shibuya/src/lib.rs | 2 +- runtime/shiden/src/lib.rs | 2 +- tests/xcm-simulator/src/mocks/parachain.rs | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pallets/xvm/src/mock.rs b/pallets/xvm/src/mock.rs index 2610152fb6..9f548e1675 100644 --- a/pallets/xvm/src/mock.rs +++ b/pallets/xvm/src/mock.rs @@ -99,7 +99,7 @@ parameter_types! { pub const DepositPerByte: Balance = 1_000; pub const DefaultDepositLimit: Balance = 1_000; pub const MaxDelegateDependencies: u32 = 32; - pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(30); + pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(10); pub Schedule: pallet_contracts::Schedule = Default::default(); } diff --git a/runtime/astar/src/lib.rs b/runtime/astar/src/lib.rs index 7c2054dcbe..2f44a81975 100644 --- a/runtime/astar/src/lib.rs +++ b/runtime/astar/src/lib.rs @@ -665,7 +665,7 @@ parameter_types! { // Fallback value if storage deposit limit not set by the user pub const DefaultDepositLimit: Balance = contracts_deposit(16, 16 * 1024); pub const MaxDelegateDependencies: u32 = 32; - pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(30); + pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(10); pub Schedule: pallet_contracts::Schedule = Default::default(); } diff --git a/runtime/local/src/lib.rs b/runtime/local/src/lib.rs index e7d477edab..741cd43830 100644 --- a/runtime/local/src/lib.rs +++ b/runtime/local/src/lib.rs @@ -901,7 +901,7 @@ parameter_types! { // Fallback value if storage deposit limit not set by the user pub const DefaultDepositLimit: Balance = deposit(16, 16 * 1024); pub const MaxDelegateDependencies: u32 = 32; - pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(30); + pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(10); pub Schedule: pallet_contracts::Schedule = Default::default(); } diff --git a/runtime/shibuya/src/lib.rs b/runtime/shibuya/src/lib.rs index 701afc77f4..9d1dce6c88 100644 --- a/runtime/shibuya/src/lib.rs +++ b/runtime/shibuya/src/lib.rs @@ -673,7 +673,7 @@ parameter_types! { // Fallback value if storage deposit limit not set by the user pub const DefaultDepositLimit: Balance = contracts_deposit(16, 16 * 1024); pub const MaxDelegateDependencies: u32 = 32; - pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(30); + pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(10); pub Schedule: pallet_contracts::Schedule = Default::default(); } diff --git a/runtime/shiden/src/lib.rs b/runtime/shiden/src/lib.rs index ca2f24f83a..7c3fbc58fc 100644 --- a/runtime/shiden/src/lib.rs +++ b/runtime/shiden/src/lib.rs @@ -631,7 +631,7 @@ parameter_types! { // Fallback value if storage deposit limit not set by the user pub const DefaultDepositLimit: Balance = contracts_deposit(16, 16 * 1024); pub const MaxDelegateDependencies: u32 = 32; - pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(30); + pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(10); pub Schedule: pallet_contracts::Schedule = Default::default(); } diff --git a/tests/xcm-simulator/src/mocks/parachain.rs b/tests/xcm-simulator/src/mocks/parachain.rs index 467b2effe9..3833a38849 100644 --- a/tests/xcm-simulator/src/mocks/parachain.rs +++ b/tests/xcm-simulator/src/mocks/parachain.rs @@ -210,7 +210,7 @@ parameter_types! { pub const DepositPerByte: Balance = MILLISDN / 1_000_000; pub const DefaultDepositLimit: Balance = 1000 * MILLISDN; pub const MaxDelegateDependencies: u32 = 32; - pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(30); + pub const CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(10); pub Schedule: pallet_contracts::Schedule = Default::default(); }