diff --git a/Makefile b/Makefile index a1edd943..fad7e1ad 100644 --- a/Makefile +++ b/Makefile @@ -59,6 +59,6 @@ run-invarch-solo-alice: cd invarch && ./target/release/invarch-collator --chain solo-dev --alice --tmp --listen-addr /ip4/0.0.0.0/tcp/53102/ws --rpc-cors=all --discover-local --collator --node-key c12b6d18942f5ee8528c8e2baf4e147b5c5c18710926ea492d09cbd9f6c9f82a run-invarch-solo-bob: - cd invarch && ./target/release/invarch-collator --chain solo-dev --bob --tmp --listen-addr /ip4/0.0.0.0/tcp/54102/ws --rpc-cors=all --discover-local --collator --bootnodes /ip4/127.0.0.1/tcp/53102/ws/p2p/12D3KooWBmAwcd4PJNJvfV89HwE48nwkRmAgo8Vy3uQEyNNHBox2 + cd invarch && ./target/release/invarch-collator --chain solo-dev --bob --tmp --listen-addr /ip4/0.0.0.0/tcp/54102/ws --rpc-cors=all --discover-local --collator --bootnodes /ip4/127.0.0.1/tcp/53102/ws/p2p/12D3KooWBmAwcd4PJNJvfV89HwE48nwkRmAgo8Vy3uQEyNNHBox2 --unsafe-force-node-key-generation run-invarch-solo: ; printf "run-invarch-solo-alice\nrun-invarch-solo-bob" | parallel -u make diff --git a/invarch/Cargo.lock b/invarch/Cargo.lock index 18419657..9db83d13 100644 --- a/invarch/Cargo.lock +++ b/invarch/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "Inflector" @@ -68,18 +68,7 @@ dependencies = [ "cipher 0.4.4", "ctr", "ghash", - "subtle 2.4.1", -] - -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom 0.2.15", - "once_cell", - "version_check", + "subtle 2.6.1", ] [[package]] @@ -488,7 +477,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", - "rand", + "rand 0.8.5", "rayon", ] @@ -505,12 +494,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.2.3" @@ -544,8 +527,24 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" dependencies = [ - "asn1-rs-derive", - "asn1-rs-impl", + "asn1-rs-derive 0.4.0", + "asn1-rs-impl 0.1.0", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "asn1-rs" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048" +dependencies = [ + "asn1-rs-derive 0.5.1", + "asn1-rs-impl 0.2.0", "displaydoc", "nom", "num-traits", @@ -566,6 +565,18 @@ dependencies = [ "synstructure 0.12.6", ] +[[package]] +name = "asn1-rs-derive" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", + "synstructure 0.13.1", +] + [[package]] name = "asn1-rs-impl" version = "0.1.0" @@ -577,6 +588,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "asn1-rs-impl" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + [[package]] name = "assert_matches" version = "1.5.0" @@ -778,6 +800,17 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" +[[package]] +name = "attohttpc" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d9a9bf8b79a749ee0b911b91b671cc2b6c670bdbc7e3dfd537576ddc94bb2a2" +dependencies = [ + "http 0.2.12", + "log", + "url", +] + [[package]] name = "autocfg" version = "1.3.0" @@ -846,6 +879,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "base64ct" version = "1.6.0" @@ -863,8 +902,8 @@ dependencies = [ [[package]] name = "binary-merkle-tree" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "15.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "hash-db", "log", @@ -906,19 +945,31 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f" dependencies = [ - "bitcoin_hashes", - "rand", - "rand_core 0.6.4", - "serde", - "unicode-normalization", + "bitcoin_hashes 0.11.0", ] +[[package]] +name = "bitcoin-internals" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb" + [[package]] name = "bitcoin_hashes" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4" +[[package]] +name = "bitcoin_hashes" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b" +dependencies = [ + "bitcoin-internals", + "hex-conservative", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -1043,9 +1094,9 @@ dependencies = [ [[package]] name = "bounded-collections" -version = "0.1.9" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca548b6163b872067dc5eb82fd130c56881435e30367d2073594a3d9744120dd" +checksum = "d32385ecb91a31bddaf908e8dcf4a15aef1bcd3913cc03ebfad02ff6d568abc1" dependencies = [ "log", "parity-scale-codec", @@ -1064,13 +1115,13 @@ dependencies = [ [[package]] name = "bp-xcm-bridge-hub-router" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.14.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "parity-scale-codec", "scale-info", - "sp-core", - "sp-runtime", + "sp-core 34.0.0", + "sp-runtime 39.0.0", ] [[package]] @@ -1095,6 +1146,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", + "regex-automata 0.4.7", "serde", ] @@ -1139,9 +1191,18 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + +[[package]] +name = "bytesize" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" +dependencies = [ + "serde", +] [[package]] name = "bzip2-sys" @@ -1207,6 +1268,12 @@ dependencies = [ "once_cell", ] +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + [[package]] name = "cexpr" version = "0.6.0" @@ -1295,7 +1362,20 @@ dependencies = [ "multibase", "multihash 0.17.0", "serde", - "unsigned-varint", + "unsigned-varint 0.7.2", +] + +[[package]] +name = "cid" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd94671561e36e4e7de75f753f577edafb0e7c05d6e4547229fdf7938fbcd2c3" +dependencies = [ + "core2", + "multibase", + "multihash 0.18.1", + "serde", + "unsigned-varint 0.7.2", ] [[package]] @@ -1318,15 +1398,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "ckb-merkle-mountain-range" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ccb671c5921be8a84686e6212ca184cb1d7c51cadcdbfcbd1cc3f042f5dfb8" -dependencies = [ - "cfg-if", -] - [[package]] name = "clang-sys" version = "1.8.1" @@ -1400,12 +1471,43 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "color-print" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee543c60ff3888934877a5671f45494dd27ed4ba25c6670b9a7576b7ed7a8c0" +dependencies = [ + "color-print-proc-macro", +] + +[[package]] +name = "color-print-proc-macro" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ff1a80c5f3cb1ca7c06ffdd71b6a6dd6d8f896c42141fbd43f50ed28dcdb93" +dependencies = [ + "nom", + "proc-macro2", + "quote", + "syn 2.0.68", +] + [[package]] name = "colorchoice" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "comfy-table" version = "7.1.1" @@ -1588,7 +1690,7 @@ dependencies = [ "gimli 0.27.3", "hashbrown 0.13.2", "log", - "regalloc2", + "regalloc2 0.6.1", "smallvec", "target-lexicon", ] @@ -1662,6 +1764,21 @@ dependencies = [ "wasmtime-types", ] +[[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + [[package]] name = "crc32fast" version = "1.4.2" @@ -1719,7 +1836,7 @@ checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array 0.14.7", "rand_core 0.6.4", - "subtle 2.4.1", + "subtle 2.6.1", "zeroize", ] @@ -1751,17 +1868,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ "generic-array 0.14.7", - "subtle 2.4.1", -] - -[[package]] -name = "crypto-mac" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" -dependencies = [ - "generic-array 0.14.7", - "subtle 2.4.1", + "subtle 2.6.1", ] [[package]] @@ -1775,311 +1882,343 @@ dependencies = [ [[package]] name = "cumulus-client-cli" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.17.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "clap", "parity-scale-codec", - "sc-chain-spec", - "sc-cli", - "sc-client-api", - "sc-service", - "sp-blockchain", - "sp-core", - "sp-runtime", + "sc-chain-spec 37.0.0", + "sc-cli 0.46.0", + "sc-client-api 37.0.0", + "sc-service 0.45.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-runtime 39.0.0", "url", ] [[package]] name = "cumulus-client-collator" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.17.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", - "cumulus-primitives-core", + "cumulus-primitives-core 0.15.0", "futures", "parity-scale-codec", "parking_lot 0.12.3", - "polkadot-node-primitives", + "polkadot-node-primitives 15.0.0", "polkadot-node-subsystem", - "polkadot-overseer", - "polkadot-primitives", - "sc-client-api", - "sp-api", - "sp-consensus", - "sp-core", - "sp-runtime", + "polkadot-overseer 17.0.0", + "polkadot-primitives 15.0.0", + "sc-client-api 37.0.0", + "sp-api 34.0.0", + "sp-consensus 0.40.0", + "sp-core 34.0.0", + "sp-runtime 39.0.0", "tracing", ] [[package]] name = "cumulus-client-consensus-aura" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.17.1" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "async-trait", "cumulus-client-collator", "cumulus-client-consensus-common", "cumulus-client-consensus-proposer", - "cumulus-client-parachain-inherent", + "cumulus-client-parachain-inherent 0.11.0", "cumulus-primitives-aura", - "cumulus-primitives-core", - "cumulus-relay-chain-interface", + "cumulus-primitives-core 0.15.0", + "cumulus-relay-chain-interface 0.17.0", "futures", "parity-scale-codec", - "polkadot-node-primitives", + "parking_lot 0.12.3", + "polkadot-node-primitives 15.0.0", "polkadot-node-subsystem", - "polkadot-overseer", - "polkadot-primitives", - "sc-client-api", - "sc-consensus", + "polkadot-overseer 17.0.0", + "polkadot-primitives 15.0.0", + "sc-client-api 37.0.0", + "sc-consensus 0.43.0", "sc-consensus-aura", "sc-consensus-babe", "sc-consensus-slots", - "sc-telemetry", + "sc-telemetry 24.0.0", + "sc-utils 17.0.0", "schnellru", - "sp-api", - "sp-application-crypto", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-consensus-aura", - "sp-core", - "sp-inherents", - "sp-keystore", - "sp-runtime", - "sp-state-machine", - "sp-timestamp", - "substrate-prometheus-endpoint", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-block-builder 34.0.0", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-consensus-aura 0.40.0", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.0", + "sp-state-machine 0.43.0", + "sp-timestamp 34.0.0", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "tokio", "tracing", ] [[package]] name = "cumulus-client-consensus-common" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.17.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "async-trait", "cumulus-client-pov-recovery", - "cumulus-primitives-core", - "cumulus-relay-chain-interface", + "cumulus-primitives-core 0.15.0", + "cumulus-relay-chain-interface 0.17.0", "dyn-clone", "futures", "log", "parity-scale-codec", - "polkadot-primitives", - "sc-client-api", - "sc-consensus", + "polkadot-primitives 15.0.0", + "sc-client-api 37.0.0", + "sc-consensus 0.43.0", "sc-consensus-babe", "schnellru", - "sp-blockchain", - "sp-consensus", - "sp-consensus-slots", - "sp-core", - "sp-runtime", - "sp-timestamp", - "sp-trie", - "substrate-prometheus-endpoint", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-consensus-slots 0.40.0", + "sp-core 34.0.0", + "sp-runtime 39.0.0", + "sp-timestamp 34.0.0", + "sp-trie 37.0.0", + "sp-version 37.0.0", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", "tracing", ] [[package]] name = "cumulus-client-consensus-proposer" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.15.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "anyhow", "async-trait", - "cumulus-primitives-parachain-inherent", - "sp-consensus", - "sp-inherents", - "sp-runtime", - "sp-state-machine", + "cumulus-primitives-parachain-inherent 0.15.0", + "sp-consensus 0.40.0", + "sp-inherents 34.0.0", + "sp-runtime 39.0.0", + "sp-state-machine 0.43.0", "thiserror", ] [[package]] name = "cumulus-client-network" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.17.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "async-trait", - "cumulus-relay-chain-interface", + "cumulus-relay-chain-interface 0.17.0", "futures", "futures-timer", "parity-scale-codec", "parking_lot 0.12.3", - "polkadot-node-primitives", - "polkadot-parachain-primitives", - "polkadot-primitives", - "sc-client-api", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-runtime", - "sp-state-machine", + "polkadot-node-primitives 15.0.0", + "polkadot-node-subsystem", + "polkadot-parachain-primitives 14.0.0", + "polkadot-primitives 15.0.0", + "sc-client-api 37.0.0", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-core 34.0.0", + "sp-runtime 39.0.0", + "sp-state-machine 0.43.0", + "sp-version 37.0.0", "tracing", ] [[package]] name = "cumulus-client-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "async-trait", + "cumulus-primitives-core 0.7.0", + "cumulus-primitives-parachain-inherent 0.7.0", + "cumulus-relay-chain-interface 0.7.0", + "cumulus-test-relay-sproof-builder 0.7.0", + "parity-scale-codec", + "sc-client-api 28.0.0", + "scale-info", + "sp-api 26.0.0", + "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-inherents 26.0.0", + "sp-runtime 31.0.1", + "sp-state-machine 0.35.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-trie 29.0.0", + "tracing", +] + +[[package]] +name = "cumulus-client-parachain-inherent" +version = "0.11.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "async-trait", - "cumulus-primitives-core", - "cumulus-primitives-parachain-inherent", - "cumulus-relay-chain-interface", - "cumulus-test-relay-sproof-builder", - "parity-scale-codec", - "sc-client-api", - "scale-info", - "sp-api", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-state-machine", - "sp-std 8.0.0", - "sp-storage 13.0.0", - "sp-trie", + "cumulus-primitives-core 0.15.0", + "cumulus-primitives-parachain-inherent 0.15.0", + "cumulus-relay-chain-interface 0.17.0", + "cumulus-test-relay-sproof-builder 0.15.0", + "parity-scale-codec", + "sc-client-api 37.0.0", + "sp-api 34.0.0", + "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-inherents 34.0.0", + "sp-runtime 39.0.0", + "sp-state-machine 0.43.0", + "sp-storage 21.0.0", + "sp-trie 37.0.0", "tracing", ] [[package]] name = "cumulus-client-pov-recovery" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.17.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "async-trait", - "cumulus-primitives-core", - "cumulus-relay-chain-interface", + "cumulus-primitives-core 0.15.0", + "cumulus-relay-chain-interface 0.17.0", "futures", "futures-timer", "parity-scale-codec", - "polkadot-node-primitives", + "polkadot-node-primitives 15.0.0", "polkadot-node-subsystem", - "polkadot-overseer", - "polkadot-primitives", - "rand", - "sc-client-api", - "sc-consensus", - "sp-consensus", - "sp-maybe-compressed-blob", - "sp-runtime", + "polkadot-overseer 17.0.0", + "polkadot-primitives 15.0.0", + "rand 0.8.5", + "sc-client-api 37.0.0", + "sc-consensus 0.43.0", + "sp-api 34.0.0", + "sp-consensus 0.40.0", + "sp-maybe-compressed-blob 11.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-runtime 39.0.0", + "sp-version 37.0.0", "tracing", ] [[package]] name = "cumulus-client-service" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.17.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", "cumulus-client-consensus-common", "cumulus-client-network", "cumulus-client-pov-recovery", - "cumulus-primitives-core", + "cumulus-primitives-core 0.15.0", "cumulus-primitives-proof-size-hostfunction", "cumulus-relay-chain-inprocess-interface", - "cumulus-relay-chain-interface", + "cumulus-relay-chain-interface 0.17.0", "cumulus-relay-chain-minimal-node", "futures", - "polkadot-primitives", - "sc-client-api", - "sc-consensus", - "sc-network", - "sc-network-sync", - "sc-network-transactions", - "sc-rpc", - "sc-service", - "sc-sysinfo", - "sc-telemetry", - "sc-transaction-pool", - "sc-utils", - "sp-api", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-runtime", - "sp-transaction-pool", + "polkadot-primitives 15.0.0", + "sc-client-api 37.0.0", + "sc-consensus 0.43.0", + "sc-network 0.44.0", + "sc-network-sync 0.43.0", + "sc-network-transactions 0.43.0", + "sc-rpc 39.0.0", + "sc-service 0.45.0", + "sc-sysinfo 37.0.0", + "sc-telemetry 24.0.0", + "sc-transaction-pool 37.0.0", + "sc-utils 17.0.0", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-transaction-pool 34.0.0", ] [[package]] name = "cumulus-pallet-aura-ext" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.16.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "cumulus-pallet-parachain-system", - "frame-support", + "frame-support 37.0.0", "frame-system", "pallet-aura", "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto", - "sp-consensus-aura", - "sp-runtime", - "sp-std 8.0.0", + "sp-application-crypto 38.0.0", + "sp-consensus-aura 0.40.0", + "sp-runtime 39.0.0", ] [[package]] name = "cumulus-pallet-dmp-queue" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.16.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "cumulus-primitives-core", + "cumulus-primitives-core 0.15.0", "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", - "staging-xcm", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "staging-xcm 14.1.0", ] [[package]] name = "cumulus-pallet-parachain-system" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.16.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "bytes", "cumulus-pallet-parachain-system-proc-macro", - "cumulus-primitives-core", - "cumulus-primitives-parachain-inherent", + "cumulus-primitives-core 0.15.0", + "cumulus-primitives-parachain-inherent 0.15.0", "cumulus-primitives-proof-size-hostfunction", "environmental", "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "impl-trait-for-tuples", "log", "pallet-message-queue", "parity-scale-codec", - "polkadot-parachain-primitives", + "polkadot-parachain-primitives 14.0.0", + "polkadot-runtime-common", "polkadot-runtime-parachains", "scale-info", - "sp-core", - "sp-externalities 0.19.0", - "sp-inherents", - "sp-io", - "sp-runtime", - "sp-state-machine", - "sp-std 8.0.0", - "sp-trie", - "sp-version", - "staging-xcm", + "sp-core 34.0.0", + "sp-externalities 0.29.0", + "sp-inherents 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-state-machine 0.43.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-trie 37.0.0", + "sp-version 37.0.0", + "staging-xcm 14.1.0", + "staging-xcm-builder", "trie-db", ] [[package]] name = "cumulus-pallet-parachain-system-proc-macro" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.6.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", @@ -2089,44 +2228,42 @@ dependencies = [ [[package]] name = "cumulus-pallet-session-benchmarking" -version = "3.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "18.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "pallet-session", "parity-scale-codec", - "sp-runtime", - "sp-std 8.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "cumulus-pallet-xcm" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.16.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "cumulus-primitives-core", - "frame-support", + "cumulus-primitives-core 0.15.0", + "frame-support 37.0.0", "frame-system", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", - "staging-xcm", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "staging-xcm 14.1.0", ] [[package]] name = "cumulus-pallet-xcmp-queue" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.16.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "bounded-collections", "bp-xcm-bridge-hub-router", - "cumulus-primitives-core", + "cumulus-primitives-core 0.15.0", "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "pallet-message-queue", @@ -2134,218 +2271,260 @@ dependencies = [ "polkadot-runtime-common", "polkadot-runtime-parachains", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", - "staging-xcm", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "staging-xcm 14.1.0", + "staging-xcm-builder", "staging-xcm-executor", ] [[package]] name = "cumulus-primitives-aura" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.15.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-primitives", - "sp-api", - "sp-consensus-aura", - "sp-runtime", - "sp-std 8.0.0", + "polkadot-core-primitives 15.0.0", + "polkadot-primitives 15.0.0", + "sp-api 34.0.0", + "sp-consensus-aura 0.40.0", + "sp-runtime 39.0.0", ] [[package]] name = "cumulus-primitives-core" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "parity-scale-codec", + "polkadot-core-primitives 7.0.0", + "polkadot-parachain-primitives 6.0.0", + "polkadot-primitives 7.0.0", + "scale-info", + "sp-api 26.0.0", + "sp-runtime 31.0.1", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-trie 29.0.0", + "staging-xcm 7.0.0", +] + +[[package]] +name = "cumulus-primitives-core" +version = "0.15.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain-primitives", - "polkadot-primitives", + "polkadot-core-primitives 15.0.0", + "polkadot-parachain-primitives 14.0.0", + "polkadot-primitives 15.0.0", "scale-info", - "sp-api", - "sp-runtime", - "sp-std 8.0.0", - "sp-trie", - "staging-xcm", + "sp-api 34.0.0", + "sp-runtime 39.0.0", + "sp-trie 37.0.0", + "staging-xcm 14.1.0", ] [[package]] name = "cumulus-primitives-parachain-inherent" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "async-trait", + "cumulus-primitives-core 0.7.0", + "parity-scale-codec", + "scale-info", + "sp-core 28.0.0", + "sp-inherents 26.0.0", + "sp-runtime 31.0.1", + "sp-state-machine 0.35.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-trie 29.0.0", +] + +[[package]] +name = "cumulus-primitives-parachain-inherent" +version = "0.15.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "async-trait", - "cumulus-primitives-core", + "cumulus-primitives-core 0.15.0", "parity-scale-codec", "scale-info", - "sp-core", - "sp-inherents", - "sp-std 8.0.0", - "sp-trie", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-runtime 39.0.0", + "sp-state-machine 0.43.0", + "sp-trie 37.0.0", ] [[package]] name = "cumulus-primitives-proof-size-hostfunction" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.10.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "sp-externalities 0.19.0", - "sp-runtime-interface 17.0.0", - "sp-trie", + "sp-externalities 0.29.0", + "sp-runtime-interface 28.0.0", + "sp-trie 37.0.0", ] [[package]] name = "cumulus-primitives-timestamp" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.15.1" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "cumulus-primitives-core", - "futures", - "parity-scale-codec", - "sp-inherents", - "sp-std 8.0.0", - "sp-timestamp", + "cumulus-primitives-core 0.15.0", + "sp-inherents 34.0.0", + "sp-timestamp 34.0.0", ] [[package]] name = "cumulus-primitives-utility" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.16.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "cumulus-primitives-core", - "frame-support", + "cumulus-primitives-core 0.15.0", + "frame-support 37.0.0", "log", - "pallet-xcm-benchmarks", + "pallet-asset-conversion", "parity-scale-codec", "polkadot-runtime-common", "polkadot-runtime-parachains", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", - "staging-xcm", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "staging-xcm 14.1.0", "staging-xcm-builder", "staging-xcm-executor", ] [[package]] name = "cumulus-relay-chain-inprocess-interface" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.17.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "async-trait", - "cumulus-primitives-core", - "cumulus-relay-chain-interface", + "cumulus-primitives-core 0.15.0", + "cumulus-relay-chain-interface 0.17.0", "futures", "futures-timer", "polkadot-cli", "polkadot-service", - "sc-cli", - "sc-client-api", - "sc-sysinfo", - "sc-telemetry", - "sc-tracing", - "sp-api", - "sp-consensus", - "sp-core", - "sp-runtime", - "sp-state-machine", + "sc-cli 0.46.0", + "sc-client-api 37.0.0", + "sc-sysinfo 37.0.0", + "sc-telemetry 24.0.0", + "sc-tracing 37.0.0", + "sp-api 34.0.0", + "sp-consensus 0.40.0", + "sp-core 34.0.0", + "sp-runtime 39.0.0", + "sp-state-machine 0.43.0", ] [[package]] name = "cumulus-relay-chain-interface" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "async-trait", + "cumulus-primitives-core 0.7.0", + "futures", + "jsonrpsee-core 0.22.5", + "parity-scale-codec", + "polkadot-overseer 7.0.0", + "sc-client-api 28.0.0", + "sp-api 26.0.0", + "sp-blockchain 28.0.0", + "sp-state-machine 0.35.0", + "thiserror", +] + +[[package]] +name = "cumulus-relay-chain-interface" +version = "0.17.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "async-trait", - "cumulus-primitives-core", + "cumulus-primitives-core 0.15.0", "futures", - "jsonrpsee-core", + "jsonrpsee-core 0.23.2", "parity-scale-codec", - "polkadot-overseer", - "sc-client-api", - "sp-api", - "sp-blockchain", - "sp-state-machine", + "polkadot-overseer 17.0.0", + "sc-client-api 37.0.0", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-state-machine 0.43.0", + "sp-version 37.0.0", "thiserror", ] [[package]] name = "cumulus-relay-chain-minimal-node" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.17.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "array-bytes 6.2.3", + "array-bytes", "async-trait", - "cumulus-primitives-core", - "cumulus-relay-chain-interface", + "cumulus-primitives-core 0.15.0", + "cumulus-relay-chain-interface 0.17.0", "cumulus-relay-chain-rpc-interface", "futures", - "parking_lot 0.12.3", - "polkadot-availability-recovery", - "polkadot-collator-protocol", - "polkadot-core-primitives", + "polkadot-core-primitives 15.0.0", "polkadot-network-bridge", - "polkadot-node-collation-generation", - "polkadot-node-core-chain-api", - "polkadot-node-core-prospective-parachains", - "polkadot-node-core-runtime-api", - "polkadot-node-network-protocol", + "polkadot-node-network-protocol 17.0.0", "polkadot-node-subsystem-util", - "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", - "sp-consensus", - "sp-consensus-babe", - "sp-runtime", - "substrate-prometheus-endpoint", + "polkadot-overseer 17.0.0", + "polkadot-primitives 15.0.0", + "polkadot-service", + "sc-authority-discovery 0.44.0", + "sc-client-api 37.0.0", + "sc-network 0.44.0", + "sc-network-common 0.43.0", + "sc-service 0.45.0", + "sc-tracing 37.0.0", + "sc-utils 17.0.0", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-consensus-babe 0.40.0", + "sp-runtime 39.0.0", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", "tokio", "tracing", ] [[package]] name = "cumulus-relay-chain-rpc-interface" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.17.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "async-trait", - "cumulus-primitives-core", - "cumulus-relay-chain-interface", + "cumulus-primitives-core 0.15.0", + "cumulus-relay-chain-interface 0.17.0", "either", "futures", "futures-timer", - "jsonrpsee", + "jsonrpsee 0.23.2", "parity-scale-codec", "pin-project", - "polkadot-overseer", - "rand", - "sc-client-api", - "sc-rpc-api", - "sc-service", + "polkadot-overseer 17.0.0", + "rand 0.8.5", + "sc-client-api 37.0.0", + "sc-rpc-api 0.43.0", + "sc-service 0.45.0", "schnellru", "serde", "serde_json", "smoldot", "smoldot-light", - "sp-api", - "sp-authority-discovery", - "sp-consensus-babe", - "sp-core", - "sp-runtime", - "sp-state-machine", - "sp-storage 13.0.0", - "sp-version", + "sp-api 34.0.0", + "sp-authority-discovery 34.0.0", + "sp-consensus-babe 0.40.0", + "sp-core 34.0.0", + "sp-runtime 39.0.0", + "sp-state-machine 0.43.0", + "sp-storage 21.0.0", + "sp-version 37.0.0", "thiserror", "tokio", "tokio-util", @@ -2355,28 +2534,41 @@ dependencies = [ [[package]] name = "cumulus-test-relay-sproof-builder" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ - "cumulus-primitives-core", + "cumulus-primitives-core 0.7.0", "parity-scale-codec", - "polkadot-primitives", - "sp-runtime", - "sp-state-machine", - "sp-std 8.0.0", - "sp-trie", + "polkadot-primitives 7.0.0", + "sp-runtime 31.0.1", + "sp-state-machine 0.35.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-trie 29.0.0", ] [[package]] -name = "curve25519-dalek" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +name = "cumulus-test-relay-sproof-builder" +version = "0.15.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" +dependencies = [ + "cumulus-primitives-core 0.15.0", + "parity-scale-codec", + "polkadot-primitives 15.0.0", + "sp-runtime 39.0.0", + "sp-state-machine 0.43.0", + "sp-trie 37.0.0", +] + +[[package]] +name = "curve25519-dalek" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.5.1", - "subtle 2.4.1", + "subtle 2.6.1", "zeroize", ] @@ -2392,7 +2584,7 @@ dependencies = [ "digest 0.10.7", "fiat-crypto", "rustc_version", - "subtle 2.4.1", + "subtle 2.6.1", "zeroize", ] @@ -2464,6 +2656,19 @@ dependencies = [ "syn 2.0.68", ] +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core 0.9.10", +] + [[package]] name = "data-encoding" version = "2.6.0" @@ -2506,7 +2711,21 @@ version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" dependencies = [ - "asn1-rs", + "asn1-rs 0.5.2", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "der-parser" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" +dependencies = [ + "asn1-rs 0.6.2", "displaydoc", "nom", "num-bigint", @@ -2534,17 +2753,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive-syn-parse" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79116f119dd1dba1abf1f3405f03b9b0e79a27a3883864bfebded8a3dc768cd" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "derive-syn-parse" version = "0.2.0" @@ -2602,7 +2810,7 @@ dependencies = [ "block-buffer 0.10.4", "const-oid", "crypto-common", - "subtle 2.4.1", + "subtle 2.6.1", ] [[package]] @@ -2690,7 +2898,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a081e51fb188742f5a7a1164ad752121abcb22874b21e2c3b0dd040c515fdad" dependencies = [ "common-path", - "derive-syn-parse 0.2.0", + "derive-syn-parse", "once_cell", "proc-macro2", "quote", @@ -2756,10 +2964,20 @@ dependencies = [ "digest 0.10.7", "elliptic-curve", "rfc6979", - "signature", + "serdect", + "signature 2.2.0", "spki", ] +[[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" @@ -2767,35 +2985,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ "pkcs8", - "signature", + "signature 2.2.0", ] [[package]] name = "ed25519-dalek" -version = "2.1.1" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" +checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ - "curve25519-dalek 4.1.3", - "ed25519", - "rand_core 0.6.4", + "curve25519-dalek 3.2.0", + "ed25519 1.5.3", + "rand 0.7.3", "serde", - "sha2 0.10.8", - "subtle 2.4.1", + "sha2 0.9.9", "zeroize", ] [[package]] -name = "ed25519-zebra" -version = "3.1.0" +name = "ed25519-dalek" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ - "curve25519-dalek 3.2.0", - "hashbrown 0.12.3", - "hex", + "curve25519-dalek 4.1.3", + "ed25519 2.2.3", "rand_core 0.6.4", - "sha2 0.9.9", + "serde", + "sha2 0.10.8", + "subtle 2.6.1", "zeroize", ] @@ -2806,7 +3024,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9" dependencies = [ "curve25519-dalek 4.1.3", - "ed25519", + "ed25519 2.2.3", "hashbrown 0.14.5", "hex", "rand_core 0.6.4", @@ -2835,7 +3053,8 @@ dependencies = [ "pkcs8", "rand_core 0.6.4", "sec1", - "subtle 2.4.1", + "serdect", + "subtle 2.6.1", "zeroize", ] @@ -2857,6 +3076,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "enum-as-inner" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.68", +] + [[package]] name = "enumflags2" version = "0.7.10" @@ -2970,18 +3201,6 @@ dependencies = [ "futures", ] -[[package]] -name = "expander" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a718c0675c555c5f976fff4ea9e2c150fa06cefa201cadef87cfbf9324075881" -dependencies = [ - "blake3", - "fs-err", - "proc-macro2", - "quote", -] - [[package]] name = "expander" version = "2.2.1" @@ -3003,6 +3222,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + [[package]] name = "fastrand" version = "1.9.0" @@ -3020,9 +3245,9 @@ checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fatality" -version = "0.0.6" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ad875162843b0d046276327afe0136e9ed3a23d5a754210fb6f1f33610d39ab" +checksum = "ec6f82451ff7f0568c6181287189126d492b5654e30a788add08027b6363d019" dependencies = [ "fatality-proc-macro", "thiserror", @@ -3030,17 +3255,16 @@ dependencies = [ [[package]] name = "fatality-proc-macro" -version = "0.0.6" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5aa1e3ae159e592ad222dc90c5acbad632b527779ba88486abe92782ab268bd" +checksum = "eb42427514b063d97ce21d5199f36c0c307d981434a6be32582bc79fe5bd2303" dependencies = [ - "expander 0.0.4", - "indexmap 1.9.3", - "proc-macro-crate 1.1.3", + "expander", + "indexmap 2.2.6", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 1.0.109", - "thiserror", + "syn 2.0.68", ] [[package]] @@ -3060,7 +3284,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ "rand_core 0.6.4", - "subtle 2.4.1", + "subtle 2.6.1", ] [[package]] @@ -3137,7 +3361,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", - "rand", + "rand 0.8.5", "rustc-hex", "static_assertions", ] @@ -3174,10 +3398,33 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "fork-tree" -version = "3.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "12.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "parity-scale-codec", +] + +[[package]] +name = "fork-tree" +version = "13.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "parity-scale-codec", ] @@ -3191,6 +3438,16 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "forwarded-header-value" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835f84f38484cc86f110a805655697908257fb9a7af005234060891557198e9" +dependencies = [ + "nonempty", + "thiserror", +] + [[package]] name = "fragile" version = "2.0.0" @@ -3199,11 +3456,11 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ - "frame-support", - "frame-support-procedural", + "frame-support 37.0.0", + "frame-support-procedural 30.0.2", "frame-system", "linregress", "log", @@ -3211,69 +3468,70 @@ dependencies = [ "paste", "scale-info", "serde", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-io", - "sp-runtime", - "sp-runtime-interface 17.0.0", - "sp-std 8.0.0", - "sp-storage 13.0.0", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-runtime-interface 28.0.0", + "sp-storage 21.0.0", "static_assertions", ] [[package]] name = "frame-benchmarking-cli" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "42.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "Inflector", - "array-bytes 6.2.3", + "array-bytes", "chrono", "clap", "comfy-table", "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "gethostname", "handlebars", - "itertools 0.10.5", + "itertools 0.11.0", "lazy_static", "linked-hash-map", "log", "parity-scale-codec", - "rand", + "rand 0.8.5", "rand_pcg", - "sc-block-builder", - "sc-cli", - "sc-client-api", - "sc-client-db", - "sc-executor", - "sc-service", - "sc-sysinfo", + "sc-block-builder 0.42.0", + "sc-chain-spec 37.0.0", + "sc-cli 0.46.0", + "sc-client-api 37.0.0", + "sc-client-db 0.44.0", + "sc-executor 0.40.0", + "sc-service 0.45.0", + "sc-sysinfo 37.0.0", "serde", "serde_json", - "sp-api", - "sp-blockchain", - "sp-core", - "sp-database", - "sp-externalities 0.19.0", - "sp-inherents", - "sp-io", - "sp-keystore", - "sp-runtime", - "sp-state-machine", - "sp-storage 13.0.0", - "sp-trie", - "sp-wasm-interface 14.0.0", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-database 10.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-externalities 0.29.0", + "sp-genesis-builder 0.15.0", + "sp-inherents 34.0.0", + "sp-io 38.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.0", + "sp-state-machine 0.43.0", + "sp-storage 21.0.0", + "sp-trie 37.0.0", + "sp-wasm-interface 21.0.0", "thiserror", "thousands", ] [[package]] name = "frame-election-provider-solution-type" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "14.0.1" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", @@ -3283,37 +3541,36 @@ dependencies = [ [[package]] name = "frame-election-provider-support" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "frame-election-provider-solution-type", - "frame-support", + "frame-support 37.0.0", "frame-system", "parity-scale-codec", "scale-info", - "sp-arithmetic", - "sp-core", + "sp-arithmetic 26.0.0", + "sp-core 34.0.0", "sp-npos-elections", - "sp-runtime", - "sp-std 8.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "frame-executive" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "frame-support", + "aquamarine", + "frame-support 37.0.0", "frame-system", - "frame-try-runtime", + "frame-try-runtime 0.43.0", "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", - "sp-tracing 10.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-tracing 17.0.0", ] [[package]] @@ -3330,34 +3587,35 @@ dependencies = [ [[package]] name = "frame-metadata-hash-extension" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.5.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "array-bytes 6.2.3", + "array-bytes", "docify", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-runtime", + "sp-runtime 39.0.0", ] [[package]] name = "frame-remote-externalities" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.35.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "futures", "indicatif", - "jsonrpsee", + "jsonrpsee 0.22.5", "log", "parity-scale-codec", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-state-machine", + "sp-core 28.0.0", + "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "sp-state-machine 0.35.0", "spinners", "substrate-rpc-client", "tokio", @@ -3366,16 +3624,57 @@ dependencies = [ [[package]] name = "frame-support" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "aquamarine", + "array-bytes", + "bitflags 1.3.2", + "docify", + "environmental", + "frame-metadata", + "frame-support-procedural 23.0.0", + "impl-trait-for-tuples", + "k256", + "log", + "macro_magic", + "parity-scale-codec", + "paste", + "scale-info", + "serde", + "serde_json", + "smallvec", + "sp-api 26.0.0", + "sp-arithmetic 23.0.0", + "sp-core 28.0.0", + "sp-crypto-hashing-proc-macro 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-genesis-builder 0.8.0", + "sp-inherents 26.0.0", + "sp-io 30.0.0", + "sp-metadata-ir 0.6.0", + "sp-runtime 31.0.1", + "sp-staking 26.0.0", + "sp-state-machine 0.35.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-weights 27.0.0", + "static_assertions", + "tt-call", +] + +[[package]] +name = "frame-support" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "aquamarine", - "array-bytes 6.2.3", + "array-bytes", "bitflags 1.3.2", "docify", "environmental", "frame-metadata", - "frame-support-procedural", + "frame-support-procedural 30.0.2", "impl-trait-for-tuples", "k256", "log", @@ -3386,41 +3685,60 @@ dependencies = [ "serde", "serde_json", "smallvec", - "sp-api", - "sp-arithmetic", - "sp-core", - "sp-core-hashing-proc-macro", - "sp-debug-derive 8.0.0", - "sp-genesis-builder", - "sp-inherents", - "sp-io", - "sp-metadata-ir", - "sp-runtime", - "sp-staking", - "sp-state-machine", - "sp-std 8.0.0", - "sp-tracing 10.0.0", - "sp-weights", + "sp-api 34.0.0", + "sp-arithmetic 26.0.0", + "sp-core 34.0.0", + "sp-crypto-hashing-proc-macro 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-genesis-builder 0.15.0", + "sp-inherents 34.0.0", + "sp-io 38.0.0", + "sp-metadata-ir 0.7.0", + "sp-runtime 39.0.0", + "sp-staking 34.0.0", + "sp-state-machine 0.43.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-tracing 17.0.0", + "sp-weights 31.0.0", "static_assertions", "tt-call", ] [[package]] name = "frame-support-procedural" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "Inflector", "cfg-expr", - "derive-syn-parse 0.1.5", - "expander 2.2.1", - "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0)", - "itertools 0.10.5", + "derive-syn-parse", + "expander", + "frame-support-procedural-tools 10.0.0", + "itertools 0.11.0", + "macro_magic", + "proc-macro-warning 1.0.2", + "proc-macro2", + "quote", + "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "syn 2.0.68", +] + +[[package]] +name = "frame-support-procedural" +version = "30.0.2" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" +dependencies = [ + "Inflector", + "cfg-expr", + "derive-syn-parse", + "expander", + "frame-support-procedural-tools 13.0.0", + "itertools 0.11.0", "macro_magic", - "proc-macro-warning", + "proc-macro-warning 1.0.2", "proc-macro2", "quote", - "sp-core-hashing", + "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", "syn 2.0.68", ] @@ -3429,7 +3747,7 @@ name = "frame-support-procedural-tools" version = "4.0.0-dev" dependencies = [ "frame-support-procedural-tools-derive 3.0.0", - "proc-macro-crate 1.1.3", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 2.0.68", @@ -3437,10 +3755,22 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "10.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "frame-support-procedural-tools-derive 11.0.0", + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "frame-support-procedural-tools" +version = "13.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ - "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0)", + "frame-support-procedural-tools-derive 12.0.0", "proc-macro-crate 3.1.0", "proc-macro2", "quote", @@ -3458,8 +3788,18 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" -version = "3.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "11.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "frame-support-procedural-tools-derive" +version = "12.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "proc-macro2", "quote", @@ -3468,58 +3808,69 @@ dependencies = [ [[package]] name = "frame-system" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.1.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "cfg-if", "docify", - "frame-support", + "frame-support 37.0.0", "log", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", - "sp-version", - "sp-weights", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-version 37.0.0", + "sp-weights 31.0.0", ] [[package]] name = "frame-system-benchmarking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "parity-scale-codec", "scale-info", - "sp-core", - "sp-runtime", - "sp-std 8.0.0", + "sp-core 34.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "frame-system-rpc-runtime-api" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "34.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" +dependencies = [ + "docify", + "parity-scale-codec", + "sp-api 34.0.0", +] + +[[package]] +name = "frame-try-runtime" +version = "0.34.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ + "frame-support 28.0.0", "parity-scale-codec", - "sp-api", + "sp-api 26.0.0", + "sp-runtime 31.0.1", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", ] [[package]] name = "frame-try-runtime" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.43.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "frame-support", + "frame-support 37.0.0", "parity-scale-codec", - "sp-api", - "sp-runtime", - "sp-std 8.0.0", + "sp-api 34.0.0", + "sp-runtime 39.0.0", ] [[package]] @@ -3572,6 +3923,16 @@ dependencies = [ "futures-util", ] +[[package]] +name = "futures-bounded" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b07bbbe7d7e78809544c6f718d875627addc73a7c3582447abc052cd3dc67e0" +dependencies = [ + "futures-timer", + "futures-util", +] + [[package]] name = "futures-channel" version = "0.3.30" @@ -3656,6 +4017,16 @@ dependencies = [ "webpki", ] +[[package]] +name = "futures-rustls" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd3cf68c183738046838e300353e4716c674dc5e56890de4826801a6622a28" +dependencies = [ + "futures-io", + "rustls 0.21.12", +] + [[package]] name = "futures-sink" version = "0.3.30" @@ -3759,7 +4130,7 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9" dependencies = [ - "rand", + "rand 0.8.5", "rand_core 0.6.4", ] @@ -3779,11 +4150,21 @@ version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" dependencies = [ - "fallible-iterator", + "fallible-iterator 0.2.0", "indexmap 1.9.3", "stable_deref_trait", ] +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +dependencies = [ + "fallible-iterator 0.3.0", + "stable_deref_trait", +] + [[package]] name = "gimli" version = "0.29.0" @@ -3797,16 +4178,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] -name = "globset" -version = "0.4.14" +name = "governor" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", + "cfg-if", + "dashmap", + "futures", + "futures-timer", + "no-std-compat", + "nonzero_ext", + "parking_lot 0.12.3", + "portable-atomic", + "quanta", + "rand 0.8.5", + "smallvec", + "spinning_top", ] [[package]] @@ -3817,7 +4205,7 @@ checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", "rand_core 0.6.4", - "subtle 2.4.1", + "subtle 2.6.1", ] [[package]] @@ -3831,7 +4219,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.12", "indexmap 2.2.6", "slab", "tokio", @@ -3840,15 +4228,34 @@ dependencies = [ ] [[package]] -name = "handlebars" -version = "4.5.0" +name = "h2" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faa67bab9ff362228eb3d00bd024a4965d8231bbb7921167f0cfa66c6626b225" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ - "log", - "pest", - "pest_derive", - "serde", + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "handlebars" +version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d08485b96a0e6393e9e4d1b8d48cf74ad6c063cd905eb33f42c1ce3f0377539b" +dependencies = [ + "log", + "pest", + "pest_derive", + "serde", "serde_json", "thiserror", ] @@ -3873,9 +4280,6 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.8", -] [[package]] name = "hashbrown" @@ -3883,7 +4287,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.11", + "ahash", ] [[package]] @@ -3892,7 +4296,7 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ - "ahash 0.8.11", + "ahash", "allocator-api2", "serde", ] @@ -3937,10 +4341,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] -name = "hex-literal" -version = "0.3.4" +name = "hex-conservative" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" +checksum = "212ab92002354b4819390025006c897e8140934349e8635c9b077f47b4dcbd20" [[package]] name = "hex-literal" @@ -3967,16 +4371,6 @@ dependencies = [ "digest 0.9.0", ] -[[package]] -name = "hmac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" -dependencies = [ - "crypto-mac 0.11.1", - "digest 0.9.0", -] - [[package]] name = "hmac" version = "0.12.1" @@ -4028,6 +4422,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.6" @@ -4035,7 +4440,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.12", + "pin-project-lite 0.2.14", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", "pin-project-lite 0.2.14", ] @@ -4073,9 +4501,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -4087,6 +4515,26 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.6", + "http 1.1.0", + "http-body 1.0.1", + "httparse", + "httpdate", + "itoa", + "pin-project-lite 0.2.14", + "smallvec", + "tokio", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -4094,14 +4542,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", - "hyper", + "http 0.2.12", + "hyper 0.14.29", "log", "rustls 0.21.12", - "rustls-native-certs", + "rustls-native-certs 0.6.3", "tokio", - "tokio-rustls", - "webpki-roots 0.25.4", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-util" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.4.1", + "pin-project-lite 0.2.14", + "tokio", + "tower", + "tower-service", ] [[package]] @@ -4138,6 +4602,16 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "idna" version = "0.5.0" @@ -4177,6 +4651,25 @@ dependencies = [ "windows", ] +[[package]] +name = "igd-next" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "064d90fec10d541084e7b39ead8875a5a80d9114a2b18791565253bae25f49e4" +dependencies = [ + "async-trait", + "attohttpc", + "bytes", + "futures", + "http 0.2.12", + "hyper 0.14.29", + "log", + "rand 0.8.5", + "tokio", + "url", + "xmltree", +] + [[package]] name = "impl-codec" version = "0.6.0" @@ -4302,75 +4795,63 @@ dependencies = [ name = "invarch-node" version = "1.2.0" dependencies = [ + "array-bytes", "async-trait", "clap", + "color-print", "cumulus-client-cli", "cumulus-client-collator", "cumulus-client-consensus-aura", "cumulus-client-consensus-common", "cumulus-client-consensus-proposer", - "cumulus-client-network", - "cumulus-client-parachain-inherent", + "cumulus-client-parachain-inherent 0.11.0", "cumulus-client-service", - "cumulus-primitives-core", - "cumulus-primitives-parachain-inherent", - "cumulus-relay-chain-inprocess-interface", - "cumulus-relay-chain-interface", - "cumulus-relay-chain-minimal-node", - "cumulus-relay-chain-rpc-interface", - "derive_more", + "cumulus-primitives-core 0.15.0", + "cumulus-primitives-parachain-inherent 0.15.0", + "cumulus-relay-chain-interface 0.17.0", + "docify", "frame-benchmarking", "frame-benchmarking-cli", "futures", - "hex-literal 0.3.4", "invarch-runtime", - "jsonrpsee", + "jsonrpsee 0.23.2", "log", "pallet-transaction-payment-rpc", "parity-scale-codec", "polkadot-cli", - "polkadot-parachain-primitives", - "polkadot-primitives", - "polkadot-service", + "polkadot-primitives 15.0.0", "sc-basic-authorship", - "sc-chain-spec", - "sc-cli", - "sc-client-api", - "sc-consensus", + "sc-chain-spec 37.0.0", + "sc-cli 0.46.0", + "sc-client-api 37.0.0", + "sc-consensus 0.43.0", "sc-consensus-aura", - "sc-consensus-manual-seal", - "sc-executor", - "sc-keystore", - "sc-network", - "sc-network-sync", - "sc-rpc", - "sc-rpc-api", - "sc-service", - "sc-sysinfo", - "sc-telemetry", - "sc-tracing", - "sc-transaction-pool", - "sc-transaction-pool-api", + "sc-executor 0.40.0", + "sc-network 0.44.0", + "sc-network-sync 0.43.0", + "sc-offchain", + "sc-rpc 39.0.0", + "sc-service 0.45.0", + "sc-sysinfo 37.0.0", + "sc-telemetry 24.0.0", + "sc-tracing 37.0.0", + "sc-transaction-pool 37.0.0", + "sc-transaction-pool-api 37.0.0", "serde", "serde_json", - "sp-api", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-consensus-aura", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keystore", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-timestamp", - "sp-transaction-pool", - "staging-xcm", + "sp-api 34.0.0", + "sp-block-builder 34.0.0", + "sp-blockchain 37.0.1", + "sp-consensus-aura 0.40.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.0", + "sp-timestamp 34.0.0", + "staging-xcm 14.1.0", "substrate-build-script-utils", "substrate-frame-rpc-system", - "substrate-prometheus-endpoint", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", "try-runtime-cli", ] @@ -4381,10 +4862,11 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", + "serde", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", ] [[package]] @@ -4397,24 +4879,32 @@ dependencies = [ "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", - "cumulus-primitives-core", + "cumulus-primitives-aura", + "cumulus-primitives-core 0.15.0", "cumulus-primitives-timestamp", "cumulus-primitives-utility", + "docify", "frame-benchmarking", "frame-executive", "frame-metadata-hash-extension", - "frame-support", + "frame-support 37.0.0", "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", - "frame-try-runtime", - "hex-literal 0.3.4", + "frame-try-runtime 0.43.0", + "hex-literal", "log", "new-modified-construct-runtime", - "orml-tokens 0.7.1", - "orml-traits 0.7.1", + "orml-asset-registry", + "orml-currencies", + "orml-tokens 1.0.0", + "orml-tokens 1.0.1", + "orml-traits 1.0.0", + "orml-traits 1.0.1", "orml-vesting", "orml-xcm", + "orml-xcm-support", + "orml-xtokens", "pallet-aura", "pallet-authorship", "pallet-balances", @@ -4434,24 +4924,24 @@ dependencies = [ "pallet-utility", "pallet-xcm", "parity-scale-codec", - "polkadot-parachain-primitives", + "polkadot-parachain-primitives 14.0.0", "polkadot-runtime-common", "scale-info", "smallvec", - "sp-api", - "sp-block-builder", - "sp-consensus-aura", - "sp-core", - "sp-genesis-builder", - "sp-inherents", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-std 8.0.0", - "sp-transaction-pool", - "sp-version", + "sp-api 34.0.0", + "sp-block-builder 34.0.0", + "sp-consensus-aura 0.40.0", + "sp-core 34.0.0", + "sp-genesis-builder 0.15.0", + "sp-inherents 34.0.0", + "sp-offchain 34.0.0", + "sp-runtime 39.0.0", + "sp-session 35.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-transaction-pool 34.0.0", + "sp-version 37.0.0", "staging-parachain-info", - "staging-xcm", + "staging-xcm 14.1.0", "staging-xcm-builder", "staging-xcm-executor", "substrate-wasm-builder", @@ -4542,6 +5032,26 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + [[package]] name = "jobserver" version = "0.1.31" @@ -4562,115 +5072,223 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.16.3" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "367a292944c07385839818bb71c8d76611138e2dedb0677d035b8da21d29c78b" +checksum = "cfdb12a2381ea5b2e68c3469ec604a007b367778cdb14d09612c8069ebd616ad" dependencies = [ - "jsonrpsee-core", + "jsonrpsee-core 0.22.5", "jsonrpsee-http-client", - "jsonrpsee-proc-macros", - "jsonrpsee-server", - "jsonrpsee-types", - "jsonrpsee-ws-client", + "jsonrpsee-proc-macros 0.22.5", + "jsonrpsee-server 0.22.5", + "jsonrpsee-types 0.22.5", + "jsonrpsee-ws-client 0.22.5", + "tokio", + "tracing", +] + +[[package]] +name = "jsonrpsee" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b089779ad7f80768693755a031cc14a7766aba707cbe886674e3f79e9b7e47" +dependencies = [ + "jsonrpsee-core 0.23.2", + "jsonrpsee-proc-macros 0.23.2", + "jsonrpsee-server 0.23.2", + "jsonrpsee-types 0.23.2", + "jsonrpsee-ws-client 0.23.2", + "tokio", "tracing", ] [[package]] name = "jsonrpsee-client-transport" -version = "0.16.3" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8b3815d9f5d5de348e5f162b316dc9cdf4548305ebb15b4eb9328e66cf27d7a" +checksum = "4978087a58c3ab02efc5b07c5e5e2803024536106fd5506f558db172c889b3aa" dependencies = [ "futures-util", - "http", - "jsonrpsee-core", - "jsonrpsee-types", + "http 0.2.12", + "jsonrpsee-core 0.22.5", "pin-project", - "rustls-native-certs", - "soketto", + "rustls-native-certs 0.7.3", + "rustls-pki-types", + "soketto 0.7.1", "thiserror", "tokio", - "tokio-rustls", + "tokio-rustls 0.25.0", "tokio-util", "tracing", - "webpki-roots 0.25.4", + "url", +] + +[[package]] +name = "jsonrpsee-client-transport" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08163edd8bcc466c33d79e10f695cdc98c00d1e6ddfb95cec41b6b0279dd5432" +dependencies = [ + "base64 0.22.1", + "futures-util", + "http 1.1.0", + "jsonrpsee-core 0.23.2", + "pin-project", + "rustls 0.23.13", + "rustls-pki-types", + "rustls-platform-verifier", + "soketto 0.8.0", + "thiserror", + "tokio", + "tokio-rustls 0.26.0", + "tokio-util", + "tracing", + "url", ] [[package]] name = "jsonrpsee-core" -version = "0.16.3" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5dde66c53d6dcdc8caea1874a45632ec0fcf5b437789f1e45766a1512ce803" +checksum = "b4b257e1ec385e07b0255dde0b933f948b5c8b8c28d42afda9587c3a967b896d" dependencies = [ "anyhow", - "arrayvec 0.7.4", - "async-lock 2.8.0", "async-trait", "beef", - "futures-channel", "futures-timer", "futures-util", - "globset", - "hyper", - "jsonrpsee-types", + "hyper 0.14.29", + "jsonrpsee-types 0.22.5", "parking_lot 0.12.3", - "rand", + "pin-project", + "rand 0.8.5", + "rustc-hash", + "serde", + "serde_json", + "thiserror", + "tokio", + "tokio-stream", + "tracing", +] + +[[package]] +name = "jsonrpsee-core" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79712302e737d23ca0daa178e752c9334846b08321d439fd89af9a384f8c830b" +dependencies = [ + "anyhow", + "async-trait", + "beef", + "bytes", + "futures-timer", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "jsonrpsee-types 0.23.2", + "parking_lot 0.12.3", + "pin-project", + "rand 0.8.5", "rustc-hash", "serde", "serde_json", - "soketto", "thiserror", "tokio", + "tokio-stream", "tracing", ] [[package]] name = "jsonrpsee-http-client" -version = "0.16.3" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e5f9fabdd5d79344728521bb65e3106b49ec405a78b66fbff073b72b389fa43" +checksum = "1ccf93fc4a0bfe05d851d37d7c32b7f370fe94336b52a2f0efc5f1981895c2e5" dependencies = [ "async-trait", - "hyper", + "hyper 0.14.29", "hyper-rustls", - "jsonrpsee-core", - "jsonrpsee-types", - "rustc-hash", + "jsonrpsee-core 0.22.5", + "jsonrpsee-types 0.22.5", "serde", "serde_json", "thiserror", "tokio", + "tower", "tracing", + "url", ] [[package]] name = "jsonrpsee-proc-macros" -version = "0.16.3" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44e8ab85614a08792b9bff6c8feee23be78c98d0182d4c622c05256ab553892a" +checksum = "7d0bb047e79a143b32ea03974a6bf59b62c2a4c5f5d42a381c907a8bbb3f75c0" dependencies = [ "heck 0.4.1", - "proc-macro-crate 1.1.3", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.68", +] + +[[package]] +name = "jsonrpsee-proc-macros" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7895f186d5921065d96e16bd795e5ca89ac8356ec423fafc6e3d7cf8ec11aee4" +dependencies = [ + "heck 0.5.0", + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.68", ] [[package]] name = "jsonrpsee-server" -version = "0.16.3" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4d945a6008c9b03db3354fb3c83ee02d2faa9f2e755ec1dfb69c3551b8f4ba" +checksum = "12d8b6a9674422a8572e0b0abb12feeb3f2aeda86528c80d0350c2bd0923ab41" dependencies = [ - "futures-channel", "futures-util", - "http", - "hyper", - "jsonrpsee-core", - "jsonrpsee-types", + "http 0.2.12", + "hyper 0.14.29", + "jsonrpsee-core 0.22.5", + "jsonrpsee-types 0.22.5", + "pin-project", + "route-recognizer", + "serde", + "serde_json", + "soketto 0.7.1", + "thiserror", + "tokio", + "tokio-stream", + "tokio-util", + "tower", + "tracing", +] + +[[package]] +name = "jsonrpsee-server" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "654afab2e92e5d88ebd8a39d6074483f3f2bfdf91c5ac57fe285e7127cdd4f51" +dependencies = [ + "anyhow", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.4.1", + "hyper-util", + "jsonrpsee-core 0.23.2", + "jsonrpsee-types 0.23.2", + "pin-project", + "route-recognizer", "serde", "serde_json", - "soketto", + "soketto 0.8.0", + "thiserror", "tokio", "tokio-stream", "tokio-util", @@ -4680,28 +5298,54 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.16.3" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245ba8e5aa633dd1c1e4fae72bce06e71f42d34c14a2767c6b4d173b57bee5e5" +checksum = "150d6168405890a7a3231a3c74843f58b8959471f6df76078db2619ddee1d07d" dependencies = [ "anyhow", "beef", "serde", "serde_json", "thiserror", - "tracing", +] + +[[package]] +name = "jsonrpsee-types" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c465fbe385238e861fdc4d1c85e04ada6c1fd246161d26385c1b311724d2af" +dependencies = [ + "beef", + "http 1.1.0", + "serde", + "serde_json", + "thiserror", ] [[package]] name = "jsonrpsee-ws-client" -version = "0.16.3" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e1b3975ed5d73f456478681a417128597acd6a2487855fdb7b4a3d4d195bf5e" +checksum = "58b9db2dfd5bb1194b0ce921504df9ceae210a345bc2f6c5a61432089bbab070" dependencies = [ - "http", - "jsonrpsee-client-transport", - "jsonrpsee-core", - "jsonrpsee-types", + "http 0.2.12", + "jsonrpsee-client-transport 0.22.5", + "jsonrpsee-core 0.22.5", + "jsonrpsee-types 0.22.5", + "url", +] + +[[package]] +name = "jsonrpsee-ws-client" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c28759775f5cb2f1ea9667672d3fe2b0e701d1f4b7b67954e60afe7fd058b5e" +dependencies = [ + "http 1.1.0", + "jsonrpsee-client-transport 0.23.2", + "jsonrpsee-core 0.23.2", + "jsonrpsee-types 0.23.2", + "url", ] [[package]] @@ -4714,6 +5358,7 @@ dependencies = [ "ecdsa", "elliptic-curve", "once_cell", + "serdect", "sha2 0.10.8", ] @@ -4821,49 +5466,110 @@ dependencies = [ "futures-timer", "getrandom 0.2.15", "instant", - "libp2p-allow-block-list", - "libp2p-connection-limits", - "libp2p-core", - "libp2p-dns", - "libp2p-identify", - "libp2p-identity", - "libp2p-kad", - "libp2p-mdns", - "libp2p-metrics", - "libp2p-noise", - "libp2p-ping", - "libp2p-quic", - "libp2p-request-response", - "libp2p-swarm", - "libp2p-tcp", - "libp2p-wasm-ext", - "libp2p-websocket", - "libp2p-yamux", - "multiaddr", + "libp2p-allow-block-list 0.1.1", + "libp2p-connection-limits 0.1.0", + "libp2p-core 0.39.2", + "libp2p-dns 0.39.0", + "libp2p-identify 0.42.2", + "libp2p-identity 0.1.3", + "libp2p-kad 0.43.3", + "libp2p-mdns 0.43.1", + "libp2p-metrics 0.12.0", + "libp2p-noise 0.42.2", + "libp2p-ping 0.42.0", + "libp2p-quic 0.7.0-alpha.3", + "libp2p-request-response 0.24.1", + "libp2p-swarm 0.42.2", + "libp2p-tcp 0.39.0", + "libp2p-wasm-ext 0.39.0", + "libp2p-websocket 0.41.0", + "libp2p-yamux 0.43.1", + "multiaddr 0.17.1", "pin-project", ] +[[package]] +name = "libp2p" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94495eb319a85b70a68b85e2389a95bb3555c71c49025b78c691a854a7e6464" +dependencies = [ + "bytes", + "either", + "futures", + "futures-timer", + "getrandom 0.2.15", + "instant", + "libp2p-allow-block-list 0.2.0", + "libp2p-connection-limits 0.2.1", + "libp2p-core 0.40.1", + "libp2p-dns 0.40.1", + "libp2p-identify 0.43.1", + "libp2p-identity 0.2.9", + "libp2p-kad 0.44.6", + "libp2p-mdns 0.44.0", + "libp2p-metrics 0.13.1", + "libp2p-noise 0.43.2", + "libp2p-ping 0.43.1", + "libp2p-quic 0.9.3", + "libp2p-request-response 0.25.3", + "libp2p-swarm 0.43.7", + "libp2p-tcp 0.40.1", + "libp2p-upnp", + "libp2p-wasm-ext 0.40.0", + "libp2p-websocket 0.42.2", + "libp2p-yamux 0.44.1", + "multiaddr 0.18.1", + "pin-project", + "rw-stream-sink 0.4.0", + "thiserror", +] + [[package]] name = "libp2p-allow-block-list" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "510daa05efbc25184458db837f6f9a5143888f1caa742426d92e1833ddd38a50" dependencies = [ - "libp2p-core", - "libp2p-identity", - "libp2p-swarm", + "libp2p-core 0.39.2", + "libp2p-identity 0.1.3", + "libp2p-swarm 0.42.2", "void", ] [[package]] -name = "libp2p-connection-limits" -version = "0.1.0" +name = "libp2p-allow-block-list" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55b46558c5c0bf99d3e2a1a38fd54ff5476ca66dd1737b12466a1824dd219311" +dependencies = [ + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "libp2p-swarm 0.43.7", + "void", +] + +[[package]] +name = "libp2p-connection-limits" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4caa33f1d26ed664c4fe2cca81a08c8e07d4c1c04f2f4ac7655c2dd85467fda0" dependencies = [ - "libp2p-core", - "libp2p-identity", - "libp2p-swarm", + "libp2p-core 0.39.2", + "libp2p-identity 0.1.3", + "libp2p-swarm 0.42.2", + "void", +] + +[[package]] +name = "libp2p-connection-limits" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f5107ad45cb20b2f6c3628c7b6014b996fcb13a88053f4569c872c6e30abf58" +dependencies = [ + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "libp2p-swarm 0.43.7", "void", ] @@ -4878,20 +5584,48 @@ dependencies = [ "futures", "futures-timer", "instant", - "libp2p-identity", + "libp2p-identity 0.1.3", "log", - "multiaddr", + "multiaddr 0.17.1", "multihash 0.17.0", - "multistream-select", + "multistream-select 0.12.1", + "once_cell", + "parking_lot 0.12.3", + "pin-project", + "quick-protobuf", + "rand 0.8.5", + "rw-stream-sink 0.3.0", + "smallvec", + "thiserror", + "unsigned-varint 0.7.2", + "void", +] + +[[package]] +name = "libp2p-core" +version = "0.40.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd44289ab25e4c9230d9246c475a22241e301b23e8f4061d3bdef304a1a99713" +dependencies = [ + "either", + "fnv", + "futures", + "futures-timer", + "instant", + "libp2p-identity 0.2.9", + "log", + "multiaddr 0.18.1", + "multihash 0.19.1", + "multistream-select 0.13.0", "once_cell", "parking_lot 0.12.3", "pin-project", "quick-protobuf", - "rand", - "rw-stream-sink", + "rand 0.8.5", + "rw-stream-sink 0.4.0", "smallvec", "thiserror", - "unsigned-varint", + "unsigned-varint 0.7.2", "void", ] @@ -4902,11 +5636,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "146ff7034daae62077c415c2376b8057368042df6ab95f5432ad5e88568b1554" dependencies = [ "futures", - "libp2p-core", + "libp2p-core 0.39.2", + "log", + "parking_lot 0.12.3", + "smallvec", + "trust-dns-resolver 0.22.0", +] + +[[package]] +name = "libp2p-dns" +version = "0.40.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6a18db73084b4da2871438f6239fef35190b05023de7656e877c18a00541a3b" +dependencies = [ + "async-trait", + "futures", + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", "log", "parking_lot 0.12.3", "smallvec", - "trust-dns-resolver", + "trust-dns-resolver 0.23.2", ] [[package]] @@ -4919,13 +5669,36 @@ dependencies = [ "either", "futures", "futures-timer", - "libp2p-core", - "libp2p-identity", - "libp2p-swarm", + "libp2p-core 0.39.2", + "libp2p-identity 0.1.3", + "libp2p-swarm 0.42.2", "log", "lru 0.10.1", "quick-protobuf", - "quick-protobuf-codec", + "quick-protobuf-codec 0.1.0", + "smallvec", + "thiserror", + "void", +] + +[[package]] +name = "libp2p-identify" +version = "0.43.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45a96638a0a176bec0a4bcaebc1afa8cf909b114477209d7456ade52c61cd9cd" +dependencies = [ + "asynchronous-codec", + "either", + "futures", + "futures-bounded", + "futures-timer", + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "libp2p-swarm 0.43.7", + "log", + "lru 0.12.4", + "quick-protobuf", + "quick-protobuf-codec 0.2.0", "smallvec", "thiserror", "void", @@ -4938,14 +5711,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce" dependencies = [ "bs58 0.4.0", - "ed25519-dalek", + "ed25519-dalek 2.1.1", "log", - "multiaddr", + "multiaddr 0.17.1", "multihash 0.17.0", "quick-protobuf", - "rand", + "rand 0.8.5", + "sha2 0.10.8", + "thiserror", + "zeroize", +] + +[[package]] +name = "libp2p-identity" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cca1eb2bc1fd29f099f3daaab7effd01e1a54b7c577d0ed082521034d912e8" +dependencies = [ + "bs58 0.5.1", + "ed25519-dalek 2.1.1", + "hkdf", + "multihash 0.19.1", + "quick-protobuf", + "rand 0.8.5", "sha2 0.10.8", "thiserror", + "tracing", "zeroize", ] @@ -4963,17 +5754,46 @@ dependencies = [ "futures", "futures-timer", "instant", - "libp2p-core", - "libp2p-identity", - "libp2p-swarm", + "libp2p-core 0.39.2", + "libp2p-identity 0.1.3", + "libp2p-swarm 0.42.2", + "log", + "quick-protobuf", + "rand 0.8.5", + "sha2 0.10.8", + "smallvec", + "thiserror", + "uint", + "unsigned-varint 0.7.2", + "void", +] + +[[package]] +name = "libp2p-kad" +version = "0.44.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16ea178dabba6dde6ffc260a8e0452ccdc8f79becf544946692fff9d412fc29d" +dependencies = [ + "arrayvec 0.7.4", + "asynchronous-codec", + "bytes", + "either", + "fnv", + "futures", + "futures-timer", + "instant", + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "libp2p-swarm 0.43.7", "log", "quick-protobuf", - "rand", + "quick-protobuf-codec 0.2.0", + "rand 0.8.5", "sha2 0.10.8", "smallvec", "thiserror", "uint", - "unsigned-varint", + "unsigned-varint 0.7.2", "void", ] @@ -4986,15 +5806,36 @@ dependencies = [ "data-encoding", "futures", "if-watch", - "libp2p-core", - "libp2p-identity", - "libp2p-swarm", + "libp2p-core 0.39.2", + "libp2p-identity 0.1.3", + "libp2p-swarm 0.42.2", "log", - "rand", + "rand 0.8.5", "smallvec", "socket2 0.4.10", "tokio", - "trust-dns-proto", + "trust-dns-proto 0.22.0", + "void", +] + +[[package]] +name = "libp2p-mdns" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42a2567c305232f5ef54185e9604579a894fd0674819402bb0ac0246da82f52a" +dependencies = [ + "data-encoding", + "futures", + "if-watch", + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "libp2p-swarm 0.43.7", + "log", + "rand 0.8.5", + "smallvec", + "socket2 0.5.7", + "tokio", + "trust-dns-proto 0.22.0", "void", ] @@ -5004,12 +5845,29 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a42ec91e227d7d0dafa4ce88b333cdf5f277253873ab087555c92798db2ddd46" dependencies = [ - "libp2p-core", - "libp2p-identify", - "libp2p-kad", - "libp2p-ping", - "libp2p-swarm", - "prometheus-client", + "libp2p-core 0.39.2", + "libp2p-identify 0.42.2", + "libp2p-kad 0.43.3", + "libp2p-ping 0.42.0", + "libp2p-swarm 0.42.2", + "prometheus-client 0.19.0", +] + +[[package]] +name = "libp2p-metrics" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239ba7d28f8d0b5d77760dc6619c05c7e88e74ec8fbbe97f856f20a56745e620" +dependencies = [ + "instant", + "libp2p-core 0.40.1", + "libp2p-identify 0.43.1", + "libp2p-identity 0.2.9", + "libp2p-kad 0.44.6", + "libp2p-ping 0.43.1", + "libp2p-swarm 0.43.7", + "once_cell", + "prometheus-client 0.21.2", ] [[package]] @@ -5021,12 +5879,12 @@ dependencies = [ "bytes", "curve25519-dalek 3.2.0", "futures", - "libp2p-core", - "libp2p-identity", + "libp2p-core 0.39.2", + "libp2p-identity 0.1.3", "log", "once_cell", "quick-protobuf", - "rand", + "rand 0.8.5", "sha2 0.10.8", "snow", "static_assertions", @@ -5035,6 +5893,31 @@ dependencies = [ "zeroize", ] +[[package]] +name = "libp2p-noise" +version = "0.43.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2eeec39ad3ad0677551907dd304b2f13f17208ccebe333bef194076cd2e8921" +dependencies = [ + "bytes", + "curve25519-dalek 4.1.3", + "futures", + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "log", + "multiaddr 0.18.1", + "multihash 0.19.1", + "once_cell", + "quick-protobuf", + "rand 0.8.5", + "sha2 0.10.8", + "snow", + "static_assertions", + "thiserror", + "x25519-dalek 2.0.1", + "zeroize", +] + [[package]] name = "libp2p-ping" version = "0.42.0" @@ -5045,10 +5928,28 @@ dependencies = [ "futures", "futures-timer", "instant", - "libp2p-core", - "libp2p-swarm", + "libp2p-core 0.39.2", + "libp2p-swarm 0.42.2", + "log", + "rand 0.8.5", + "void", +] + +[[package]] +name = "libp2p-ping" +version = "0.43.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e702d75cd0827dfa15f8fd92d15b9932abe38d10d21f47c50438c71dd1b5dae3" +dependencies = [ + "either", + "futures", + "futures-timer", + "instant", + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "libp2p-swarm 0.43.7", "log", - "rand", + "rand 0.8.5", "void", ] @@ -5062,18 +5963,42 @@ dependencies = [ "futures", "futures-timer", "if-watch", - "libp2p-core", - "libp2p-identity", - "libp2p-tls", + "libp2p-core 0.39.2", + "libp2p-identity 0.1.3", + "libp2p-tls 0.1.0", "log", "parking_lot 0.12.3", - "quinn-proto", - "rand", + "quinn-proto 0.9.6", + "rand 0.8.5", "rustls 0.20.9", "thiserror", "tokio", ] +[[package]] +name = "libp2p-quic" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "130d451d83f21b81eb7b35b360bc7972aeafb15177784adc56528db082e6b927" +dependencies = [ + "bytes", + "futures", + "futures-timer", + "if-watch", + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "libp2p-tls 0.2.1", + "log", + "parking_lot 0.12.3", + "quinn 0.10.2", + "rand 0.8.5", + "ring 0.16.20", + "rustls 0.21.12", + "socket2 0.5.7", + "thiserror", + "tokio", +] + [[package]] name = "libp2p-request-response" version = "0.24.1" @@ -5083,11 +6008,29 @@ dependencies = [ "async-trait", "futures", "instant", - "libp2p-core", - "libp2p-identity", - "libp2p-swarm", - "rand", + "libp2p-core 0.39.2", + "libp2p-identity 0.1.3", + "libp2p-swarm 0.42.2", + "rand 0.8.5", + "smallvec", +] + +[[package]] +name = "libp2p-request-response" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8e3b4d67870478db72bac87bfc260ee6641d0734e0e3e275798f089c3fecfd4" +dependencies = [ + "async-trait", + "futures", + "instant", + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "libp2p-swarm 0.43.7", + "log", + "rand 0.8.5", "smallvec", + "void", ] [[package]] @@ -5101,11 +6044,34 @@ dependencies = [ "futures", "futures-timer", "instant", - "libp2p-core", - "libp2p-identity", - "libp2p-swarm-derive", + "libp2p-core 0.39.2", + "libp2p-identity 0.1.3", + "libp2p-swarm-derive 0.32.0", + "log", + "rand 0.8.5", + "smallvec", + "tokio", + "void", +] + +[[package]] +name = "libp2p-swarm" +version = "0.43.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "580189e0074af847df90e75ef54f3f30059aedda37ea5a1659e8b9fca05c0141" +dependencies = [ + "either", + "fnv", + "futures", + "futures-timer", + "instant", + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "libp2p-swarm-derive 0.33.0", "log", - "rand", + "multistream-select 0.13.0", + "once_cell", + "rand 0.8.5", "smallvec", "tokio", "void", @@ -5122,6 +6088,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "libp2p-swarm-derive" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4d5ec2a3df00c7836d7696c136274c9c59705bac69133253696a6c932cd1d74" +dependencies = [ + "heck 0.4.1", + "proc-macro-warning 0.4.2", + "proc-macro2", + "quote", + "syn 2.0.68", +] + [[package]] name = "libp2p-tcp" version = "0.39.0" @@ -5132,12 +6111,29 @@ dependencies = [ "futures-timer", "if-watch", "libc", - "libp2p-core", + "libp2p-core 0.39.2", "log", "socket2 0.4.10", "tokio", ] +[[package]] +name = "libp2p-tcp" +version = "0.40.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b558dd40d1bcd1aaaed9de898e9ec6a436019ecc2420dd0016e712fbb61c5508" +dependencies = [ + "futures", + "futures-timer", + "if-watch", + "libc", + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "log", + "socket2 0.5.7", + "tokio", +] + [[package]] name = "libp2p-tls" version = "0.1.0" @@ -5145,62 +6141,145 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff08d13d0dc66e5e9ba6279c1de417b84fa0d0adc3b03e5732928c180ec02781" dependencies = [ "futures", - "futures-rustls", - "libp2p-core", - "libp2p-identity", + "futures-rustls 0.22.2", + "libp2p-core 0.39.2", + "libp2p-identity 0.1.3", "rcgen", "ring 0.16.20", "rustls 0.20.9", "thiserror", "webpki", - "x509-parser", + "x509-parser 0.14.0", "yasna", ] [[package]] -name = "libp2p-wasm-ext" -version = "0.39.0" +name = "libp2p-tls" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77dff9d32353a5887adb86c8afc1de1a94d9e8c3bc6df8b2201d7cdf5c848f43" +checksum = "8218d1d5482b122ccae396bbf38abdcb283ecc96fa54760e1dfd251f0546ac61" dependencies = [ "futures", - "js-sys", - "libp2p-core", - "parity-send-wrapper", - "wasm-bindgen", - "wasm-bindgen-futures", + "futures-rustls 0.24.0", + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "rcgen", + "ring 0.16.20", + "rustls 0.21.12", + "rustls-webpki 0.101.7", + "thiserror", + "x509-parser 0.15.1", + "yasna", ] [[package]] -name = "libp2p-websocket" -version = "0.41.0" +name = "libp2p-upnp" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111273f7b3d3510524c752e8b7a5314b7f7a1fee7e68161c01a7d72cbb06db9f" +checksum = "82775a47b34f10f787ad3e2a22e2c1541e6ebef4fe9f28f3ac553921554c94c1" dependencies = [ - "either", "futures", - "futures-rustls", - "libp2p-core", + "futures-timer", + "igd-next", + "libp2p-core 0.40.1", + "libp2p-swarm 0.43.7", "log", - "parking_lot 0.12.3", - "quicksink", - "rw-stream-sink", - "soketto", - "url", - "webpki-roots 0.22.6", + "tokio", + "void", ] [[package]] -name = "libp2p-yamux" -version = "0.43.1" +name = "libp2p-wasm-ext" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd21d950662700a385d4c6d68e2f5f54d778e97068cdd718522222ef513bda" +checksum = "77dff9d32353a5887adb86c8afc1de1a94d9e8c3bc6df8b2201d7cdf5c848f43" dependencies = [ "futures", - "libp2p-core", + "js-sys", + "libp2p-core 0.39.2", + "parity-send-wrapper", + "wasm-bindgen", + "wasm-bindgen-futures", +] + +[[package]] +name = "libp2p-wasm-ext" +version = "0.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e5d8e3a9e07da0ef5b55a9f26c009c8fb3c725d492d8bb4b431715786eea79c" +dependencies = [ + "futures", + "js-sys", + "libp2p-core 0.40.1", + "send_wrapper", + "wasm-bindgen", + "wasm-bindgen-futures", +] + +[[package]] +name = "libp2p-websocket" +version = "0.41.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "111273f7b3d3510524c752e8b7a5314b7f7a1fee7e68161c01a7d72cbb06db9f" +dependencies = [ + "either", + "futures", + "futures-rustls 0.22.2", + "libp2p-core 0.39.2", + "log", + "parking_lot 0.12.3", + "quicksink", + "rw-stream-sink 0.3.0", + "soketto 0.7.1", + "url", + "webpki-roots 0.22.6", +] + +[[package]] +name = "libp2p-websocket" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "004ee9c4a4631435169aee6aad2f62e3984dc031c43b6d29731e8e82a016c538" +dependencies = [ + "either", + "futures", + "futures-rustls 0.24.0", + "libp2p-core 0.40.1", + "libp2p-identity 0.2.9", + "log", + "parking_lot 0.12.3", + "pin-project-lite 0.2.14", + "rw-stream-sink 0.4.0", + "soketto 0.8.0", + "thiserror", + "url", + "webpki-roots 0.25.4", +] + +[[package]] +name = "libp2p-yamux" +version = "0.43.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd21d950662700a385d4c6d68e2f5f54d778e97068cdd718522222ef513bda" +dependencies = [ + "futures", + "libp2p-core 0.39.2", + "log", + "thiserror", + "yamux 0.10.2", +] + +[[package]] +name = "libp2p-yamux" +version = "0.44.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eedcb62824c4300efb9cfd4e2a6edaf3ca097b9e68b36dabe45a44469fd6a85" +dependencies = [ + "futures", + "libp2p-core 0.40.1", "log", "thiserror", - "yamux", + "yamux 0.12.1", ] [[package]] @@ -5241,7 +6320,7 @@ dependencies = [ "libsecp256k1-core", "libsecp256k1-gen-ecmult", "libsecp256k1-gen-genmult", - "rand", + "rand 0.8.5", "serde", "sha2 0.9.9", "typenum", @@ -5255,7 +6334,7 @@ checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451" dependencies = [ "crunchy", "digest 0.9.0", - "subtle 2.4.1", + "subtle 2.6.1", ] [[package]] @@ -5350,6 +6429,115 @@ dependencies = [ "keystream", ] +[[package]] +name = "litep2p" +version = "0.3.0" +source = "git+https://github.com/paritytech/litep2p?rev=e03a6023882db111beeb24d8c0ceaac0721d3f0f#e03a6023882db111beeb24d8c0ceaac0721d3f0f" +dependencies = [ + "async-trait", + "bs58 0.4.0", + "bytes", + "cid 0.10.1", + "ed25519-dalek 1.0.1", + "futures", + "futures-timer", + "hex-literal", + "indexmap 2.2.6", + "libc", + "mockall 0.11.4", + "multiaddr 0.17.1", + "multihash 0.17.0", + "network-interface", + "nohash-hasher", + "parking_lot 0.12.3", + "pin-project", + "prost 0.11.9", + "prost-build 0.11.9", + "quinn 0.9.4", + "rand 0.8.5", + "rcgen", + "ring 0.16.20", + "rustls 0.20.9", + "serde", + "sha2 0.10.8", + "simple-dns", + "smallvec", + "snow", + "socket2 0.5.7", + "static_assertions", + "str0m 0.4.1", + "thiserror", + "tokio", + "tokio-stream", + "tokio-tungstenite", + "tokio-util", + "tracing", + "trust-dns-resolver 0.23.2", + "uint", + "unsigned-varint 0.7.2", + "url", + "webpki", + "x25519-dalek 2.0.1", + "x509-parser 0.15.1", + "yasna", + "zeroize", +] + +[[package]] +name = "litep2p" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f46c51c205264b834ceed95c8b195026e700494bc3991aaba3b4ea9e20626d9" +dependencies = [ + "async-trait", + "bs58 0.4.0", + "bytes", + "cid 0.10.1", + "ed25519-dalek 2.1.1", + "futures", + "futures-timer", + "hex-literal", + "indexmap 2.2.6", + "libc", + "mockall 0.12.1", + "multiaddr 0.17.1", + "multihash 0.17.0", + "network-interface", + "nohash-hasher", + "parking_lot 0.12.3", + "pin-project", + "prost 0.12.6", + "prost-build 0.11.9", + "quinn 0.9.4", + "rand 0.8.5", + "rcgen", + "ring 0.16.20", + "rustls 0.20.9", + "serde", + "sha2 0.10.8", + "simple-dns", + "smallvec", + "snow", + "socket2 0.5.7", + "static_assertions", + "str0m 0.5.1", + "thiserror", + "tokio", + "tokio-stream", + "tokio-tungstenite", + "tokio-util", + "tracing", + "trust-dns-resolver 0.23.2", + "uint", + "unsigned-varint 0.8.0", + "url", + "webpki", + "x25519-dalek 2.0.1", + "x509-parser 0.16.0", + "yasna", + "zeroize", +] + [[package]] name = "lock_api" version = "0.4.12" @@ -5381,6 +6569,15 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" +[[package]] +name = "lru" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" +dependencies = [ + "hashbrown 0.14.5", +] + [[package]] name = "lru-cache" version = "0.1.2" @@ -5421,9 +6618,9 @@ dependencies = [ [[package]] name = "macro_magic" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e03844fc635e92f3a0067e25fa4bf3e3dbf3f2927bf3aa01bb7bc8f1c428949d" +checksum = "cc33f9f0351468d26fbc53d9ce00a096c8522ecb42f19b50f34f2c422f76d21d" dependencies = [ "macro_magic_core", "macro_magic_macros", @@ -5433,12 +6630,12 @@ dependencies = [ [[package]] name = "macro_magic_core" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "468155613a44cfd825f1fb0ffa532b018253920d404e6fca1e8d43155198a46d" +checksum = "1687dc887e42f352865a393acae7cf79d98fab6351cde1f58e9e057da89bf150" dependencies = [ "const-random", - "derive-syn-parse 0.1.5", + "derive-syn-parse", "macro_magic_core_macros", "proc-macro2", "quote", @@ -5447,9 +6644,9 @@ dependencies = [ [[package]] name = "macro_magic_core_macros" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea73aa640dc01d62a590d48c0c3521ed739d53b27f919b25c3551e233481654" +checksum = "b02abfe41815b5bd98dbd4260173db2c116dda171dc0fe7838cb206333b83308" dependencies = [ "proc-macro2", "quote", @@ -5458,9 +6655,9 @@ dependencies = [ [[package]] name = "macro_magic_macros" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef9d79ae96aaba821963320eb2b6e34d17df1e5a83d8a1985c29cc5be59577b3" +checksum = "73ea28ee64b88876bf45277ed9a5817c1817df061a74f2b988971a12570e5869" dependencies = [ "macro_magic_core", "quote", @@ -5479,15 +6676,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" -[[package]] -name = "matchers" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" -dependencies = [ - "regex-automata 0.1.10", -] - [[package]] name = "matchers" version = "0.1.0" @@ -5537,6 +6725,15 @@ dependencies = [ "libc", ] +[[package]] +name = "memmap2" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" +dependencies = [ + "libc", +] + [[package]] name = "memoffset" version = "0.8.0" @@ -5561,7 +6758,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f313fcff1d2a4bcaa2deeaa00bf7530d77d5f7bd0467a117dde2e29a75a7a17a" dependencies = [ - "array-bytes 6.2.3", + "array-bytes", "blake3", "frame-metadata", "parity-scale-codec", @@ -5588,7 +6785,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69672161530e8aeca1d1400fbf3f1a1747ff60ea604265a4e906c2442df20532" dependencies = [ "futures", - "rand", + "rand 0.8.5", "thrift", ] @@ -5635,47 +6832,46 @@ dependencies = [ "lioness", "log", "parking_lot 0.12.3", - "rand", + "rand 0.8.5", "rand_chacha 0.3.1", "rand_distr", - "subtle 2.4.1", + "subtle 2.6.1", "thiserror", "zeroize", ] [[package]] name = "mmr-gadget" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "39.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "futures", "log", "parity-scale-codec", - "sc-client-api", + "sc-client-api 37.0.0", "sc-offchain", - "sp-api", - "sp-blockchain", - "sp-consensus", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", "sp-consensus-beefy", - "sp-core", + "sp-core 34.0.0", "sp-mmr-primitives", - "sp-runtime", + "sp-runtime 39.0.0", ] [[package]] name = "mmr-rpc" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "anyhow", - "jsonrpsee", + "jsonrpsee 0.23.2", "parity-scale-codec", "serde", - "sp-api", - "sp-blockchain", - "sp-core", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", "sp-mmr-primitives", - "sp-runtime", + "sp-runtime 39.0.0", ] [[package]] @@ -5688,8 +6884,23 @@ dependencies = [ "downcast", "fragile", "lazy_static", - "mockall_derive", - "predicates", + "mockall_derive 0.11.4", + "predicates 2.1.5", + "predicates-tree", +] + +[[package]] +name = "mockall" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "lazy_static", + "mockall_derive 0.12.1", + "predicates 3.1.2", "predicates-tree", ] @@ -5705,6 +6916,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "mockall_derive" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn 2.0.68", +] + [[package]] name = "multiaddr" version = "0.17.1" @@ -5720,7 +6943,26 @@ dependencies = [ "percent-encoding", "serde", "static_assertions", - "unsigned-varint", + "unsigned-varint 0.7.2", + "url", +] + +[[package]] +name = "multiaddr" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b852bc02a2da5feed68cd14fa50d0774b92790a5bdbfa932a813926c8472070" +dependencies = [ + "arrayref", + "byteorder", + "data-encoding", + "libp2p-identity 0.2.9", + "multibase", + "multihash 0.19.1", + "percent-encoding", + "serde", + "static_assertions", + "unsigned-varint 0.7.2", "url", ] @@ -5749,7 +6991,7 @@ dependencies = [ "multihash-derive 0.8.1", "sha2 0.10.8", "sha3", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] @@ -5758,11 +7000,15 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815" dependencies = [ + "blake2b_simd", + "blake2s_simd", + "blake3", "core2", "digest 0.10.7", "multihash-derive 0.8.1", "sha2 0.10.8", - "unsigned-varint", + "sha3", + "unsigned-varint 0.7.2", ] [[package]] @@ -5772,7 +7018,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "076d548d76a0e2a0d4ab471d0b1c36c577786dfc4471242035d97a12a735c492" dependencies = [ "core2", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] @@ -5851,7 +7097,21 @@ dependencies = [ "log", "pin-project", "smallvec", - "unsigned-varint", + "unsigned-varint 0.7.2", +] + +[[package]] +name = "multistream-select" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea0df8e5eec2298a62b326ee4f0d7fe1a6b90a09dfcf9df37b38f947a8c42f19" +dependencies = [ + "bytes", + "futures", + "log", + "pin-project", + "smallvec", + "unsigned-varint 0.7.2", ] [[package]] @@ -5887,7 +7147,7 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc" dependencies = [ - "rand", + "rand 0.8.5", ] [[package]] @@ -5962,21 +7222,33 @@ dependencies = [ "tokio", ] +[[package]] +name = "network-interface" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a43439bf756eed340bdf8feba761e2d50c7d47175d87545cd5cbe4a137c4d1" +dependencies = [ + "cc", + "libc", + "thiserror", + "winapi", +] + [[package]] name = "new-modified-construct-runtime" version = "4.0.0-dev" dependencies = [ "Inflector", "cfg-expr", - "derive-syn-parse 0.1.5", - "expander 2.2.1", + "derive-syn-parse", + "expander", "frame-support-procedural-tools 4.0.0-dev", - "itertools 0.10.5", + "itertools 0.11.0", "macro_magic", - "proc-macro-warning", + "proc-macro-warning 1.0.2", "proc-macro2", "quote", - "sp-core-hashing", + "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", "syn 2.0.68", ] @@ -5991,6 +7263,24 @@ dependencies = [ "libc", ] +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "cfg_aliases", + "libc", +] + +[[package]] +name = "no-std-compat" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" + [[package]] name = "no-std-net" version = "0.6.0" @@ -6020,13 +7310,25 @@ dependencies = [ ] [[package]] -name = "normalize-line-endings" -version = "0.3.0" +name = "nonempty" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" +checksum = "e9e591e719385e6ebaeb5ce5d3887f7d5676fceca6411d1925ccc95745f3d6f7" [[package]] -name = "nu-ansi-term" +name = "nonzero_ext" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" + +[[package]] +name = "normalize-line-endings" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" + +[[package]] +name = "nu-ansi-term" version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" @@ -6128,6 +7430,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + [[package]] name = "object" version = "0.36.0" @@ -6143,7 +7454,16 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" dependencies = [ - "asn1-rs", + "asn1-rs 0.5.2", +] + +[[package]] +name = "oid-registry" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8d8034d9489cdaf79228eb9f6a3b8d7bb32ba00d6645ebd48eef4077ceb5bd9" +dependencies = [ + "asn1-rs 0.6.2", ] [[package]] @@ -6164,12 +7484,60 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" +[[package]] +name = "openssl" +version = "0.10.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + [[package]] name = "openssl-probe" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-src" +version = "300.3.2+3.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +dependencies = [ + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] + [[package]] name = "option-ext" version = "0.2.0" @@ -6186,9 +7554,26 @@ dependencies = [ "dyn-clonable", "futures", "futures-timer", - "orchestra-proc-macro", + "orchestra-proc-macro 0.3.6", + "pin-project", + "prioritized-metered-channel", + "thiserror", + "tracing", +] + +[[package]] +name = "orchestra" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41f6bbacc8c189a3f2e45e0fd0436e5d97f194db888e721bdbc3973e7dbed4c2" +dependencies = [ + "async-trait", + "dyn-clonable", + "futures", + "futures-timer", + "orchestra-proc-macro 0.4.0", "pin-project", - "prioritized-metered-channel 0.6.1", + "prioritized-metered-channel", "thiserror", "tracing", ] @@ -6199,7 +7584,23 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1344346d5af32c95bbddea91b18a88cc83eac394192d20ef2fc4c40a74332355" dependencies = [ - "expander 2.2.1", + "expander", + "indexmap 2.2.6", + "itertools 0.11.0", + "petgraph", + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "orchestra-proc-macro" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7b1d40dd8f367db3c65bec8d3dd47d4a604ee8874480738f93191bddab4e0e0" +dependencies = [ + "expander", "indexmap 2.2.6", "itertools 0.11.0", "petgraph", @@ -6218,137 +7619,211 @@ dependencies = [ "num-traits", ] +[[package]] +name = "orml-asset-registry" +version = "1.0.1" +source = "git+https://github.com/Anny0nn/open-runtime-module-library.git?branch=stable2407#2e7db5977f737100538df9128b10a2f1e106fd46" +dependencies = [ + "frame-support 37.0.0", + "frame-system", + "log", + "orml-traits 1.0.1", + "pallet-xcm", + "parity-scale-codec", + "polkadot-runtime-common", + "scale-info", + "serde", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "staging-xcm 14.1.0", + "staging-xcm-builder", + "staging-xcm-executor", +] + +[[package]] +name = "orml-currencies" +version = "1.0.1" +source = "git+https://github.com/Anny0nn/open-runtime-module-library.git?branch=stable2407#2e7db5977f737100538df9128b10a2f1e106fd46" +dependencies = [ + "frame-support 37.0.0", + "frame-system", + "orml-traits 1.0.1", + "orml-utilities 1.0.1", + "parity-scale-codec", + "scale-info", + "serde", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", +] + [[package]] name = "orml-tokens" -version = "0.7.0" -source = "git+https://github.com/arrudagates/open-runtime-module-library.git?rev=bc6b41e8a9539971a2da5d62cf8f550cde985f00#bc6b41e8a9539971a2da5d62cf8f550cde985f00" +version = "1.0.0" +source = "git+https://github.com/Abstracted-Labs/open-runtime-module-library.git?branch=stable2407#b139e0db41d342bf3db89af0f6c6a590a5bed632" dependencies = [ - "frame-support", + "frame-support 37.0.0", "frame-system", "log", - "orml-traits 0.7.0", + "orml-traits 1.0.0", "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-runtime", - "sp-std 8.0.0", + "sp-arithmetic 26.0.0", + "sp-runtime 39.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", ] [[package]] name = "orml-tokens" -version = "0.7.1" -source = "git+https://github.com/Abstracted-Labs/open-runtime-module-library.git?branch=polkadot-v1.6.0#74a0efb69072bd3e9263c2e56bb1adc11945c3da" +version = "1.0.1" +source = "git+https://github.com/Anny0nn/open-runtime-module-library.git?branch=stable2407#2e7db5977f737100538df9128b10a2f1e106fd46" dependencies = [ - "frame-support", + "frame-support 37.0.0", "frame-system", "log", - "orml-traits 0.7.1", + "orml-traits 1.0.1", "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-runtime", - "sp-std 8.0.0", + "sp-arithmetic 26.0.0", + "sp-runtime 39.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", ] [[package]] name = "orml-traits" -version = "0.7.0" -source = "git+https://github.com/arrudagates/open-runtime-module-library.git?rev=bc6b41e8a9539971a2da5d62cf8f550cde985f00#bc6b41e8a9539971a2da5d62cf8f550cde985f00" +version = "1.0.0" +source = "git+https://github.com/Abstracted-Labs/open-runtime-module-library.git?branch=stable2407#b139e0db41d342bf3db89af0f6c6a590a5bed632" dependencies = [ - "frame-support", + "frame-support 37.0.0", "impl-trait-for-tuples", "num-traits", - "orml-utilities 0.7.0", + "orml-utilities 1.0.0", "parity-scale-codec", "paste", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", - "staging-xcm", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "staging-xcm 14.1.0", ] [[package]] name = "orml-traits" -version = "0.7.1" -source = "git+https://github.com/Abstracted-Labs/open-runtime-module-library.git?branch=polkadot-v1.6.0#74a0efb69072bd3e9263c2e56bb1adc11945c3da" +version = "1.0.1" +source = "git+https://github.com/Anny0nn/open-runtime-module-library.git?branch=stable2407#2e7db5977f737100538df9128b10a2f1e106fd46" dependencies = [ - "frame-support", + "frame-support 37.0.0", "impl-trait-for-tuples", "num-traits", - "orml-utilities 0.7.1", + "orml-utilities 1.0.1", "parity-scale-codec", "paste", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", - "staging-xcm", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "staging-xcm 14.1.0", ] [[package]] name = "orml-utilities" -version = "0.7.0" -source = "git+https://github.com/arrudagates/open-runtime-module-library.git?rev=bc6b41e8a9539971a2da5d62cf8f550cde985f00#bc6b41e8a9539971a2da5d62cf8f550cde985f00" +version = "1.0.0" +source = "git+https://github.com/Abstracted-Labs/open-runtime-module-library.git?branch=stable2407#b139e0db41d342bf3db89af0f6c6a590a5bed632" dependencies = [ - "frame-support", + "frame-support 37.0.0", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", ] [[package]] name = "orml-utilities" -version = "0.7.1" -source = "git+https://github.com/Abstracted-Labs/open-runtime-module-library.git?branch=polkadot-v1.6.0#74a0efb69072bd3e9263c2e56bb1adc11945c3da" +version = "1.0.1" +source = "git+https://github.com/Anny0nn/open-runtime-module-library.git?branch=stable2407#2e7db5977f737100538df9128b10a2f1e106fd46" dependencies = [ - "frame-support", + "frame-support 37.0.0", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", ] [[package]] name = "orml-vesting" -version = "0.7.1" -source = "git+https://github.com/Abstracted-Labs/open-runtime-module-library.git?branch=polkadot-v1.6.0#74a0efb69072bd3e9263c2e56bb1adc11945c3da" +version = "1.0.0" +source = "git+https://github.com/Abstracted-Labs/open-runtime-module-library.git?branch=stable2407#b139e0db41d342bf3db89af0f6c6a590a5bed632" dependencies = [ - "frame-support", + "frame-support 37.0.0", "frame-system", "parity-scale-codec", "scale-info", "serde", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", ] [[package]] name = "orml-xcm" -version = "0.7.1" -source = "git+https://github.com/Abstracted-Labs/open-runtime-module-library.git?branch=polkadot-v1.6.0#74a0efb69072bd3e9263c2e56bb1adc11945c3da" +version = "1.0.0" +source = "git+https://github.com/Abstracted-Labs/open-runtime-module-library.git?branch=stable2407#b139e0db41d342bf3db89af0f6c6a590a5bed632" +dependencies = [ + "frame-support 37.0.0", + "frame-system", + "pallet-xcm", + "parity-scale-codec", + "scale-info", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "staging-xcm 14.1.0", +] + +[[package]] +name = "orml-xcm-support" +version = "1.0.1" +source = "git+https://github.com/Anny0nn/open-runtime-module-library.git?branch=stable2407#2e7db5977f737100538df9128b10a2f1e106fd46" +dependencies = [ + "frame-support 37.0.0", + "orml-traits 1.0.1", + "parity-scale-codec", + "sp-runtime 39.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "staging-xcm 14.1.0", + "staging-xcm-executor", +] + +[[package]] +name = "orml-xtokens" +version = "1.0.1" +source = "git+https://github.com/Anny0nn/open-runtime-module-library.git?branch=stable2407#2e7db5977f737100538df9128b10a2f1e106fd46" dependencies = [ - "frame-support", + "frame-support 37.0.0", "frame-system", + "log", + "orml-traits 1.0.1", + "orml-xcm-support", "pallet-xcm", "parity-scale-codec", "scale-info", - "sp-std 8.0.0", - "staging-xcm", + "serde", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "staging-xcm 14.1.0", + "staging-xcm-executor", ] [[package]] @@ -6357,75 +7832,89 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "pallet-asset-conversion" +version = "19.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" +dependencies = [ + "frame-benchmarking", + "frame-support 37.0.0", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-api 34.0.0", + "sp-arithmetic 26.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", +] + [[package]] name = "pallet-asset-rate" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "16.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "parity-scale-codec", "scale-info", - "sp-core", - "sp-runtime", - "sp-std 8.0.0", + "sp-core 34.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-aura" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "36.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto", - "sp-consensus-aura", - "sp-runtime", - "sp-std 8.0.0", + "sp-application-crypto 38.0.0", + "sp-consensus-aura 0.40.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-authority-discovery" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ - "frame-support", + "frame-support 37.0.0", "frame-system", "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto", - "sp-authority-discovery", - "sp-runtime", - "sp-std 8.0.0", + "sp-application-crypto 38.0.0", + "sp-authority-discovery 34.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-authorship" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ - "frame-support", + "frame-support 37.0.0", "frame-system", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std 8.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-babe" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "pallet-authorship", @@ -6433,59 +7922,57 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto", - "sp-consensus-babe", - "sp-core", - "sp-io", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std 8.0.0", + "sp-application-crypto 38.0.0", + "sp-consensus-babe 0.40.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-session 35.0.0", + "sp-staking 34.0.0", ] [[package]] name = "pallet-bags-list" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "36.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "aquamarine", "docify", "frame-benchmarking", "frame-election-provider-support", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "pallet-balances", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", - "sp-tracing 10.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-tracing 17.0.0", ] [[package]] name = "pallet-balances" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "38.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ + "docify", "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std 8.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-beefy" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "38.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "pallet-authorship", @@ -6494,20 +7981,19 @@ dependencies = [ "scale-info", "serde", "sp-consensus-beefy", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std 8.0.0", + "sp-runtime 39.0.0", + "sp-session 35.0.0", + "sp-staking 34.0.0", ] [[package]] name = "pallet-beefy-mmr" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "38.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "array-bytes 6.2.3", + "array-bytes", "binary-merkle-tree", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "pallet-beefy", @@ -6516,48 +8002,47 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api", + "sp-api 34.0.0", "sp-consensus-beefy", - "sp-core", - "sp-io", - "sp-runtime", - "sp-state-machine", - "sp-std 8.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-state-machine 0.43.0", ] [[package]] name = "pallet-bounties" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "36.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-broker" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.16.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "bitvec", "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", + "log", "parity-scale-codec", "scale-info", - "sp-arithmetic", - "sp-core", - "sp-runtime", - "sp-std 8.0.0", + "sp-api 34.0.0", + "sp-arithmetic 26.0.0", + "sp-core 34.0.0", + "sp-runtime 39.0.0", ] [[package]] @@ -6565,91 +8050,88 @@ name = "pallet-checked-inflation" version = "0.1.0-dev" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "num-traits", "pallet-session", "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-std 8.0.0", + "sp-arithmetic 26.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-staking 34.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", ] [[package]] name = "pallet-child-bounties" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "36.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "pallet-bounties", "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-collator-selection" -version = "3.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "18.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "pallet-authorship", + "pallet-balances", "pallet-session", "parity-scale-codec", - "rand", + "rand 0.8.5", "scale-info", - "sp-runtime", - "sp-staking", - "sp-std 8.0.0", + "sp-runtime 39.0.0", + "sp-staking 34.0.0", ] [[package]] name = "pallet-collective" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-conviction-voting" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "assert_matches", "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "parity-scale-codec", "scale-info", "serde", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", ] [[package]] @@ -6657,32 +8139,32 @@ name = "pallet-dao-manager" version = "0.1.0-dev" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "invarch-primitives", "log", - "orml-tokens 0.7.0", + "orml-tokens 1.0.1", "pallet-balances", "parity-scale-codec", "scale-info", "serde", "smallvec", - "sp-api", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", - "staging-xcm", + "sp-api 34.0.0", + "sp-arithmetic 26.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "staging-xcm 14.1.0", ] [[package]] name = "pallet-dao-staking" version = "0.1.0-dev" dependencies = [ - "cumulus-primitives-core", + "cumulus-primitives-core 0.15.0", "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "num-traits", "pallet-balances", @@ -6693,346 +8175,342 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-std 8.0.0", + "sp-arithmetic 26.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-staking 34.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", +] + +[[package]] +name = "pallet-delegated-staking" +version = "4.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" +dependencies = [ + "frame-support 37.0.0", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-runtime 39.0.0", + "sp-staking 34.0.0", ] [[package]] name = "pallet-democracy" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-election-provider-multi-phase" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "36.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "pallet-election-provider-support-benchmarking", "parity-scale-codec", - "rand", + "rand 0.8.5", "scale-info", - "sp-arithmetic", - "sp-core", - "sp-io", + "sp-arithmetic 26.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", "sp-npos-elections", - "sp-runtime", - "sp-std 8.0.0", - "strum 0.24.1", + "sp-runtime 39.0.0", + "strum 0.26.3", ] [[package]] name = "pallet-election-provider-support-benchmarking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "36.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "frame-benchmarking", "frame-election-provider-support", "frame-system", "parity-scale-codec", "sp-npos-elections", - "sp-runtime", - "sp-std 8.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-elections-phragmen" -version = "5.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "38.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", + "sp-core 34.0.0", + "sp-io 38.0.0", "sp-npos-elections", - "sp-runtime", - "sp-staking", - "sp-std 8.0.0", + "sp-runtime 39.0.0", + "sp-staking 34.0.0", ] [[package]] name = "pallet-fast-unstake" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "36.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "docify", "frame-benchmarking", "frame-election-provider-support", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-std 8.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-staking 34.0.0", ] [[package]] name = "pallet-grandpa" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "pallet-authorship", "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto", - "sp-consensus-grandpa", - "sp-core", - "sp-io", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std 8.0.0", + "sp-application-crypto 38.0.0", + "sp-consensus-grandpa 21.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-session 35.0.0", + "sp-staking 34.0.0", ] [[package]] name = "pallet-identity" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "enumflags2", "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-im-online" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "36.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "pallet-authorship", "parity-scale-codec", "scale-info", - "sp-application-crypto", - "sp-core", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-std 8.0.0", + "sp-application-crypto 38.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-staking 34.0.0", ] [[package]] name = "pallet-indices" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-keyring", - "sp-runtime", - "sp-std 8.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-keyring 39.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-membership" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-message-queue" -version = "7.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "40.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "environmental", "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", - "sp-weights", + "sp-arithmetic 26.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-weights 31.0.0", ] [[package]] name = "pallet-mmr" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", + "sp-core 34.0.0", + "sp-io 38.0.0", "sp-mmr-primitives", - "sp-runtime", - "sp-std 8.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-multisig" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-nis" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "parity-scale-codec", "scale-info", - "sp-arithmetic", - "sp-core", - "sp-runtime", - "sp-std 8.0.0", + "sp-arithmetic 26.0.0", + "sp-core 34.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-nomination-pools" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "34.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "pallet-balances", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-std 8.0.0", - "sp-tracing 10.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-staking 34.0.0", + "sp-tracing 17.0.0", ] [[package]] name = "pallet-nomination-pools-benchmarking" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "35.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support", + "frame-support 37.0.0", "frame-system", "pallet-bags-list", + "pallet-delegated-staking", "pallet-nomination-pools", "pallet-staking", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-runtime-interface 17.0.0", - "sp-staking", - "sp-std 8.0.0", + "sp-runtime 39.0.0", + "sp-runtime-interface 28.0.0", + "sp-staking 34.0.0", ] [[package]] name = "pallet-nomination-pools-runtime-api" -version = "1.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "32.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "pallet-nomination-pools", "parity-scale-codec", - "sp-api", - "sp-std 8.0.0", + "sp-api 34.0.0", ] [[package]] name = "pallet-offences" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "36.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-runtime", - "sp-staking", - "sp-std 8.0.0", + "sp-runtime 39.0.0", + "sp-staking 34.0.0", ] [[package]] name = "pallet-offences-benchmarking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "pallet-babe", @@ -7044,212 +8522,218 @@ dependencies = [ "pallet-staking", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-staking", - "sp-std 8.0.0", + "sp-runtime 39.0.0", + "sp-staking 34.0.0", +] + +[[package]] +name = "pallet-parameters" +version = "0.8.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" +dependencies = [ + "docify", + "frame-benchmarking", + "frame-support 37.0.0", + "frame-system", + "parity-scale-codec", + "paste", + "scale-info", + "serde", + "sp-core 34.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-preimage" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-proxy" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-ranked-collective" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", + "impl-trait-for-tuples", "log", "parity-scale-codec", "scale-info", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", + "sp-arithmetic 26.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-recovery" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-referenda" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "assert_matches", "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", + "sp-arithmetic 26.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-root-testing" -version = "1.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "13.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "frame-support", + "frame-support 37.0.0", "frame-system", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-scheduler" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "38.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "docify", "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", - "sp-weights", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-weights 31.0.0", ] [[package]] name = "pallet-session" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ - "frame-support", + "frame-support 37.0.0", "frame-system", "impl-trait-for-tuples", "log", "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-state-machine", - "sp-std 8.0.0", - "sp-trie", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-session 35.0.0", + "sp-staking 34.0.0", + "sp-state-machine 0.43.0", + "sp-trie 37.0.0", ] [[package]] name = "pallet-session-benchmarking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "pallet-session", "pallet-staking", "parity-scale-codec", - "rand", - "sp-runtime", - "sp-session", - "sp-std 8.0.0", + "rand 0.8.5", + "sp-runtime 39.0.0", + "sp-session 35.0.0", ] [[package]] name = "pallet-society" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "parity-scale-codec", - "rand_chacha 0.2.2", + "rand_chacha 0.3.1", "scale-info", - "sp-arithmetic", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", + "sp-arithmetic 26.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-staking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "pallet-authorship", "pallet-session", "parity-scale-codec", - "rand_chacha 0.2.2", + "rand_chacha 0.3.1", "scale-info", "serde", - "sp-application-crypto", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-std 8.0.0", + "sp-application-crypto 38.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-staking 34.0.0", ] [[package]] name = "pallet-staking-reward-curve" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "12.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", @@ -7259,280 +8743,288 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "22.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "log", - "sp-arithmetic", + "sp-arithmetic 26.0.0", ] [[package]] name = "pallet-staking-runtime-api" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "22.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "parity-scale-codec", - "sp-api", - "sp-staking", + "sp-api 34.0.0", + "sp-staking 34.0.0", ] [[package]] name = "pallet-state-trie-migration" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "39.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-sudo" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "docify", "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-timestamp" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "36.0.1" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "docify", "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-inherents", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", - "sp-storage 13.0.0", - "sp-timestamp", + "sp-inherents 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-storage 21.0.0", + "sp-timestamp 34.0.0", ] [[package]] name = "pallet-tips" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "36.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "pallet-treasury", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-transaction-payment" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ - "frame-support", + "frame-support 37.0.0", "frame-system", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-transaction-payment-rpc" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "40.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "jsonrpsee", + "jsonrpsee 0.23.2", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", - "sp-api", - "sp-blockchain", - "sp-core", - "sp-rpc", - "sp-runtime", - "sp-weights", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-rpc 32.0.0", + "sp-runtime 39.0.0", + "sp-weights 31.0.0", ] [[package]] name = "pallet-transaction-payment-rpc-runtime-api" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", - "sp-api", - "sp-runtime", - "sp-weights", + "sp-api 34.0.0", + "sp-runtime 39.0.0", + "sp-weights 31.0.0", ] [[package]] name = "pallet-treasury" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "36.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "docify", "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "impl-trait-for-tuples", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-runtime", - "sp-std 8.0.0", + "sp-core 34.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-tx-pause" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "18.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "docify", "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "pallet-balances", "pallet-proxy", "pallet-utility", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std 8.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-utility" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-vesting" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std 8.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-whitelist" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "36.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "parity-scale-codec", "scale-info", - "sp-api", - "sp-runtime", - "sp-std 8.0.0", + "sp-api 34.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "pallet-xcm" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "16.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "bounded-collections", "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", - "staging-xcm", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "staging-xcm 14.1.0", "staging-xcm-builder", "staging-xcm-executor", + "xcm-runtime-apis", ] [[package]] name = "pallet-xcm-benchmarks" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "16.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", - "staging-xcm", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "staging-xcm 14.1.0", "staging-xcm-builder", "staging-xcm-executor", ] [[package]] -name = "parity-db" -version = "0.4.13" +name = "paris" +version = "1.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "592a28a24b09c9dc20ac8afaa6839abc417c720afe42c12e1e4a9d6aa2508d2e" +checksum = "8fecab3723493c7851f292cb060f3ee1c42f19b8d749345d0d7eaf3fd19aa62d" + +[[package]] +name = "parity-bip39" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e69bf016dc406eff7d53a7d3f7cf1c2e72c82b9088aac1118591e36dd2cd3e9" dependencies = [ - "blake2 0.10.6", + "bitcoin_hashes 0.13.0", + "rand 0.7.3", + "rand_core 0.5.1", + "serde", + "unicode-normalization", +] + +[[package]] +name = "parity-db" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "592a28a24b09c9dc20ac8afaa6839abc417c720afe42c12e1e4a9d6aa2508d2e" +dependencies = [ + "blake2 0.10.6", "crc32fast", "fs2", "hex", "libc", "log", "lz4", - "memmap2", + "memmap2 0.5.10", "parking_lot 0.12.3", - "rand", + "rand 0.8.5", "siphasher", "snap", "winapi", @@ -7638,19 +9130,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7924d1d0ad836f665c9065e26d016c673ece3993f30d340068b16f282afc1156" [[package]] -name = "paste" -version = "1.0.15" +name = "password-hash" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +dependencies = [ + "base64ct", + "rand_core 0.6.4", + "subtle 2.6.1", +] [[package]] -name = "pbkdf2" -version = "0.8.0" +name = "paste" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" -dependencies = [ - "crypto-mac 0.11.1", -] +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" @@ -7659,6 +9153,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest 0.10.7", + "password-hash", ] [[package]] @@ -7804,212 +9299,235 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "polkadot-approval-distribution" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "bitvec", "futures", "futures-timer", - "itertools 0.10.5", - "polkadot-node-jaeger", - "polkadot-node-metrics", - "polkadot-node-network-protocol", - "polkadot-node-primitives", + "itertools 0.11.0", + "polkadot-node-jaeger 17.0.0", + "polkadot-node-metrics 17.0.0", + "polkadot-node-network-protocol 17.0.0", + "polkadot-node-primitives 15.0.0", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", - "rand", - "tracing-gum", + "polkadot-primitives 15.0.0", + "rand 0.8.5", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-availability-bitfield-distribution" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "always-assert", "futures", "futures-timer", - "polkadot-node-network-protocol", + "polkadot-node-network-protocol 17.0.0", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", - "rand", - "tracing-gum", + "polkadot-primitives 15.0.0", + "rand 0.8.5", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-availability-distribution" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.1" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "derive_more", "fatality", "futures", "parity-scale-codec", "polkadot-erasure-coding", - "polkadot-node-network-protocol", - "polkadot-node-primitives", + "polkadot-node-network-protocol 17.0.0", + "polkadot-node-primitives 15.0.0", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", - "rand", + "polkadot-primitives 15.0.0", + "rand 0.8.5", + "sc-network 0.44.0", "schnellru", - "sp-core", - "sp-keystore", + "sp-core 34.0.0", + "sp-keystore 0.40.0", "thiserror", - "tracing-gum", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-availability-recovery" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "async-trait", "fatality", "futures", "parity-scale-codec", "polkadot-erasure-coding", - "polkadot-node-network-protocol", - "polkadot-node-primitives", + "polkadot-node-network-protocol 17.0.0", + "polkadot-node-primitives 15.0.0", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", - "rand", - "sc-network", + "polkadot-primitives 15.0.0", + "rand 0.8.5", + "sc-network 0.44.0", "schnellru", "thiserror", "tokio", - "tracing-gum", + "tracing-gum 15.0.0", +] + +[[package]] +name = "polkadot-ckb-merkle-mountain-range" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4b44320e5f7ce2c18227537a3032ae5b2c476a7e8eddba45333e1011fc31b92" +dependencies = [ + "cfg-if", + "itertools 0.10.5", ] [[package]] name = "polkadot-cli" -version = "1.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "cfg-if", "clap", "frame-benchmarking-cli", "futures", "log", - "polkadot-node-metrics", - "polkadot-node-primitives", + "polkadot-node-metrics 17.0.0", + "polkadot-node-primitives 15.0.0", "polkadot-service", - "sc-cli", - "sc-executor", - "sc-service", + "sc-cli 0.46.0", + "sc-executor 0.40.0", + "sc-service 0.45.0", "sc-storage-monitor", - "sc-sysinfo", - "sc-tracing", - "sp-core", - "sp-io", - "sp-keyring", - "sp-maybe-compressed-blob", + "sc-sysinfo 37.0.0", + "sc-tracing 37.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-keyring 39.0.0", + "sp-maybe-compressed-blob 11.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-runtime 39.0.0", "substrate-build-script-utils", "thiserror", - "try-runtime-cli", ] [[package]] name = "polkadot-collator-protocol" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "bitvec", "fatality", "futures", "futures-timer", - "polkadot-node-network-protocol", - "polkadot-node-primitives", + "polkadot-node-network-protocol 17.0.0", + "polkadot-node-primitives 15.0.0", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", - "sp-core", - "sp-keystore", - "sp-runtime", + "polkadot-primitives 15.0.0", + "sp-core 34.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.0", "thiserror", "tokio-util", - "tracing-gum", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-core-primitives" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "parity-scale-codec", + "scale-info", + "sp-core 28.0.0", + "sp-runtime 31.0.1", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", +] + +[[package]] +name = "polkadot-core-primitives" +version = "15.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "parity-scale-codec", "scale-info", - "sp-core", - "sp-runtime", - "sp-std 8.0.0", + "sp-core 34.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "polkadot-dispute-distribution" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.1" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "derive_more", "fatality", "futures", "futures-timer", - "indexmap 1.9.3", + "indexmap 2.2.6", "parity-scale-codec", "polkadot-erasure-coding", - "polkadot-node-network-protocol", - "polkadot-node-primitives", + "polkadot-node-network-protocol 17.0.0", + "polkadot-node-primitives 15.0.0", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", - "sc-network", + "polkadot-primitives 15.0.0", + "sc-network 0.44.0", "schnellru", - "sp-application-crypto", - "sp-keystore", + "sp-application-crypto 38.0.0", + "sp-keystore 0.40.0", "thiserror", - "tracing-gum", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-erasure-coding" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "15.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "parity-scale-codec", - "polkadot-node-primitives", - "polkadot-primitives", + "polkadot-node-primitives 15.0.0", + "polkadot-primitives 15.0.0", "reed-solomon-novelpoly", - "sp-core", - "sp-trie", + "sp-core 34.0.0", + "sp-trie 37.0.0", "thiserror", ] [[package]] name = "polkadot-gossip-support" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "futures", "futures-timer", - "polkadot-node-network-protocol", + "polkadot-node-network-protocol 17.0.0", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", - "rand", + "polkadot-primitives 15.0.0", + "rand 0.8.5", "rand_chacha 0.3.1", - "sc-network", - "sc-network-common", - "sp-application-crypto", - "sp-core", - "sp-keystore", - "tracing-gum", + "sc-network 0.44.0", + "sc-network-common 0.43.0", + "sp-application-crypto 38.0.0", + "sp-core 34.0.0", + "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-keystore 0.40.0", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-network-bridge" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "always-assert", "async-trait", @@ -8018,72 +9536,72 @@ dependencies = [ "futures", "parity-scale-codec", "parking_lot 0.12.3", - "polkadot-node-metrics", - "polkadot-node-network-protocol", + "polkadot-node-metrics 17.0.0", + "polkadot-node-network-protocol 17.0.0", "polkadot-node-subsystem", - "polkadot-overseer", - "polkadot-primitives", - "sc-network", - "sp-consensus", + "polkadot-overseer 17.0.0", + "polkadot-primitives 15.0.0", + "sc-network 0.44.0", + "sp-consensus 0.40.0", "thiserror", - "tracing-gum", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-node-collation-generation" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "futures", "parity-scale-codec", "polkadot-erasure-coding", - "polkadot-node-primitives", + "polkadot-node-primitives 15.0.0", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", - "sp-core", - "sp-maybe-compressed-blob", + "polkadot-primitives 15.0.0", + "sp-core 34.0.0", + "sp-maybe-compressed-blob 11.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", "thiserror", - "tracing-gum", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-node-core-approval-voting" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "bitvec", "derive_more", "futures", "futures-timer", - "itertools 0.10.5", + "itertools 0.11.0", "kvdb", "merlin", "parity-scale-codec", - "polkadot-node-jaeger", - "polkadot-node-primitives", + "polkadot-node-jaeger 17.0.0", + "polkadot-node-primitives 15.0.0", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-overseer", - "polkadot-primitives", - "rand", + "polkadot-overseer 17.0.0", + "polkadot-primitives 15.0.0", + "rand 0.8.5", "rand_chacha 0.3.1", "rand_core 0.6.4", - "sc-keystore", + "sc-keystore 33.0.0", "schnellru", "schnorrkel 0.11.4", - "sp-application-crypto", - "sp-consensus", - "sp-consensus-slots", - "sp-runtime", + "sp-application-crypto 38.0.0", + "sp-consensus 0.40.0", + "sp-consensus-slots 0.40.0", + "sp-runtime 39.0.0", "thiserror", - "tracing-gum", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-node-core-av-store" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "bitvec", "futures", @@ -8091,303 +9609,340 @@ dependencies = [ "kvdb", "parity-scale-codec", "polkadot-erasure-coding", - "polkadot-node-jaeger", - "polkadot-node-primitives", + "polkadot-node-jaeger 17.0.0", + "polkadot-node-primitives 15.0.0", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-overseer", - "polkadot-primitives", - "sp-consensus", + "polkadot-overseer 17.0.0", + "polkadot-primitives 15.0.0", + "sp-consensus 0.40.0", "thiserror", - "tracing-gum", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-node-core-backing" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "bitvec", "fatality", "futures", "polkadot-erasure-coding", - "polkadot-node-primitives", + "polkadot-node-primitives 15.0.0", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", - "polkadot-statement-table", - "sp-keystore", + "polkadot-primitives 15.0.0", + "polkadot-statement-table 15.0.0", + "schnellru", + "sp-keystore 0.40.0", "thiserror", - "tracing-gum", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-node-core-bitfield-signing" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "futures", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", - "sp-keystore", + "polkadot-primitives 15.0.0", + "sp-keystore 0.40.0", "thiserror", - "tracing-gum", + "tracing-gum 15.0.0", "wasm-timer", ] [[package]] name = "polkadot-node-core-candidate-validation" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.1.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "async-trait", "futures", "futures-timer", "parity-scale-codec", "polkadot-node-core-pvf", - "polkadot-node-metrics", - "polkadot-node-primitives", + "polkadot-node-metrics 17.0.0", + "polkadot-node-primitives 15.0.0", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-overseer", - "polkadot-parachain-primitives", - "polkadot-primitives", - "sp-maybe-compressed-blob", - "tracing-gum", + "polkadot-overseer 17.0.0", + "polkadot-parachain-primitives 14.0.0", + "polkadot-primitives 15.0.0", + "sp-application-crypto 38.0.0", + "sp-keystore 0.40.0", + "sp-maybe-compressed-blob 11.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-node-core-chain-api" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "futures", - "polkadot-node-metrics", + "polkadot-node-metrics 17.0.0", "polkadot-node-subsystem", - "polkadot-node-subsystem-types", - "sc-client-api", + "polkadot-node-subsystem-types 17.1.0", + "sc-client-api 37.0.0", "sc-consensus-babe", - "tracing-gum", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-node-core-chain-selection" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "futures", "futures-timer", "kvdb", "parity-scale-codec", - "polkadot-node-primitives", + "polkadot-node-primitives 15.0.0", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-primitives 15.0.0", "thiserror", - "tracing-gum", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "fatality", "futures", "kvdb", "parity-scale-codec", - "polkadot-node-primitives", + "polkadot-node-primitives 15.0.0", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", - "sc-keystore", + "polkadot-primitives 15.0.0", + "sc-keystore 33.0.0", "schnellru", "thiserror", - "tracing-gum", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-node-core-parachains-inherent" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "async-trait", "futures", "futures-timer", "polkadot-node-subsystem", - "polkadot-overseer", - "polkadot-primitives", - "sp-blockchain", - "sp-inherents", + "polkadot-overseer 17.0.0", + "polkadot-primitives 15.0.0", + "sp-blockchain 37.0.1", + "sp-inherents 34.0.0", "thiserror", - "tracing-gum", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-node-core-prospective-parachains" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "16.1.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "bitvec", "fatality", "futures", - "parity-scale-codec", - "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-primitives 15.0.0", "thiserror", - "tracing-gum", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-node-core-provisioner" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "bitvec", "fatality", "futures", "futures-timer", - "polkadot-node-primitives", + "polkadot-node-primitives 15.0.0", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", + "polkadot-primitives 15.0.0", + "schnellru", "thiserror", - "tracing-gum", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-node-core-pvf" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "always-assert", - "array-bytes 6.2.3", + "array-bytes", "blake3", "cfg-if", "futures", "futures-timer", - "is_executable", - "libc", "parity-scale-codec", "pin-project", - "polkadot-core-primitives", + "polkadot-core-primitives 15.0.0", "polkadot-node-core-pvf-common", - "polkadot-node-metrics", - "polkadot-node-primitives", + "polkadot-node-metrics 17.0.0", + "polkadot-node-primitives 15.0.0", "polkadot-node-subsystem", - "polkadot-parachain-primitives", - "polkadot-primitives", - "rand", + "polkadot-parachain-primitives 14.0.0", + "polkadot-primitives 15.0.0", + "rand 0.8.5", "slotmap", - "sp-core", - "sp-maybe-compressed-blob", - "sp-wasm-interface 14.0.0", + "sp-core 34.0.0", "tempfile", "thiserror", "tokio", - "tracing-gum", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-node-core-pvf-checker" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "futures", - "polkadot-node-primitives", + "polkadot-node-primitives 15.0.0", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-overseer", - "polkadot-primitives", - "sp-keystore", + "polkadot-overseer 17.0.0", + "polkadot-primitives 15.0.0", + "sp-keystore 0.40.0", "thiserror", - "tracing-gum", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-node-core-pvf-common" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "15.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "cfg-if", "cpu-time", "futures", "landlock", "libc", + "nix 0.28.0", "parity-scale-codec", - "polkadot-parachain-primitives", - "polkadot-primitives", - "sc-executor", - "sc-executor-common", - "sc-executor-wasmtime", + "polkadot-parachain-primitives 14.0.0", + "polkadot-primitives 15.0.0", + "sc-executor 0.40.0", + "sc-executor-common 0.35.0", + "sc-executor-wasmtime 0.35.0", "seccompiler", - "sp-core", - "sp-externalities 0.19.0", - "sp-io", - "sp-tracing 10.0.0", + "sp-core 34.0.0", + "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-externalities 0.29.0", + "sp-io 38.0.0", + "sp-tracing 17.0.0", "thiserror", - "tracing-gum", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-node-core-runtime-api" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "futures", - "polkadot-node-metrics", + "polkadot-node-metrics 17.0.0", "polkadot-node-subsystem", - "polkadot-node-subsystem-types", - "polkadot-primitives", + "polkadot-node-subsystem-types 17.1.0", + "polkadot-primitives 15.0.0", "schnellru", - "sp-consensus-babe", - "tracing-gum", + "sp-consensus-babe 0.40.0", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-node-jaeger" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "lazy_static", + "log", + "mick-jaeger", + "parity-scale-codec", + "parking_lot 0.12.3", + "polkadot-node-primitives 7.0.0", + "polkadot-primitives 7.0.0", + "sc-network 0.34.0", + "sc-network-types 0.10.0", + "sp-core 28.0.0", + "thiserror", + "tokio", +] + +[[package]] +name = "polkadot-node-jaeger" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "lazy_static", "log", "mick-jaeger", "parity-scale-codec", "parking_lot 0.12.3", - "polkadot-node-primitives", - "polkadot-primitives", - "sc-network", - "sp-core", + "polkadot-node-primitives 15.0.0", + "polkadot-primitives 15.0.0", + "sc-network 0.44.0", + "sc-network-types 0.12.1", + "sp-core 34.0.0", "thiserror", "tokio", ] [[package]] name = "polkadot-node-metrics" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "bs58 0.5.1", + "futures", + "futures-timer", + "log", + "parity-scale-codec", + "polkadot-primitives 7.0.0", + "prioritized-metered-channel", + "sc-cli 0.36.0", + "sc-service 0.35.0", + "sc-tracing 28.0.0", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "tracing-gum 7.0.0", +] + +[[package]] +name = "polkadot-node-metrics" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "bs58 0.5.1", "futures", "futures-timer", "log", "parity-scale-codec", - "polkadot-primitives", - "prioritized-metered-channel 0.5.1", - "sc-cli", - "sc-service", - "sc-tracing", - "substrate-prometheus-endpoint", - "tracing-gum", + "polkadot-primitives 15.0.0", + "prioritized-metered-channel", + "sc-cli 0.46.0", + "sc-service 0.45.0", + "sc-tracing 37.0.0", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-node-network-protocol" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "async-channel 1.9.0", "async-trait", @@ -8397,189 +9952,337 @@ dependencies = [ "futures", "hex", "parity-scale-codec", - "polkadot-node-jaeger", - "polkadot-node-primitives", - "polkadot-primitives", - "rand", - "sc-authority-discovery", - "sc-network", - "strum 0.24.1", + "polkadot-node-jaeger 7.0.0", + "polkadot-node-primitives 7.0.0", + "polkadot-primitives 7.0.0", + "rand 0.8.5", + "sc-authority-discovery 0.34.0", + "sc-network 0.34.0", + "sc-network-types 0.10.0", + "sp-runtime 31.0.1", + "strum 0.26.3", + "thiserror", + "tracing-gum 7.0.0", +] + +[[package]] +name = "polkadot-node-network-protocol" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" +dependencies = [ + "async-channel 1.9.0", + "async-trait", + "bitvec", + "derive_more", + "fatality", + "futures", + "hex", + "parity-scale-codec", + "polkadot-node-jaeger 17.0.0", + "polkadot-node-primitives 15.0.0", + "polkadot-primitives 15.0.0", + "rand 0.8.5", + "sc-authority-discovery 0.44.0", + "sc-network 0.44.0", + "sc-network-types 0.12.1", + "sp-runtime 39.0.0", + "strum 0.26.3", "thiserror", - "tracing-gum", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-node-primitives" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "bitvec", + "bounded-vec", + "futures", + "parity-scale-codec", + "polkadot-parachain-primitives 6.0.0", + "polkadot-primitives 7.0.0", + "schnorrkel 0.11.4", + "serde", + "sp-application-crypto 30.0.0", + "sp-consensus-babe 0.32.0", + "sp-core 28.0.0", + "sp-keystore 0.34.0", + "sp-maybe-compressed-blob 11.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-runtime 31.0.1", + "thiserror", + "zstd 0.12.4", +] + +[[package]] +name = "polkadot-node-primitives" +version = "15.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "bitvec", "bounded-vec", "futures", "parity-scale-codec", - "polkadot-parachain-primitives", - "polkadot-primitives", + "polkadot-parachain-primitives 14.0.0", + "polkadot-primitives 15.0.0", "schnorrkel 0.11.4", "serde", - "sp-application-crypto", - "sp-consensus-babe", - "sp-core", - "sp-keystore", - "sp-maybe-compressed-blob", - "sp-runtime", + "sp-application-crypto 38.0.0", + "sp-consensus-babe 0.40.0", + "sp-core 34.0.0", + "sp-keystore 0.40.0", + "sp-maybe-compressed-blob 11.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-runtime 39.0.0", "thiserror", "zstd 0.12.4", ] [[package]] name = "polkadot-node-subsystem" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "polkadot-node-jaeger", - "polkadot-node-subsystem-types", - "polkadot-overseer", + "polkadot-node-jaeger 17.0.0", + "polkadot-node-subsystem-types 17.1.0", + "polkadot-overseer 17.0.0", ] [[package]] name = "polkadot-node-subsystem-types" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "async-trait", + "bitvec", + "derive_more", + "futures", + "orchestra 0.3.6", + "polkadot-node-jaeger 7.0.0", + "polkadot-node-network-protocol 7.0.0", + "polkadot-node-primitives 7.0.0", + "polkadot-primitives 7.0.0", + "polkadot-statement-table 7.0.0", + "sc-client-api 28.0.0", + "sc-network 0.34.0", + "sc-network-types 0.10.0", + "sc-transaction-pool-api 28.0.0", + "smallvec", + "sp-api 26.0.0", + "sp-authority-discovery 26.0.0", + "sp-blockchain 28.0.0", + "sp-consensus-babe 0.32.0", + "sp-runtime 31.0.1", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "thiserror", +] + +[[package]] +name = "polkadot-node-subsystem-types" +version = "17.1.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "async-trait", "bitvec", "derive_more", + "fatality", "futures", - "orchestra", - "polkadot-node-jaeger", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-primitives", - "polkadot-statement-table", - "sc-client-api", - "sc-network", - "sc-transaction-pool-api", + "orchestra 0.4.0", + "polkadot-node-jaeger 17.0.0", + "polkadot-node-network-protocol 17.0.0", + "polkadot-node-primitives 15.0.0", + "polkadot-primitives 15.0.0", + "polkadot-statement-table 15.0.0", + "sc-client-api 37.0.0", + "sc-network 0.44.0", + "sc-network-types 0.12.1", + "sc-transaction-pool-api 37.0.0", "smallvec", - "sp-api", - "sp-authority-discovery", - "sp-blockchain", - "sp-consensus-babe", - "sp-runtime", - "substrate-prometheus-endpoint", + "sp-api 34.0.0", + "sp-authority-discovery 34.0.0", + "sp-blockchain 37.0.1", + "sp-consensus-babe 0.40.0", + "sp-runtime 39.0.0", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", "thiserror", ] [[package]] name = "polkadot-node-subsystem-util" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.1.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "async-trait", "derive_more", "fatality", "futures", "futures-channel", - "itertools 0.10.5", + "itertools 0.11.0", "kvdb", "parity-db", "parity-scale-codec", "parking_lot 0.12.3", "pin-project", - "polkadot-node-jaeger", - "polkadot-node-metrics", - "polkadot-node-network-protocol", - "polkadot-node-primitives", + "polkadot-erasure-coding", + "polkadot-node-jaeger 17.0.0", + "polkadot-node-metrics 17.0.0", + "polkadot-node-network-protocol 17.0.0", + "polkadot-node-primitives 15.0.0", "polkadot-node-subsystem", - "polkadot-node-subsystem-types", - "polkadot-overseer", - "polkadot-primitives", - "prioritized-metered-channel 0.5.1", - "rand", - "sc-client-api", + "polkadot-node-subsystem-types 17.1.0", + "polkadot-overseer 17.0.0", + "polkadot-primitives 15.0.0", + "prioritized-metered-channel", + "rand 0.8.5", + "sc-client-api 37.0.0", "schnellru", - "sp-application-crypto", - "sp-core", - "sp-keystore", + "sp-application-crypto 38.0.0", + "sp-core 34.0.0", + "sp-keystore 0.40.0", "thiserror", - "tracing-gum", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-overseer" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "async-trait", + "futures", + "futures-timer", + "orchestra 0.3.6", + "parking_lot 0.12.3", + "polkadot-node-metrics 7.0.0", + "polkadot-node-network-protocol 7.0.0", + "polkadot-node-primitives 7.0.0", + "polkadot-node-subsystem-types 7.0.0", + "polkadot-primitives 7.0.0", + "sc-client-api 28.0.0", + "sp-api 26.0.0", + "sp-core 28.0.0", + "tikv-jemalloc-ctl", + "tracing-gum 7.0.0", +] + +[[package]] +name = "polkadot-overseer" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "async-trait", "futures", "futures-timer", - "orchestra", + "orchestra 0.4.0", "parking_lot 0.12.3", - "polkadot-node-metrics", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-node-subsystem-types", - "polkadot-primitives", - "sc-client-api", - "sp-api", - "sp-core", + "polkadot-node-metrics 17.0.0", + "polkadot-node-network-protocol 17.0.0", + "polkadot-node-primitives 15.0.0", + "polkadot-node-subsystem-types 17.1.0", + "polkadot-primitives 15.0.0", + "sc-client-api 37.0.0", + "sp-api 34.0.0", + "sp-core 34.0.0", "tikv-jemalloc-ctl", - "tracing-gum", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-parachain-primitives" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "6.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "bounded-collections", + "derive_more", + "parity-scale-codec", + "polkadot-core-primitives 7.0.0", + "scale-info", + "serde", + "sp-core 28.0.0", + "sp-runtime 31.0.1", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-weights 27.0.0", +] + +[[package]] +name = "polkadot-parachain-primitives" +version = "14.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "bounded-collections", "derive_more", "parity-scale-codec", - "polkadot-core-primitives", + "polkadot-core-primitives 15.0.0", "scale-info", "serde", - "sp-core", - "sp-runtime", - "sp-std 8.0.0", - "sp-weights", + "sp-core 34.0.0", + "sp-runtime 39.0.0", + "sp-weights 31.0.0", ] [[package]] name = "polkadot-primitives" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "bitvec", + "hex-literal", + "log", + "parity-scale-codec", + "polkadot-core-primitives 7.0.0", + "polkadot-parachain-primitives 6.0.0", + "scale-info", + "serde", + "sp-api 26.0.0", + "sp-application-crypto 30.0.0", + "sp-arithmetic 23.0.0", + "sp-authority-discovery 26.0.0", + "sp-consensus-slots 0.32.0", + "sp-core 28.0.0", + "sp-inherents 26.0.0", + "sp-io 30.0.0", + "sp-keystore 0.34.0", + "sp-runtime 31.0.1", + "sp-staking 26.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", +] + +[[package]] +name = "polkadot-primitives" +version = "15.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "bitvec", - "hex-literal 0.4.1", + "hex-literal", + "log", "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain-primitives", + "polkadot-core-primitives 15.0.0", + "polkadot-parachain-primitives 14.0.0", "scale-info", "serde", - "sp-api", - "sp-application-crypto", - "sp-arithmetic", - "sp-authority-discovery", - "sp-consensus-slots", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keystore", - "sp-runtime", - "sp-staking", - "sp-std 8.0.0", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-arithmetic 26.0.0", + "sp-authority-discovery 34.0.0", + "sp-consensus-slots 0.40.0", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-io 38.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.0", + "sp-staking 34.0.0", ] [[package]] name = "polkadot-rpc" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "jsonrpsee", + "jsonrpsee 0.23.2", "mmr-rpc", "pallet-transaction-payment-rpc", - "polkadot-primitives", - "sc-chain-spec", - "sc-client-api", + "polkadot-primitives 15.0.0", + "sc-chain-spec 37.0.0", + "sc-client-api 37.0.0", "sc-consensus-babe", "sc-consensus-babe-rpc", "sc-consensus-beefy", @@ -8587,30 +10290,32 @@ dependencies = [ "sc-consensus-epochs", "sc-consensus-grandpa", "sc-consensus-grandpa-rpc", - "sc-rpc", - "sc-rpc-spec-v2", + "sc-rpc 39.0.0", + "sc-rpc-spec-v2 0.44.0", "sc-sync-state-rpc", - "sc-transaction-pool-api", - "sp-api", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-keystore", - "sp-runtime", + "sc-transaction-pool-api 37.0.0", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-block-builder 34.0.0", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-consensus-babe 0.40.0", + "sp-consensus-beefy", + "sp-keystore 0.40.0", + "sp-runtime 39.0.0", "substrate-frame-rpc-system", "substrate-state-trie-migration-rpc", ] [[package]] name = "polkadot-runtime-common" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "16.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "bitvec", "frame-benchmarking", "frame-election-provider-support", - "frame-support", + "frame-support 37.0.0", "frame-system", "impl-trait-for-tuples", "libsecp256k1", @@ -8630,25 +10335,23 @@ dependencies = [ "pallet-transaction-payment", "pallet-treasury", "pallet-vesting", - "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-primitives", + "polkadot-primitives 15.0.0", "polkadot-runtime-parachains", "rustc-hex", "scale-info", "serde", "serde_derive", "slot-range-helper", - "sp-api", - "sp-core", - "sp-inherents", - "sp-io", + "sp-api 34.0.0", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-io 38.0.0", "sp-npos-elections", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std 8.0.0", - "staging-xcm", + "sp-runtime 39.0.0", + "sp-session 35.0.0", + "sp-staking 34.0.0", + "staging-xcm 14.1.0", "staging-xcm-builder", "staging-xcm-executor", "static_assertions", @@ -8656,27 +10359,26 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "16.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "bs58 0.5.1", "frame-benchmarking", "parity-scale-codec", - "polkadot-primitives", - "sp-std 8.0.0", - "sp-tracing 10.0.0", + "polkadot-primitives 15.0.0", + "sp-tracing 17.0.0", ] [[package]] name = "polkadot-runtime-parachains" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "16.0.2" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "bitflags 1.3.2", "bitvec", "derive_more", "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "frame-system", "impl-trait-for-tuples", "log", @@ -8691,51 +10393,50 @@ dependencies = [ "pallet-timestamp", "pallet-vesting", "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain-primitives", - "polkadot-primitives", + "polkadot-core-primitives 15.0.0", + "polkadot-parachain-primitives 14.0.0", + "polkadot-primitives 15.0.0", "polkadot-runtime-metrics", - "rand", + "rand 0.8.5", "rand_chacha 0.3.1", - "rustc-hex", "scale-info", "serde", - "sp-api", - "sp-application-crypto", - "sp-arithmetic", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keystore", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std 8.0.0", - "staging-xcm", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-arithmetic 26.0.0", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-io 38.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.0", + "sp-session 35.0.0", + "sp-staking 34.0.0", + "staging-xcm 14.1.0", "staging-xcm-executor", "static_assertions", ] [[package]] name = "polkadot-service" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.1" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "async-trait", + "bitvec", "frame-benchmarking", "frame-benchmarking-cli", - "frame-support", + "frame-metadata-hash-extension", + "frame-support 37.0.0", "frame-system", "frame-system-rpc-runtime-api", "futures", - "hex-literal 0.4.1", + "hex-literal", "is_executable", "kvdb", "kvdb-rocksdb", "log", "mmr-gadget", "pallet-babe", - "pallet-im-online", "pallet-staking", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", @@ -8747,7 +10448,7 @@ dependencies = [ "polkadot-availability-distribution", "polkadot-availability-recovery", "polkadot-collator-protocol", - "polkadot-core-primitives", + "polkadot-core-primitives 15.0.0", "polkadot-dispute-distribution", "polkadot-gossip-support", "polkadot-network-bridge", @@ -8766,126 +10467,166 @@ dependencies = [ "polkadot-node-core-pvf", "polkadot-node-core-pvf-checker", "polkadot-node-core-runtime-api", - "polkadot-node-network-protocol", - "polkadot-node-primitives", + "polkadot-node-network-protocol 17.0.0", + "polkadot-node-primitives 15.0.0", "polkadot-node-subsystem", - "polkadot-node-subsystem-types", + "polkadot-node-subsystem-types 17.1.0", "polkadot-node-subsystem-util", - "polkadot-overseer", - "polkadot-parachain-primitives", - "polkadot-primitives", + "polkadot-overseer 17.0.0", + "polkadot-parachain-primitives 14.0.0", + "polkadot-primitives 15.0.0", "polkadot-rpc", "polkadot-runtime-parachains", "polkadot-statement-distribution", "rococo-runtime", - "sc-authority-discovery", + "rococo-runtime-constants", + "sc-authority-discovery 0.44.0", "sc-basic-authorship", - "sc-block-builder", - "sc-chain-spec", - "sc-client-api", - "sc-client-db", - "sc-consensus", + "sc-block-builder 0.42.0", + "sc-chain-spec 37.0.0", + "sc-client-api 37.0.0", + "sc-client-db 0.44.0", + "sc-consensus 0.43.0", "sc-consensus-babe", "sc-consensus-beefy", "sc-consensus-grandpa", "sc-consensus-slots", - "sc-executor", - "sc-keystore", - "sc-network", - "sc-network-common", - "sc-network-sync", + "sc-executor 0.40.0", + "sc-keystore 33.0.0", + "sc-network 0.44.0", + "sc-network-common 0.43.0", + "sc-network-sync 0.43.0", "sc-offchain", - "sc-service", + "sc-service 0.45.0", "sc-sync-state-rpc", - "sc-sysinfo", - "sc-telemetry", - "sc-transaction-pool", - "sc-transaction-pool-api", + "sc-sysinfo 37.0.0", + "sc-telemetry 24.0.0", + "sc-transaction-pool 37.0.0", + "sc-transaction-pool-api 37.0.0", "schnellru", "serde", "serde_json", - "sp-api", - "sp-authority-discovery", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", + "sp-api 34.0.0", + "sp-authority-discovery 34.0.0", + "sp-block-builder 34.0.0", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-consensus-babe 0.40.0", "sp-consensus-beefy", - "sp-consensus-grandpa", - "sp-core", - "sp-inherents", - "sp-io", - "sp-keyring", - "sp-keystore", + "sp-consensus-grandpa 21.0.0", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-io 38.0.0", + "sp-keyring 39.0.0", + "sp-keystore 0.40.0", "sp-mmr-primitives", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-state-machine", - "sp-storage 13.0.0", - "sp-timestamp", - "sp-transaction-pool", - "sp-version", - "sp-weights", - "substrate-prometheus-endpoint", - "thiserror", - "tracing-gum", + "sp-offchain 34.0.0", + "sp-runtime 39.0.0", + "sp-session 35.0.0", + "sp-state-machine 0.43.0", + "sp-storage 21.0.0", + "sp-timestamp 34.0.0", + "sp-transaction-pool 34.0.0", + "sp-version 37.0.0", + "sp-weights 31.0.0", + "staging-xcm 14.1.0", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "thiserror", + "tracing-gum 15.0.0", "westend-runtime", + "xcm-runtime-apis", ] [[package]] name = "polkadot-statement-distribution" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "arrayvec 0.7.4", "bitvec", "fatality", "futures", "futures-timer", - "indexmap 1.9.3", + "indexmap 2.2.6", "parity-scale-codec", - "polkadot-node-network-protocol", - "polkadot-node-primitives", + "polkadot-node-network-protocol 17.0.0", + "polkadot-node-primitives 15.0.0", "polkadot-node-subsystem", "polkadot-node-subsystem-util", - "polkadot-primitives", - "sp-keystore", - "sp-staking", + "polkadot-primitives 15.0.0", + "sp-keystore 0.40.0", + "sp-staking 34.0.0", "thiserror", - "tracing-gum", + "tracing-gum 15.0.0", ] [[package]] name = "polkadot-statement-table" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "parity-scale-codec", - "polkadot-primitives", - "sp-core", + "polkadot-primitives 7.0.0", + "sp-core 28.0.0", + "tracing-gum 7.0.0", ] [[package]] -name = "polkavm-common" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d9428a5cfcc85c5d7b9fc4b6a18c4b802d0173d768182a51cc7751640f08b92" +name = "polkadot-statement-table" +version = "15.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" +dependencies = [ + "parity-scale-codec", + "polkadot-primitives 15.0.0", + "sp-core 34.0.0", + "tracing-gum 15.0.0", +] [[package]] -name = "polkavm-derive" -version = "0.9.1" +name = "polkavm" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8c4bea6f3e11cd89bb18bcdddac10bd9a24015399bd1c485ad68a985a19606" +checksum = "8a3693e5efdb2bf74e449cd25fd777a28bd7ed87e41f5d5da75eb31b4de48b94" dependencies = [ - "polkavm-derive-impl-macro", + "libc", + "log", + "polkavm-assembler", + "polkavm-common", + "polkavm-linux-raw", ] [[package]] -name = "polkavm-derive-impl" +name = "polkavm-assembler" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c4fdfc49717fb9a196e74a5d28e0bc764eb394a2c803eb11133a31ac996c60c" +checksum = "1fa96d6d868243acc12de813dd48e756cbadcc8e13964c70d272753266deadc1" +dependencies = [ + "log", +] + +[[package]] +name = "polkavm-common" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d9428a5cfcc85c5d7b9fc4b6a18c4b802d0173d768182a51cc7751640f08b92" +dependencies = [ + "log", +] + +[[package]] +name = "polkavm-derive" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8c4bea6f3e11cd89bb18bcdddac10bd9a24015399bd1c485ad68a985a19606" +dependencies = [ + "polkavm-derive-impl-macro", +] + +[[package]] +name = "polkavm-derive-impl" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c4fdfc49717fb9a196e74a5d28e0bc764eb394a2c803eb11133a31ac996c60c" dependencies = [ "polkavm-common", "proc-macro2", @@ -8903,6 +10644,27 @@ dependencies = [ "syn 2.0.68", ] +[[package]] +name = "polkavm-linker" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c7be503e60cf56c0eb785f90aaba4b583b36bff00e93997d93fef97f9553c39" +dependencies = [ + "gimli 0.28.1", + "hashbrown 0.14.5", + "log", + "object 0.32.2", + "polkavm-common", + "regalloc2 0.9.3", + "rustc-demangle", +] + +[[package]] +name = "polkavm-linux-raw" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26e85d3456948e650dff0cfc85603915847faf893ed1e66b020bb82ef4557120" + [[package]] name = "polling" version = "2.8.0" @@ -8989,6 +10751,16 @@ dependencies = [ "regex", ] +[[package]] +name = "predicates" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" +dependencies = [ + "anstyle", + "predicates-core", +] + [[package]] name = "predicates-core" version = "1.0.6" @@ -9038,22 +10810,6 @@ dependencies = [ "uint", ] -[[package]] -name = "prioritized-metered-channel" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e99f0c89bd88f393aab44a4ab949351f7bc7e7e1179d11ecbfe50cbe4c47e342" -dependencies = [ - "coarsetime", - "crossbeam-queue", - "derive_more", - "futures", - "futures-timer", - "nanorand", - "thiserror", - "tracing", -] - [[package]] name = "prioritized-metered-channel" version = "0.6.1" @@ -9122,6 +10878,17 @@ dependencies = [ "version_check", ] +[[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.68", +] + [[package]] name = "proc-macro-warning" version = "1.0.2" @@ -9168,6 +10935,18 @@ dependencies = [ "prometheus-client-derive-encode", ] +[[package]] +name = "prometheus-client" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c99afa9a01501019ac3a14d71d9f94050346f55ca471ce90c799a15c58f61e2" +dependencies = [ + "dtoa", + "itoa", + "parking_lot 0.12.3", + "prometheus-client-derive-encode", +] + [[package]] name = "prometheus-client-derive-encode" version = "0.4.2" @@ -9186,7 +10965,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.11.9", +] + +[[package]] +name = "prost" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" +dependencies = [ + "bytes", + "prost-derive 0.12.6", ] [[package]] @@ -9203,14 +10992,35 @@ dependencies = [ "multimap", "petgraph", "prettyplease 0.1.25", - "prost", - "prost-types", + "prost 0.11.9", + "prost-types 0.11.9", "regex", "syn 1.0.109", "tempfile", "which", ] +[[package]] +name = "prost-build" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" +dependencies = [ + "bytes", + "heck 0.4.1", + "itertools 0.11.0", + "log", + "multimap", + "once_cell", + "petgraph", + "prettyplease 0.2.20", + "prost 0.12.6", + "prost-types 0.12.6", + "regex", + "syn 2.0.68", + "tempfile", +] + [[package]] name = "prost-derive" version = "0.11.9" @@ -9224,13 +11034,35 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "prost-derive" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +dependencies = [ + "anyhow", + "itertools 0.11.0", + "proc-macro2", + "quote", + "syn 2.0.68", +] + [[package]] name = "prost-types" version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ - "prost", + "prost 0.11.9", +] + +[[package]] +name = "prost-types" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +dependencies = [ + "prost 0.12.6", ] [[package]] @@ -9242,6 +11074,21 @@ dependencies = [ "cc", ] +[[package]] +name = "quanta" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" +dependencies = [ + "crossbeam-utils", + "libc", + "once_cell", + "raw-cpuid", + "wasi 0.11.0+wasi-snapshot-preview1", + "web-sys", + "winapi", +] + [[package]] name = "quick-error" version = "1.2.3" @@ -9267,7 +11114,20 @@ dependencies = [ "bytes", "quick-protobuf", "thiserror", - "unsigned-varint", + "unsigned-varint 0.7.2", +] + +[[package]] +name = "quick-protobuf-codec" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ededb1cd78531627244d51dd0c7139fbe736c7d57af0092a76f0ffb2f56e98" +dependencies = [ + "asynchronous-codec", + "bytes", + "quick-protobuf", + "thiserror", + "unsigned-varint 0.7.2", ] [[package]] @@ -9281,6 +11141,42 @@ dependencies = [ "pin-project-lite 0.1.12", ] +[[package]] +name = "quinn" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e8b432585672228923edbbf64b8b12c14e1112f62e88737655b4a083dbcd78e" +dependencies = [ + "bytes", + "pin-project-lite 0.2.14", + "quinn-proto 0.9.6", + "quinn-udp 0.3.2", + "rustc-hash", + "rustls 0.20.9", + "thiserror", + "tokio", + "tracing", + "webpki", +] + +[[package]] +name = "quinn" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" +dependencies = [ + "bytes", + "futures-io", + "pin-project-lite 0.2.14", + "quinn-proto 0.10.6", + "quinn-udp 0.4.1", + "rustc-hash", + "rustls 0.21.12", + "thiserror", + "tokio", + "tracing", +] + [[package]] name = "quinn-proto" version = "0.9.6" @@ -9288,7 +11184,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863" dependencies = [ "bytes", - "rand", + "rand 0.8.5", "ring 0.16.20", "rustc-hash", "rustls 0.20.9", @@ -9299,6 +11195,49 @@ dependencies = [ "webpki", ] +[[package]] +name = "quinn-proto" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" +dependencies = [ + "bytes", + "rand 0.8.5", + "ring 0.16.20", + "rustc-hash", + "rustls 0.21.12", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" +dependencies = [ + "libc", + "quinn-proto 0.9.6", + "socket2 0.4.10", + "tracing", + "windows-sys 0.42.0", +] + +[[package]] +name = "quinn-udp" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" +dependencies = [ + "bytes", + "libc", + "socket2 0.5.7", + "tracing", + "windows-sys 0.48.0", +] + [[package]] name = "quote" version = "1.0.36" @@ -9314,6 +11253,19 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", +] + [[package]] name = "rand" version = "0.8.5" @@ -9370,7 +11322,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" dependencies = [ "num-traits", - "rand", + "rand 0.8.5", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", ] [[package]] @@ -9382,6 +11343,15 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "raw-cpuid" +version = "11.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d" +dependencies = [ + "bitflags 2.5.0", +] + [[package]] name = "rawpointer" version = "0.2.1" @@ -9460,13 +11430,12 @@ dependencies = [ [[package]] name = "reed-solomon-novelpoly" -version = "1.0.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58130877ca403ab42c864fbac74bb319a0746c07a634a92a5cfc7f54af272582" +checksum = "87413ebb313323d431e85d0afc5a68222aaed972843537cbfe5f061cf1b4bcab" dependencies = [ "derive_more", "fs-err", - "itertools 0.11.0", "static_init", "thiserror", ] @@ -9503,6 +11472,19 @@ dependencies = [ "smallvec", ] +[[package]] +name = "regalloc2" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" +dependencies = [ + "hashbrown 0.13.2", + "log", + "rustc-hash", + "slice-group-by", + "smallvec", +] + [[package]] name = "regex" version = "1.10.5" @@ -9564,7 +11546,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ "hmac 0.12.1", - "subtle 2.4.1", + "subtle 2.6.1", ] [[package]] @@ -9635,19 +11617,20 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "binary-merkle-tree", + "bitvec", "frame-benchmarking", "frame-executive", "frame-metadata-hash-extension", - "frame-support", + "frame-support 37.0.0", "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", - "frame-try-runtime", - "hex-literal 0.4.1", + "frame-try-runtime 0.43.0", + "hex-literal", "log", "pallet-asset-rate", "pallet-authority-discovery", @@ -9664,7 +11647,6 @@ dependencies = [ "pallet-elections-phragmen", "pallet-grandpa", "pallet-identity", - "pallet-im-online", "pallet-indices", "pallet-membership", "pallet-message-queue", @@ -9672,6 +11654,7 @@ dependencies = [ "pallet-multisig", "pallet-nis", "pallet-offences", + "pallet-parameters", "pallet-preimage", "pallet-proxy", "pallet-ranked-collective", @@ -9695,57 +11678,65 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-parachain-primitives", - "polkadot-primitives", + "polkadot-parachain-primitives 14.0.0", + "polkadot-primitives 15.0.0", "polkadot-runtime-common", "polkadot-runtime-parachains", "rococo-runtime-constants", "scale-info", "serde", "serde_derive", + "serde_json", "smallvec", - "sp-api", - "sp-arithmetic", - "sp-authority-discovery", - "sp-block-builder", - "sp-consensus-babe", + "sp-api 34.0.0", + "sp-arithmetic 26.0.0", + "sp-authority-discovery 34.0.0", + "sp-block-builder 34.0.0", + "sp-consensus-babe 0.40.0", "sp-consensus-beefy", - "sp-core", - "sp-genesis-builder", - "sp-inherents", - "sp-io", + "sp-consensus-grandpa 21.0.0", + "sp-core 34.0.0", + "sp-genesis-builder 0.15.0", + "sp-inherents 34.0.0", + "sp-io 38.0.0", "sp-mmr-primitives", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std 8.0.0", - "sp-storage 13.0.0", - "sp-transaction-pool", - "sp-version", - "staging-xcm", + "sp-offchain 34.0.0", + "sp-runtime 39.0.0", + "sp-session 35.0.0", + "sp-staking 34.0.0", + "sp-storage 21.0.0", + "sp-transaction-pool 34.0.0", + "sp-version 37.0.0", + "staging-xcm 14.1.0", "staging-xcm-builder", "staging-xcm-executor", "static_assertions", "substrate-wasm-builder", + "xcm-runtime-apis", ] [[package]] name = "rococo-runtime-constants" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "16.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "frame-support", - "polkadot-primitives", + "frame-support 37.0.0", + "polkadot-primitives 15.0.0", "polkadot-runtime-common", "smallvec", - "sp-core", - "sp-runtime", - "sp-weights", - "staging-xcm", + "sp-core 34.0.0", + "sp-runtime 39.0.0", + "sp-weights 31.0.0", + "staging-xcm 14.1.0", "staging-xcm-builder", ] +[[package]] +name = "route-recognizer" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" + [[package]] name = "rpassword" version = "7.3.1" @@ -9767,7 +11758,7 @@ dependencies = [ "log", "netlink-packet-route", "netlink-proto", - "nix", + "nix 0.24.3", "thiserror", "tokio", ] @@ -9879,10 +11870,39 @@ checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring 0.17.8", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring 0.17.8", + "rustls-pki-types", + "rustls-webpki 0.102.8", + "subtle 2.6.1", + "zeroize", +] + +[[package]] +name = "rustls" +version = "0.23.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +dependencies = [ + "log", + "once_cell", + "ring 0.17.8", + "rustls-pki-types", + "rustls-webpki 0.102.8", + "subtle 2.6.1", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -9890,7 +11910,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 1.0.4", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.1.3", + "rustls-pki-types", "schannel", "security-framework", ] @@ -9904,6 +11937,49 @@ dependencies = [ "base64 0.21.7", ] +[[package]] +name = "rustls-pemfile" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + +[[package]] +name = "rustls-platform-verifier" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490" +dependencies = [ + "core-foundation", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls 0.23.13", + "rustls-native-certs 0.7.3", + "rustls-platform-verifier-android", + "rustls-webpki 0.102.8", + "security-framework", + "security-framework-sys", + "webpki-roots 0.26.5", + "winapi", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -9914,6 +11990,17 @@ dependencies = [ "untrusted 0.9.0", ] +[[package]] +name = "rustls-webpki" +version = "0.102.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +dependencies = [ + "ring 0.17.8", + "rustls-pki-types", + "untrusted 0.9.0", +] + [[package]] name = "rustversion" version = "1.0.17" @@ -9942,6 +12029,17 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "rw-stream-sink" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8c9026ff5d2f23da5e45bbc283f156383001bfb09c4e44256d02c1a685fe9a1" +dependencies = [ + "futures", + "pin-project", + "static_assertions", +] + [[package]] name = "ryu" version = "1.0.18" @@ -9968,110 +12066,208 @@ dependencies = [ [[package]] name = "sc-allocator" -version = "4.1.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "log", + "sp-core 28.0.0", + "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "thiserror", +] + +[[package]] +name = "sc-allocator" +version = "29.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "log", - "sp-core", - "sp-wasm-interface 14.0.0", + "sp-core 34.0.0", + "sp-wasm-interface 21.0.0", "thiserror", ] [[package]] name = "sc-authority-discovery" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.34.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "async-trait", "futures", "futures-timer", "ip_network", - "libp2p", + "libp2p 0.51.4", + "linked_hash_set", "log", - "multihash 0.18.1", + "multihash 0.17.0", "multihash-codetable", "parity-scale-codec", - "prost", - "prost-build", - "rand", - "sc-client-api", - "sc-network", - "sp-api", - "sp-authority-discovery", - "sp-blockchain", - "sp-core", - "sp-keystore", - "sp-runtime", - "substrate-prometheus-endpoint", + "prost 0.12.6", + "prost-build 0.12.6", + "rand 0.8.5", + "sc-client-api 28.0.0", + "sc-network 0.34.0", + "sc-network-types 0.10.0", + "sp-api 26.0.0", + "sp-authority-discovery 26.0.0", + "sp-blockchain 28.0.0", + "sp-core 28.0.0", + "sp-keystore 0.34.0", + "sp-runtime 31.0.1", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "thiserror", +] + +[[package]] +name = "sc-authority-discovery" +version = "0.44.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" +dependencies = [ + "async-trait", + "futures", + "futures-timer", + "ip_network", + "libp2p 0.52.4", + "linked_hash_set", + "log", + "multihash 0.19.1", + "parity-scale-codec", + "prost 0.12.6", + "prost-build 0.12.6", + "rand 0.8.5", + "sc-client-api 37.0.0", + "sc-network 0.44.0", + "sc-network-types 0.12.1", + "sp-api 34.0.0", + "sp-authority-discovery 34.0.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.0", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", "thiserror", ] [[package]] name = "sc-basic-authorship" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.44.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "futures", "futures-timer", "log", "parity-scale-codec", - "sc-block-builder", + "sc-block-builder 0.42.0", "sc-proposer-metrics", - "sc-telemetry", - "sc-transaction-pool-api", - "sp-api", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-inherents", - "sp-runtime", - "substrate-prometheus-endpoint", + "sc-telemetry 24.0.0", + "sc-transaction-pool-api 37.0.0", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-runtime 39.0.0", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", +] + +[[package]] +name = "sc-block-builder" +version = "0.33.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "parity-scale-codec", + "sp-api 26.0.0", + "sp-block-builder 26.0.0", + "sp-blockchain 28.0.0", + "sp-core 28.0.0", + "sp-inherents 26.0.0", + "sp-runtime 31.0.1", + "sp-trie 29.0.0", ] [[package]] name = "sc-block-builder" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.42.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "parity-scale-codec", - "sp-api", - "sp-block-builder", - "sp-blockchain", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-trie", + "sp-api 34.0.0", + "sp-block-builder 34.0.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-runtime 39.0.0", + "sp-trie 37.0.0", ] [[package]] name = "sc-chain-spec" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "array-bytes", + "docify", + "log", + "memmap2 0.9.5", + "parity-scale-codec", + "sc-chain-spec-derive 11.0.0", + "sc-client-api 28.0.0", + "sc-executor 0.32.0", + "sc-network 0.34.0", + "sc-telemetry 15.0.0", + "serde", + "serde_json", + "sp-blockchain 28.0.0", + "sp-core 28.0.0", + "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-genesis-builder 0.8.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "sp-state-machine 0.35.0", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", +] + +[[package]] +name = "sc-chain-spec" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "array-bytes 6.2.3", + "array-bytes", "docify", "log", - "memmap2", + "memmap2 0.9.5", "parity-scale-codec", - "sc-chain-spec-derive", - "sc-client-api", - "sc-executor", - "sc-network", - "sc-telemetry", + "sc-chain-spec-derive 12.0.0", + "sc-client-api 37.0.0", + "sc-executor 0.40.0", + "sc-network 0.44.0", + "sc-telemetry 24.0.0", "serde", "serde_json", - "sp-blockchain", - "sp-core", - "sp-genesis-builder", - "sp-io", - "sp-runtime", - "sp-state-machine", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-genesis-builder 0.15.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-state-machine 0.43.0", + "sp-tracing 17.0.0", ] [[package]] name = "sc-chain-spec-derive" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "11.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "sc-chain-spec-derive" +version = "12.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", @@ -10081,76 +12277,170 @@ dependencies = [ [[package]] name = "sc-cli" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.36.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ - "array-bytes 6.2.3", - "bip39", + "array-bytes", "chrono", "clap", "fdlimit", "futures", - "itertools 0.10.5", - "libp2p-identity", + "itertools 0.11.0", + "libp2p-identity 0.1.3", + "log", + "names", + "parity-bip39", + "parity-scale-codec", + "rand 0.8.5", + "regex", + "rpassword", + "sc-client-api 28.0.0", + "sc-client-db 0.35.0", + "sc-keystore 25.0.0", + "sc-mixnet 0.4.0", + "sc-network 0.34.0", + "sc-service 0.35.0", + "sc-telemetry 15.0.0", + "sc-tracing 28.0.0", + "sc-utils 14.0.0", + "serde", + "serde_json", + "sp-blockchain 28.0.0", + "sp-core 28.0.0", + "sp-keyring 31.0.0", + "sp-keystore 0.34.0", + "sp-panic-handler 13.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-runtime 31.0.1", + "sp-version 29.0.0", + "thiserror", + "tokio", +] + +[[package]] +name = "sc-cli" +version = "0.46.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" +dependencies = [ + "array-bytes", + "chrono", + "clap", + "fdlimit", + "futures", + "itertools 0.11.0", + "libp2p-identity 0.2.9", "log", "names", + "parity-bip39", "parity-scale-codec", - "rand", + "rand 0.8.5", "regex", "rpassword", - "sc-client-api", - "sc-client-db", - "sc-keystore", - "sc-mixnet", - "sc-network", - "sc-service", - "sc-telemetry", - "sc-tracing", - "sc-utils", + "sc-client-api 37.0.0", + "sc-client-db 0.44.0", + "sc-keystore 33.0.0", + "sc-mixnet 0.14.0", + "sc-network 0.44.0", + "sc-service 0.45.0", + "sc-telemetry 24.0.0", + "sc-tracing 37.0.0", + "sc-utils 17.0.0", "serde", "serde_json", - "sp-blockchain", - "sp-core", - "sp-keyring", - "sp-keystore", - "sp-panic-handler", - "sp-runtime", - "sp-version", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-keyring 39.0.0", + "sp-keystore 0.40.0", + "sp-panic-handler 13.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-runtime 39.0.0", + "sp-version 37.0.0", "thiserror", "tokio", ] [[package]] name = "sc-client-api" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "fnv", + "futures", + "log", + "parity-scale-codec", + "parking_lot 0.12.3", + "sc-executor 0.32.0", + "sc-transaction-pool-api 28.0.0", + "sc-utils 14.0.0", + "sp-api 26.0.0", + "sp-blockchain 28.0.0", + "sp-consensus 0.32.0", + "sp-core 28.0.0", + "sp-database 10.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-runtime 31.0.1", + "sp-state-machine 0.35.0", + "sp-statement-store 10.0.0", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-trie 29.0.0", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", +] + +[[package]] +name = "sc-client-api" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "fnv", "futures", "log", "parity-scale-codec", "parking_lot 0.12.3", - "sc-executor", - "sc-transaction-pool-api", - "sc-utils", - "sp-api", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-database", - "sp-externalities 0.19.0", - "sp-runtime", - "sp-state-machine", - "sp-statement-store", - "sp-storage 13.0.0", - "sp-trie", - "substrate-prometheus-endpoint", + "sc-executor 0.40.0", + "sc-transaction-pool-api 37.0.0", + "sc-utils 17.0.0", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-core 34.0.0", + "sp-database 10.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-externalities 0.29.0", + "sp-runtime 39.0.0", + "sp-state-machine 0.43.0", + "sp-statement-store 18.0.0", + "sp-storage 21.0.0", + "sp-trie 37.0.0", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", +] + +[[package]] +name = "sc-client-db" +version = "0.35.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "hash-db", + "kvdb", + "kvdb-memorydb", + "kvdb-rocksdb", + "linked-hash-map", + "log", + "parity-db", + "parity-scale-codec", + "parking_lot 0.12.3", + "sc-client-api 28.0.0", + "sc-state-db 0.30.0", + "schnellru", + "sp-arithmetic 23.0.0", + "sp-blockchain 28.0.0", + "sp-core 28.0.0", + "sp-database 10.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-runtime 31.0.1", + "sp-state-machine 0.35.0", + "sp-trie 29.0.0", ] [[package]] name = "sc-client-db" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.44.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "hash-db", "kvdb", @@ -10161,79 +12451,103 @@ dependencies = [ "parity-db", "parity-scale-codec", "parking_lot 0.12.3", - "sc-client-api", - "sc-state-db", + "sc-client-api 37.0.0", + "sc-state-db 0.36.0", "schnellru", - "sp-arithmetic", - "sp-blockchain", - "sp-core", - "sp-database", - "sp-runtime", - "sp-state-machine", - "sp-trie", + "sp-arithmetic 26.0.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-database 10.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-runtime 39.0.0", + "sp-state-machine 0.43.0", + "sp-trie 37.0.0", ] [[package]] name = "sc-consensus" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.33.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "async-trait", "futures", "futures-timer", - "libp2p-identity", "log", - "mockall", + "mockall 0.11.4", + "parking_lot 0.12.3", + "sc-client-api 28.0.0", + "sc-network-types 0.10.0", + "sc-utils 14.0.0", + "serde", + "sp-api 26.0.0", + "sp-blockchain 28.0.0", + "sp-consensus 0.32.0", + "sp-core 28.0.0", + "sp-runtime 31.0.1", + "sp-state-machine 0.35.0", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "thiserror", +] + +[[package]] +name = "sc-consensus" +version = "0.43.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" +dependencies = [ + "async-trait", + "futures", + "log", + "mockall 0.11.4", "parking_lot 0.12.3", - "sc-client-api", - "sc-utils", + "sc-client-api 37.0.0", + "sc-network-types 0.12.1", + "sc-utils 17.0.0", "serde", - "sp-api", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-runtime", - "sp-state-machine", - "substrate-prometheus-endpoint", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-core 34.0.0", + "sp-runtime 39.0.0", + "sp-state-machine 0.43.0", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", "thiserror", ] [[package]] name = "sc-consensus-aura" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.44.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "async-trait", "futures", "log", "parity-scale-codec", - "sc-block-builder", - "sc-client-api", - "sc-consensus", + "sc-block-builder 0.42.0", + "sc-client-api 37.0.0", + "sc-consensus 0.43.0", "sc-consensus-slots", - "sc-telemetry", - "sp-api", - "sp-application-crypto", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-consensus-aura", - "sp-consensus-slots", - "sp-core", - "sp-inherents", - "sp-keystore", - "sp-runtime", - "substrate-prometheus-endpoint", + "sc-telemetry 24.0.0", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-block-builder 34.0.0", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-consensus-aura 0.40.0", + "sp-consensus-slots 0.40.0", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.0", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", "thiserror", ] [[package]] name = "sc-consensus-babe" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.44.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "async-trait", - "fork-tree", + "fork-tree 13.0.0", "futures", "log", "num-bigint", @@ -10241,55 +12555,56 @@ dependencies = [ "num-traits", "parity-scale-codec", "parking_lot 0.12.3", - "sc-client-api", - "sc-consensus", + "sc-client-api 37.0.0", + "sc-consensus 0.43.0", "sc-consensus-epochs", "sc-consensus-slots", - "sc-telemetry", - "sc-transaction-pool-api", - "sp-api", - "sp-application-crypto", - "sp-block-builder", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-consensus-slots", - "sp-core", - "sp-inherents", - "sp-keystore", - "sp-runtime", - "substrate-prometheus-endpoint", + "sc-telemetry 24.0.0", + "sc-transaction-pool-api 37.0.0", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-block-builder 34.0.0", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-consensus-babe 0.40.0", + "sp-consensus-slots 0.40.0", + "sp-core 34.0.0", + "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-inherents 34.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.0", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", "thiserror", ] [[package]] name = "sc-consensus-babe-rpc" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.44.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "futures", - "jsonrpsee", + "jsonrpsee 0.23.2", "sc-consensus-babe", "sc-consensus-epochs", - "sc-rpc-api", + "sc-rpc-api 0.43.0", "serde", - "sp-api", - "sp-application-crypto", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-core", - "sp-keystore", - "sp-runtime", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-consensus-babe 0.40.0", + "sp-core 34.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.0", "thiserror", ] [[package]] name = "sc-consensus-beefy" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "array-bytes 6.2.3", + "array-bytes", "async-channel 1.9.0", "async-trait", "fnv", @@ -10297,23 +12612,24 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.3", - "sc-client-api", - "sc-consensus", - "sc-network", + "sc-client-api 37.0.0", + "sc-consensus 0.43.0", + "sc-network 0.44.0", "sc-network-gossip", - "sc-network-sync", - "sc-utils", - "sp-api", - "sp-application-crypto", - "sp-arithmetic", - "sp-blockchain", - "sp-consensus", + "sc-network-sync 0.43.0", + "sc-network-types 0.12.1", + "sc-utils 17.0.0", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-arithmetic 26.0.0", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", "sp-consensus-beefy", - "sp-core", - "sp-keystore", - "sp-mmr-primitives", - "sp-runtime", - "substrate-prometheus-endpoint", + "sp-core 34.0.0", + "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-keystore 0.40.0", + "sp-runtime 39.0.0", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", "thiserror", "tokio", "wasm-timer", @@ -10321,194 +12637,240 @@ dependencies = [ [[package]] name = "sc-consensus-beefy-rpc" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "futures", - "jsonrpsee", + "jsonrpsee 0.23.2", "log", "parity-scale-codec", "parking_lot 0.12.3", "sc-consensus-beefy", - "sc-rpc", + "sc-rpc 39.0.0", "serde", + "sp-application-crypto 38.0.0", "sp-consensus-beefy", - "sp-core", - "sp-runtime", + "sp-core 34.0.0", + "sp-runtime 39.0.0", "thiserror", ] [[package]] name = "sc-consensus-epochs" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.43.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "fork-tree", + "fork-tree 13.0.0", "parity-scale-codec", - "sc-client-api", - "sc-consensus", - "sp-blockchain", - "sp-runtime", + "sc-client-api 37.0.0", + "sc-consensus 0.43.0", + "sp-blockchain 37.0.1", + "sp-runtime 39.0.0", ] [[package]] name = "sc-consensus-grandpa" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.29.1" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "ahash 0.8.11", - "array-bytes 6.2.3", + "ahash", + "array-bytes", "async-trait", "dyn-clone", "finality-grandpa", - "fork-tree", + "fork-tree 13.0.0", "futures", "futures-timer", "log", "parity-scale-codec", "parking_lot 0.12.3", - "rand", - "sc-block-builder", - "sc-chain-spec", - "sc-client-api", - "sc-consensus", - "sc-network", - "sc-network-common", + "rand 0.8.5", + "sc-block-builder 0.42.0", + "sc-chain-spec 37.0.0", + "sc-client-api 37.0.0", + "sc-consensus 0.43.0", + "sc-network 0.44.0", + "sc-network-common 0.43.0", "sc-network-gossip", - "sc-network-sync", - "sc-telemetry", - "sc-transaction-pool-api", - "sc-utils", + "sc-network-sync 0.43.0", + "sc-network-types 0.12.1", + "sc-telemetry 24.0.0", + "sc-transaction-pool-api 37.0.0", + "sc-utils 17.0.0", "serde_json", - "sp-api", - "sp-application-crypto", - "sp-arithmetic", - "sp-blockchain", - "sp-consensus", - "sp-consensus-grandpa", - "sp-core", - "sp-keystore", - "sp-runtime", - "substrate-prometheus-endpoint", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-arithmetic 26.0.0", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-consensus-grandpa 21.0.0", + "sp-core 34.0.0", + "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-keystore 0.40.0", + "sp-runtime 39.0.0", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", "thiserror", ] [[package]] name = "sc-consensus-grandpa-rpc" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.29.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "finality-grandpa", "futures", - "jsonrpsee", + "jsonrpsee 0.23.2", "log", "parity-scale-codec", - "sc-client-api", + "sc-client-api 37.0.0", "sc-consensus-grandpa", - "sc-rpc", + "sc-rpc 39.0.0", "serde", - "sp-blockchain", - "sp-core", - "sp-runtime", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-runtime 39.0.0", "thiserror", ] [[package]] -name = "sc-consensus-manual-seal" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +name = "sc-consensus-slots" +version = "0.43.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "assert_matches", "async-trait", "futures", "futures-timer", - "jsonrpsee", "log", "parity-scale-codec", - "sc-client-api", - "sc-consensus", - "sc-consensus-aura", - "sc-consensus-babe", - "sc-consensus-epochs", - "sc-transaction-pool", - "sc-transaction-pool-api", - "serde", - "sp-api", - "sp-blockchain", - "sp-consensus", - "sp-consensus-aura", - "sp-consensus-babe", - "sp-consensus-slots", - "sp-core", - "sp-inherents", - "sp-keystore", - "sp-runtime", - "sp-timestamp", - "substrate-prometheus-endpoint", - "thiserror", + "sc-client-api 37.0.0", + "sc-consensus 0.43.0", + "sc-telemetry 24.0.0", + "sp-arithmetic 26.0.0", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-consensus-slots 0.40.0", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-runtime 39.0.0", + "sp-state-machine 0.43.0", ] [[package]] -name = "sc-consensus-slots" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +name = "sc-executor" +version = "0.32.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ - "async-trait", - "futures", - "futures-timer", - "log", "parity-scale-codec", - "sc-client-api", - "sc-consensus", - "sc-telemetry", - "sp-arithmetic", - "sp-blockchain", - "sp-consensus", - "sp-consensus-slots", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-state-machine", + "parking_lot 0.12.3", + "sc-executor-common 0.29.0", + "sc-executor-polkavm 0.29.0", + "sc-executor-wasmtime 0.29.0", + "schnellru", + "sp-api 26.0.0", + "sp-core 28.0.0", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-io 30.0.0", + "sp-panic-handler 13.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-trie 29.0.0", + "sp-version 29.0.0", + "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "tracing", ] [[package]] name = "sc-executor" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.40.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", - "sc-executor-common", - "sc-executor-wasmtime", + "sc-executor-common 0.35.0", + "sc-executor-polkavm 0.32.0", + "sc-executor-wasmtime 0.35.0", "schnellru", - "sp-api", - "sp-core", - "sp-externalities 0.19.0", - "sp-io", - "sp-panic-handler", - "sp-runtime-interface 17.0.0", - "sp-trie", - "sp-version", - "sp-wasm-interface 14.0.0", + "sp-api 34.0.0", + "sp-core 34.0.0", + "sp-externalities 0.29.0", + "sp-io 38.0.0", + "sp-panic-handler 13.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-runtime-interface 28.0.0", + "sp-trie 37.0.0", + "sp-version 37.0.0", + "sp-wasm-interface 21.0.0", "tracing", ] [[package]] name = "sc-executor-common" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.29.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "polkavm", + "sc-allocator 23.0.0", + "sp-maybe-compressed-blob 11.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "thiserror", + "wasm-instrument", +] + +[[package]] +name = "sc-executor-common" +version = "0.35.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "sc-allocator", - "sp-maybe-compressed-blob", - "sp-wasm-interface 14.0.0", + "polkavm", + "sc-allocator 29.0.0", + "sp-maybe-compressed-blob 11.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-wasm-interface 21.0.0", "thiserror", "wasm-instrument", ] +[[package]] +name = "sc-executor-polkavm" +version = "0.29.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "log", + "polkavm", + "sc-executor-common 0.29.0", + "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", +] + +[[package]] +name = "sc-executor-polkavm" +version = "0.32.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" +dependencies = [ + "log", + "polkavm", + "sc-executor-common 0.35.0", + "sp-wasm-interface 21.0.0", +] + +[[package]] +name = "sc-executor-wasmtime" +version = "0.29.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "anyhow", + "cfg-if", + "libc", + "log", + "parking_lot 0.12.3", + "rustix 0.36.17", + "sc-allocator 23.0.0", + "sc-executor-common 0.29.0", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "wasmtime", +] + [[package]] name = "sc-executor-wasmtime" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.35.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "anyhow", "cfg-if", @@ -10516,224 +12878,401 @@ dependencies = [ "log", "parking_lot 0.12.3", "rustix 0.36.17", - "sc-allocator", - "sc-executor-common", - "sp-runtime-interface 17.0.0", - "sp-wasm-interface 14.0.0", + "sc-allocator 29.0.0", + "sc-executor-common 0.35.0", + "sp-runtime-interface 28.0.0", + "sp-wasm-interface 21.0.0", "wasmtime", ] [[package]] name = "sc-informant" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.33.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "ansi_term", "futures", "futures-timer", "log", - "sc-client-api", - "sc-network", - "sc-network-common", - "sc-network-sync", - "sp-blockchain", - "sp-runtime", + "sc-client-api 28.0.0", + "sc-network 0.34.0", + "sc-network-common 0.33.0", + "sc-network-sync 0.33.0", + "sp-blockchain 28.0.0", + "sp-runtime 31.0.1", ] [[package]] -name = "sc-keystore" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +name = "sc-informant" +version = "0.43.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" +dependencies = [ + "ansi_term", + "futures", + "futures-timer", + "log", + "sc-client-api 37.0.0", + "sc-network 0.44.0", + "sc-network-common 0.43.0", + "sc-network-sync 0.43.0", + "sp-blockchain 37.0.1", + "sp-runtime 39.0.0", +] + +[[package]] +name = "sc-keystore" +version = "25.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "array-bytes", + "parking_lot 0.12.3", + "serde_json", + "sp-application-crypto 30.0.0", + "sp-core 28.0.0", + "sp-keystore 0.34.0", + "thiserror", +] + +[[package]] +name = "sc-keystore" +version = "33.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "array-bytes 6.2.3", + "array-bytes", "parking_lot 0.12.3", "serde_json", - "sp-application-crypto", - "sp-core", - "sp-keystore", + "sp-application-crypto 38.0.0", + "sp-core 34.0.0", + "sp-keystore 0.40.0", "thiserror", ] [[package]] name = "sc-mixnet" -version = "0.1.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.4.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "array-bytes", + "arrayvec 0.7.4", + "blake2 0.10.6", + "bytes", + "futures", + "futures-timer", + "log", + "mixnet", + "multiaddr 0.17.1", + "parity-scale-codec", + "parking_lot 0.12.3", + "sc-client-api 28.0.0", + "sc-network 0.34.0", + "sc-network-types 0.10.0", + "sc-transaction-pool-api 28.0.0", + "sp-api 26.0.0", + "sp-consensus 0.32.0", + "sp-core 28.0.0", + "sp-keystore 0.34.0", + "sp-mixnet 0.4.0", + "sp-runtime 31.0.1", + "thiserror", +] + +[[package]] +name = "sc-mixnet" +version = "0.14.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "arrayvec 0.7.4", "blake2 0.10.6", "bytes", "futures", "futures-timer", - "libp2p-identity", "log", "mixnet", - "multiaddr", + "multiaddr 0.18.1", "parity-scale-codec", "parking_lot 0.12.3", - "sc-client-api", - "sc-network", - "sc-transaction-pool-api", - "sp-api", - "sp-consensus", - "sp-core", - "sp-keystore", - "sp-mixnet", - "sp-runtime", + "sc-client-api 37.0.0", + "sc-network 0.44.0", + "sc-network-types 0.12.1", + "sc-transaction-pool-api 37.0.0", + "sp-api 34.0.0", + "sp-consensus 0.40.0", + "sp-core 34.0.0", + "sp-keystore 0.40.0", + "sp-mixnet 0.12.0", + "sp-runtime 39.0.0", "thiserror", ] [[package]] name = "sc-network" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.34.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ - "array-bytes 6.2.3", + "array-bytes", "async-channel 1.9.0", "async-trait", "asynchronous-codec", "bytes", + "cid 0.9.0", "either", "fnv", "futures", "futures-timer", "ip_network", - "libp2p", + "libp2p 0.51.4", "linked_hash_set", + "litep2p 0.3.0", "log", - "mockall", + "mockall 0.11.4", + "once_cell", "parity-scale-codec", "parking_lot 0.12.3", "partial_sort", "pin-project", - "rand", - "sc-client-api", - "sc-network-common", - "sc-utils", + "prost 0.12.6", + "prost-build 0.12.6", + "rand 0.8.5", + "sc-client-api 28.0.0", + "sc-network-common 0.33.0", + "sc-network-types 0.10.0", + "sc-utils 14.0.0", + "schnellru", "serde", "serde_json", "smallvec", - "sp-arithmetic", - "sp-blockchain", - "sp-core", - "sp-runtime", - "substrate-prometheus-endpoint", + "sp-arithmetic 23.0.0", + "sp-blockchain 28.0.0", + "sp-core 28.0.0", + "sp-runtime 31.0.1", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", "thiserror", "tokio", "tokio-stream", - "unsigned-varint", + "unsigned-varint 0.7.2", + "void", "wasm-timer", "zeroize", ] [[package]] -name = "sc-network-bitswap" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +name = "sc-network" +version = "0.44.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ + "array-bytes", "async-channel 1.9.0", - "cid", + "async-trait", + "asynchronous-codec", + "bytes", + "cid 0.9.0", + "either", + "fnv", "futures", - "libp2p-identity", + "futures-timer", + "ip_network", + "libp2p 0.52.4", + "linked_hash_set", + "litep2p 0.6.2", "log", - "prost", - "prost-build", - "sc-client-api", - "sc-network", - "sp-blockchain", - "sp-runtime", + "mockall 0.11.4", + "once_cell", + "parity-scale-codec", + "parking_lot 0.12.3", + "partial_sort", + "pin-project", + "prost 0.12.6", + "prost-build 0.12.6", + "rand 0.8.5", + "sc-client-api 37.0.0", + "sc-network-common 0.43.0", + "sc-network-types 0.12.1", + "sc-utils 17.0.0", + "schnellru", + "serde", + "serde_json", + "smallvec", + "sp-arithmetic 26.0.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-runtime 39.0.0", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", "thiserror", - "unsigned-varint", + "tokio", + "tokio-stream", + "unsigned-varint 0.7.2", + "void", + "wasm-timer", + "zeroize", +] + +[[package]] +name = "sc-network-common" +version = "0.33.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "async-trait", + "bitflags 1.3.2", + "futures", + "libp2p-identity 0.1.3", + "parity-scale-codec", + "prost-build 0.12.6", + "sc-consensus 0.33.0", + "sc-network-types 0.10.0", + "sp-consensus 0.32.0", + "sp-consensus-grandpa 13.0.0", + "sp-runtime 31.0.1", ] [[package]] name = "sc-network-common" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.43.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "async-trait", "bitflags 1.3.2", "futures", - "libp2p-identity", + "libp2p-identity 0.2.9", "parity-scale-codec", - "prost-build", - "sc-consensus", - "sp-consensus", - "sp-consensus-grandpa", - "sp-runtime", + "prost-build 0.12.6", + "sc-consensus 0.43.0", + "sc-network-types 0.12.1", + "sp-consensus 0.40.0", + "sp-consensus-grandpa 21.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "sc-network-gossip" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.44.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "ahash 0.8.11", + "ahash", "futures", "futures-timer", - "libp2p", "log", - "sc-network", - "sc-network-common", - "sc-network-sync", + "sc-network 0.44.0", + "sc-network-common 0.43.0", + "sc-network-sync 0.43.0", + "sc-network-types 0.12.1", "schnellru", - "sp-runtime", - "substrate-prometheus-endpoint", + "sp-runtime 39.0.0", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", "tracing", ] [[package]] name = "sc-network-light" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.33.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "array-bytes", + "async-channel 1.9.0", + "futures", + "log", + "parity-scale-codec", + "prost 0.12.6", + "prost-build 0.12.6", + "sc-client-api 28.0.0", + "sc-network 0.34.0", + "sc-network-types 0.10.0", + "sp-blockchain 28.0.0", + "sp-core 28.0.0", + "sp-runtime 31.0.1", + "thiserror", +] + +[[package]] +name = "sc-network-light" +version = "0.43.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" +dependencies = [ + "array-bytes", + "async-channel 1.9.0", + "futures", + "log", + "parity-scale-codec", + "prost 0.12.6", + "prost-build 0.12.6", + "sc-client-api 37.0.0", + "sc-network 0.44.0", + "sc-network-types 0.12.1", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-runtime 39.0.0", + "thiserror", +] + +[[package]] +name = "sc-network-sync" +version = "0.33.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ - "array-bytes 6.2.3", + "array-bytes", "async-channel 1.9.0", + "async-trait", + "fork-tree 12.0.0", "futures", - "libp2p-identity", + "futures-timer", + "libp2p 0.51.4", "log", + "mockall 0.11.4", "parity-scale-codec", - "prost", - "prost-build", - "sc-client-api", - "sc-network", - "sp-blockchain", - "sp-core", - "sp-runtime", + "prost 0.12.6", + "prost-build 0.12.6", + "sc-client-api 28.0.0", + "sc-consensus 0.33.0", + "sc-network 0.34.0", + "sc-network-common 0.33.0", + "sc-network-types 0.10.0", + "sc-utils 14.0.0", + "schnellru", + "smallvec", + "sp-arithmetic 23.0.0", + "sp-blockchain 28.0.0", + "sp-consensus 0.32.0", + "sp-consensus-grandpa 13.0.0", + "sp-core 28.0.0", + "sp-runtime 31.0.1", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", "thiserror", + "tokio", + "tokio-stream", ] [[package]] name = "sc-network-sync" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.43.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "array-bytes 6.2.3", + "array-bytes", "async-channel 1.9.0", "async-trait", - "fork-tree", + "fork-tree 13.0.0", "futures", "futures-timer", - "libp2p", + "libp2p 0.52.4", "log", - "mockall", + "mockall 0.11.4", "parity-scale-codec", - "prost", - "prost-build", - "sc-client-api", - "sc-consensus", - "sc-network", - "sc-network-common", - "sc-utils", + "prost 0.12.6", + "prost-build 0.12.6", + "sc-client-api 37.0.0", + "sc-consensus 0.43.0", + "sc-network 0.44.0", + "sc-network-common 0.43.0", + "sc-network-types 0.12.1", + "sc-utils 17.0.0", "schnellru", "smallvec", - "sp-arithmetic", - "sp-blockchain", - "sp-consensus", - "sp-consensus-grandpa", - "sp-core", - "sp-runtime", - "substrate-prometheus-endpoint", + "sp-arithmetic 26.0.0", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-consensus-grandpa 21.0.0", + "sp-core 34.0.0", + "sp-runtime 39.0.0", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", "thiserror", "tokio", "tokio-stream", @@ -10741,157 +13280,322 @@ dependencies = [ [[package]] name = "sc-network-transactions" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.33.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "array-bytes", + "futures", + "libp2p 0.51.4", + "log", + "parity-scale-codec", + "sc-network 0.34.0", + "sc-network-common 0.33.0", + "sc-network-sync 0.33.0", + "sc-network-types 0.10.0", + "sc-utils 14.0.0", + "sp-consensus 0.32.0", + "sp-runtime 31.0.1", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", +] + +[[package]] +name = "sc-network-transactions" +version = "0.43.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "array-bytes 6.2.3", + "array-bytes", "futures", - "libp2p", "log", "parity-scale-codec", - "sc-network", - "sc-network-common", - "sc-network-sync", - "sc-utils", - "sp-consensus", - "sp-runtime", - "substrate-prometheus-endpoint", + "sc-network 0.44.0", + "sc-network-common 0.43.0", + "sc-network-sync 0.43.0", + "sc-network-types 0.12.1", + "sc-utils 17.0.0", + "sp-consensus 0.40.0", + "sp-runtime 39.0.0", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", +] + +[[package]] +name = "sc-network-types" +version = "0.10.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "bs58 0.5.1", + "libp2p-identity 0.1.3", + "litep2p 0.3.0", + "multiaddr 0.17.1", + "multihash 0.17.0", + "rand 0.8.5", + "thiserror", +] + +[[package]] +name = "sc-network-types" +version = "0.12.1" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" +dependencies = [ + "bs58 0.5.1", + "ed25519-dalek 2.1.1", + "libp2p-identity 0.2.9", + "litep2p 0.6.2", + "log", + "multiaddr 0.18.1", + "multihash 0.19.1", + "rand 0.8.5", + "thiserror", + "zeroize", ] [[package]] name = "sc-offchain" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "39.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "array-bytes 6.2.3", + "array-bytes", "bytes", "fnv", "futures", "futures-timer", - "hyper", + "hyper 0.14.29", "hyper-rustls", - "libp2p", "log", "num_cpus", "once_cell", "parity-scale-codec", "parking_lot 0.12.3", - "rand", - "sc-client-api", - "sc-network", - "sc-network-common", - "sc-transaction-pool-api", - "sc-utils", - "sp-api", - "sp-core", - "sp-externalities 0.19.0", - "sp-keystore", - "sp-offchain", - "sp-runtime", + "rand 0.8.5", + "sc-client-api 37.0.0", + "sc-network 0.44.0", + "sc-network-common 0.43.0", + "sc-network-types 0.12.1", + "sc-transaction-pool-api 37.0.0", + "sc-utils 17.0.0", + "sp-api 34.0.0", + "sp-core 34.0.0", + "sp-externalities 0.29.0", + "sp-keystore 0.40.0", + "sp-offchain 34.0.0", + "sp-runtime 39.0.0", "threadpool", "tracing", ] [[package]] name = "sc-proposer-metrics" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.18.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "log", - "substrate-prometheus-endpoint", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", ] [[package]] name = "sc-rpc" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "29.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "futures", + "jsonrpsee 0.22.5", + "log", + "parity-scale-codec", + "parking_lot 0.12.3", + "sc-block-builder 0.33.0", + "sc-chain-spec 28.0.0", + "sc-client-api 28.0.0", + "sc-mixnet 0.4.0", + "sc-rpc-api 0.33.0", + "sc-tracing 28.0.0", + "sc-transaction-pool-api 28.0.0", + "sc-utils 14.0.0", + "serde_json", + "sp-api 26.0.0", + "sp-blockchain 28.0.0", + "sp-core 28.0.0", + "sp-keystore 0.34.0", + "sp-offchain 26.0.0", + "sp-rpc 26.0.0", + "sp-runtime 31.0.1", + "sp-session 27.0.0", + "sp-statement-store 10.0.0", + "sp-version 29.0.0", + "tokio", +] + +[[package]] +name = "sc-rpc" +version = "39.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "futures", - "jsonrpsee", + "jsonrpsee 0.23.2", "log", "parity-scale-codec", "parking_lot 0.12.3", - "sc-block-builder", - "sc-chain-spec", - "sc-client-api", - "sc-mixnet", - "sc-rpc-api", - "sc-tracing", - "sc-transaction-pool-api", - "sc-utils", + "sc-block-builder 0.42.0", + "sc-chain-spec 37.0.0", + "sc-client-api 37.0.0", + "sc-mixnet 0.14.0", + "sc-rpc-api 0.43.0", + "sc-tracing 37.0.0", + "sc-transaction-pool-api 37.0.0", + "sc-utils 17.0.0", "serde_json", - "sp-api", - "sp-blockchain", - "sp-core", - "sp-keystore", - "sp-offchain", - "sp-rpc", - "sp-runtime", - "sp-session", - "sp-statement-store", - "sp-version", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-keystore 0.40.0", + "sp-offchain 34.0.0", + "sp-rpc 32.0.0", + "sp-runtime 39.0.0", + "sp-session 35.0.0", + "sp-statement-store 18.0.0", + "sp-version 37.0.0", "tokio", ] [[package]] name = "sc-rpc-api" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.33.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "jsonrpsee 0.22.5", + "parity-scale-codec", + "sc-chain-spec 28.0.0", + "sc-mixnet 0.4.0", + "sc-transaction-pool-api 28.0.0", + "scale-info", + "serde", + "serde_json", + "sp-core 28.0.0", + "sp-rpc 26.0.0", + "sp-runtime 31.0.1", + "sp-version 29.0.0", + "thiserror", +] + +[[package]] +name = "sc-rpc-api" +version = "0.43.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "jsonrpsee", + "jsonrpsee 0.23.2", "parity-scale-codec", - "sc-chain-spec", - "sc-mixnet", - "sc-transaction-pool-api", + "sc-chain-spec 37.0.0", + "sc-mixnet 0.14.0", + "sc-transaction-pool-api 37.0.0", "scale-info", "serde", "serde_json", - "sp-core", - "sp-rpc", - "sp-runtime", - "sp-version", + "sp-core 34.0.0", + "sp-rpc 32.0.0", + "sp-runtime 39.0.0", + "sp-version 37.0.0", "thiserror", ] [[package]] name = "sc-rpc-server" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "11.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "forwarded-header-value", + "futures", + "governor", + "http 0.2.12", + "hyper 0.14.29", + "ip_network", + "jsonrpsee 0.22.5", + "log", + "serde_json", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "tokio", + "tower", + "tower-http 0.4.4", +] + +[[package]] +name = "sc-rpc-server" +version = "16.0.2" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "http", - "jsonrpsee", + "forwarded-header-value", + "futures", + "governor", + "http 1.1.0", + "http-body-util", + "hyper 1.4.1", + "ip_network", + "jsonrpsee 0.23.2", "log", + "serde", "serde_json", - "substrate-prometheus-endpoint", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", "tokio", "tower", - "tower-http", + "tower-http 0.5.2", +] + +[[package]] +name = "sc-rpc-spec-v2" +version = "0.34.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "array-bytes", + "futures", + "futures-util", + "hex", + "jsonrpsee 0.22.5", + "log", + "parity-scale-codec", + "parking_lot 0.12.3", + "rand 0.8.5", + "sc-chain-spec 28.0.0", + "sc-client-api 28.0.0", + "sc-rpc 29.0.0", + "sc-transaction-pool-api 28.0.0", + "sc-utils 14.0.0", + "schnellru", + "serde", + "sp-api 26.0.0", + "sp-blockchain 28.0.0", + "sp-core 28.0.0", + "sp-rpc 26.0.0", + "sp-runtime 31.0.1", + "sp-version 29.0.0", + "thiserror", + "tokio", + "tokio-stream", ] [[package]] name = "sc-rpc-spec-v2" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.44.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "array-bytes 6.2.3", + "array-bytes", "futures", "futures-util", "hex", - "jsonrpsee", + "jsonrpsee 0.23.2", "log", "parity-scale-codec", "parking_lot 0.12.3", - "sc-chain-spec", - "sc-client-api", - "sc-transaction-pool-api", - "sc-utils", - "serde", - "sp-api", - "sp-blockchain", - "sp-core", - "sp-rpc", - "sp-runtime", - "sp-version", + "rand 0.8.5", + "sc-chain-spec 37.0.0", + "sc-client-api 37.0.0", + "sc-rpc 39.0.0", + "sc-transaction-pool-api 37.0.0", + "sc-utils 17.0.0", + "schnellru", + "serde", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-rpc 32.0.0", + "sp-runtime 39.0.0", + "sp-version 37.0.0", "thiserror", "tokio", "tokio-stream", @@ -10899,60 +13603,125 @@ dependencies = [ [[package]] name = "sc-service" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.35.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "async-trait", + "directories", + "exit-future", + "futures", + "futures-timer", + "jsonrpsee 0.22.5", + "log", + "parity-scale-codec", + "parking_lot 0.12.3", + "pin-project", + "rand 0.8.5", + "sc-chain-spec 28.0.0", + "sc-client-api 28.0.0", + "sc-client-db 0.35.0", + "sc-consensus 0.33.0", + "sc-executor 0.32.0", + "sc-informant 0.33.0", + "sc-keystore 25.0.0", + "sc-network 0.34.0", + "sc-network-common 0.33.0", + "sc-network-light 0.33.0", + "sc-network-sync 0.33.0", + "sc-network-transactions 0.33.0", + "sc-network-types 0.10.0", + "sc-rpc 29.0.0", + "sc-rpc-server 11.0.0", + "sc-rpc-spec-v2 0.34.0", + "sc-sysinfo 27.0.0", + "sc-telemetry 15.0.0", + "sc-tracing 28.0.0", + "sc-transaction-pool 28.0.0", + "sc-transaction-pool-api 28.0.0", + "sc-utils 14.0.0", + "schnellru", + "serde", + "serde_json", + "sp-api 26.0.0", + "sp-blockchain 28.0.0", + "sp-consensus 0.32.0", + "sp-core 28.0.0", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-keystore 0.34.0", + "sp-runtime 31.0.1", + "sp-session 27.0.0", + "sp-state-machine 0.35.0", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-transaction-pool 26.0.0", + "sp-transaction-storage-proof 26.0.0", + "sp-trie 29.0.0", + "sp-version 29.0.0", + "static_init", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "tempfile", + "thiserror", + "tokio", + "tracing", + "tracing-futures", +] + +[[package]] +name = "sc-service" +version = "0.45.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "async-trait", "directories", "exit-future", "futures", "futures-timer", - "jsonrpsee", + "jsonrpsee 0.23.2", "log", "parity-scale-codec", "parking_lot 0.12.3", "pin-project", - "rand", - "sc-chain-spec", - "sc-client-api", - "sc-client-db", - "sc-consensus", - "sc-executor", - "sc-informant", - "sc-keystore", - "sc-network", - "sc-network-bitswap", - "sc-network-common", - "sc-network-light", - "sc-network-sync", - "sc-network-transactions", - "sc-rpc", - "sc-rpc-server", - "sc-rpc-spec-v2", - "sc-sysinfo", - "sc-telemetry", - "sc-tracing", - "sc-transaction-pool", - "sc-transaction-pool-api", - "sc-utils", + "rand 0.8.5", + "sc-chain-spec 37.0.0", + "sc-client-api 37.0.0", + "sc-client-db 0.44.0", + "sc-consensus 0.43.0", + "sc-executor 0.40.0", + "sc-informant 0.43.0", + "sc-keystore 33.0.0", + "sc-network 0.44.0", + "sc-network-common 0.43.0", + "sc-network-light 0.43.0", + "sc-network-sync 0.43.0", + "sc-network-transactions 0.43.0", + "sc-network-types 0.12.1", + "sc-rpc 39.0.0", + "sc-rpc-server 16.0.2", + "sc-rpc-spec-v2 0.44.0", + "sc-sysinfo 37.0.0", + "sc-telemetry 24.0.0", + "sc-tracing 37.0.0", + "sc-transaction-pool 37.0.0", + "sc-transaction-pool-api 37.0.0", + "sc-utils 17.0.0", + "schnellru", "serde", "serde_json", - "sp-api", - "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-externalities 0.19.0", - "sp-keystore", - "sp-runtime", - "sp-session", - "sp-state-machine", - "sp-storage 13.0.0", - "sp-transaction-pool", - "sp-transaction-storage-proof", - "sp-trie", - "sp-version", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-consensus 0.40.0", + "sp-core 34.0.0", + "sp-externalities 0.29.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.0", + "sp-session 35.0.0", + "sp-state-machine 0.43.0", + "sp-storage 21.0.0", + "sp-transaction-pool 34.0.0", + "sp-transaction-storage-proof 34.0.0", + "sp-trie 37.0.0", + "sp-version 37.0.0", "static_init", - "substrate-prometheus-endpoint", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", "tempfile", "thiserror", "tokio", @@ -10962,80 +13731,134 @@ dependencies = [ [[package]] name = "sc-state-db" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.30.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "log", + "parity-scale-codec", + "parking_lot 0.12.3", + "sp-core 28.0.0", +] + +[[package]] +name = "sc-state-db" +version = "0.36.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.3", - "sp-core", + "sp-core 34.0.0", ] [[package]] name = "sc-storage-monitor" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.22.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "clap", "fs4", "log", - "sp-core", + "sp-core 34.0.0", "thiserror", "tokio", ] [[package]] name = "sc-sync-state-rpc" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.44.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "jsonrpsee", + "jsonrpsee 0.23.2", "parity-scale-codec", - "sc-chain-spec", - "sc-client-api", + "sc-chain-spec 37.0.0", + "sc-client-api 37.0.0", "sc-consensus-babe", "sc-consensus-epochs", "sc-consensus-grandpa", "serde", "serde_json", - "sp-blockchain", - "sp-runtime", + "sp-blockchain 37.0.1", + "sp-runtime 39.0.0", "thiserror", ] [[package]] name = "sc-sysinfo" -version = "6.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "27.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "derive_more", + "futures", + "libc", + "log", + "rand 0.8.5", + "rand_pcg", + "regex", + "sc-telemetry 15.0.0", + "serde", + "serde_json", + "sp-core 28.0.0", + "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-io 30.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", +] + +[[package]] +name = "sc-sysinfo" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "derive_more", "futures", "libc", "log", - "rand", + "rand 0.8.5", "rand_pcg", "regex", - "sc-telemetry", + "sc-telemetry 24.0.0", "serde", "serde_json", - "sp-core", - "sp-io", - "sp-std 8.0.0", + "sp-core 34.0.0", + "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-io 38.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", ] [[package]] name = "sc-telemetry" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "15.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "chrono", + "futures", + "libp2p 0.51.4", + "log", + "parking_lot 0.12.3", + "pin-project", + "rand 0.8.5", + "sc-network 0.34.0", + "sc-utils 14.0.0", + "serde", + "serde_json", + "thiserror", + "wasm-timer", +] + +[[package]] +name = "sc-telemetry" +version = "24.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "chrono", "futures", - "libp2p", + "libp2p 0.52.4", "log", "parking_lot 0.12.3", "pin-project", - "rand", - "sc-utils", + "rand 0.8.5", + "sc-network 0.44.0", + "sc-utils 17.0.0", "serde", "serde_json", "thiserror", @@ -11044,8 +13867,8 @@ dependencies = [ [[package]] name = "sc-tracing" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "ansi_term", "chrono", @@ -11057,36 +13880,104 @@ dependencies = [ "parking_lot 0.12.3", "regex", "rustc-hash", - "sc-client-api", - "sc-tracing-proc-macro", + "sc-client-api 28.0.0", + "sc-tracing-proc-macro 11.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", "serde", - "sp-api", - "sp-blockchain", - "sp-core", - "sp-rpc", - "sp-runtime", - "sp-tracing 10.0.0", + "sp-api 26.0.0", + "sp-blockchain 28.0.0", + "sp-core 28.0.0", + "sp-rpc 26.0.0", + "sp-runtime 31.0.1", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", "thiserror", "tracing", - "tracing-log 0.1.4", - "tracing-subscriber 0.2.25", + "tracing-log", + "tracing-subscriber", ] [[package]] -name = "sc-tracing-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +name = "sc-tracing" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.68", -] - + "ansi_term", + "chrono", + "is-terminal", + "lazy_static", + "libc", + "log", + "parity-scale-codec", + "parking_lot 0.12.3", + "regex", + "rustc-hash", + "sc-client-api 37.0.0", + "sc-tracing-proc-macro 11.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "serde", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-rpc 32.0.0", + "sp-runtime 39.0.0", + "sp-tracing 17.0.0", + "thiserror", + "tracing", + "tracing-log", + "tracing-subscriber", +] + +[[package]] +name = "sc-tracing-proc-macro" +version = "11.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "sc-tracing-proc-macro" +version = "11.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.68", +] + [[package]] name = "sc-transaction-pool" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "async-trait", + "futures", + "futures-timer", + "linked-hash-map", + "log", + "parity-scale-codec", + "parking_lot 0.12.3", + "sc-client-api 28.0.0", + "sc-transaction-pool-api 28.0.0", + "sc-utils 14.0.0", + "serde", + "sp-api 26.0.0", + "sp-blockchain 28.0.0", + "sp-core 28.0.0", + "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-runtime 31.0.1", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-transaction-pool 26.0.0", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "thiserror", +] + +[[package]] +name = "sc-transaction-pool" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "async-trait", "futures", @@ -11095,40 +13986,57 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.3", - "sc-client-api", - "sc-transaction-pool-api", - "sc-utils", + "sc-client-api 37.0.0", + "sc-transaction-pool-api 37.0.0", + "sc-utils 17.0.0", "serde", - "sp-api", - "sp-blockchain", - "sp-core", - "sp-runtime", - "sp-tracing 10.0.0", - "sp-transaction-pool", - "substrate-prometheus-endpoint", + "sp-api 34.0.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-runtime 39.0.0", + "sp-tracing 17.0.0", + "sp-transaction-pool 34.0.0", + "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", "thiserror", ] [[package]] name = "sc-transaction-pool-api" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "async-trait", + "futures", + "log", + "parity-scale-codec", + "serde", + "sp-blockchain 28.0.0", + "sp-core 28.0.0", + "sp-runtime 31.0.1", + "thiserror", +] + +[[package]] +name = "sc-transaction-pool-api" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "async-trait", "futures", "log", "parity-scale-codec", "serde", - "sp-blockchain", - "sp-core", - "sp-runtime", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-runtime 39.0.0", "thiserror", ] [[package]] name = "sc-utils" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "14.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "async-channel 1.9.0", "futures", @@ -11137,7 +14045,22 @@ dependencies = [ "log", "parking_lot 0.12.3", "prometheus", - "sp-arithmetic", + "sp-arithmetic 23.0.0", +] + +[[package]] +name = "sc-utils" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" +dependencies = [ + "async-channel 1.9.0", + "futures", + "futures-timer", + "lazy_static", + "log", + "parking_lot 0.12.3", + "prometheus", + "sp-arithmetic 26.0.0", ] [[package]] @@ -11210,7 +14133,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9a8ef13a93c54d20580de1e5c413e624e53121d42fc7e2c11d10ef7f8b02367" dependencies = [ - "ahash 0.8.11", + "ahash", "cfg-if", "hashbrown 0.13.2", ] @@ -11246,7 +14169,7 @@ dependencies = [ "rand_core 0.6.4", "serde_bytes", "sha2 0.10.8", - "subtle 2.4.1", + "subtle 2.6.1", "zeroize", ] @@ -11272,6 +14195,36 @@ dependencies = [ "untrusted 0.9.0", ] +[[package]] +name = "sctp-proto" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f64cef148d3295c730c3cb340b0b252a4d570b1c7d4bf0808f88540b0a888bc" +dependencies = [ + "bytes", + "crc", + "fxhash", + "log", + "rand 0.8.5", + "slab", + "thiserror", +] + +[[package]] +name = "sctp-proto" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6220f78bb44c15f326b0596113305f6101097a18755d53727a575c97e09fb24" +dependencies = [ + "bytes", + "crc", + "fxhash", + "log", + "rand 0.8.5", + "slab", + "thiserror", +] + [[package]] name = "sec1" version = "0.7.3" @@ -11282,7 +14235,8 @@ dependencies = [ "der", "generic-array 0.14.7", "pkcs8", - "subtle 2.4.1", + "serdect", + "subtle 2.6.1", "zeroize", ] @@ -11332,6 +14286,7 @@ dependencies = [ "core-foundation", "core-foundation-sys", "libc", + "num-bigint", "security-framework-sys", ] @@ -11369,6 +14324,12 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +[[package]] +name = "send_wrapper" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" + [[package]] name = "serde" version = "1.0.204" @@ -11400,11 +14361,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -11418,6 +14380,16 @@ dependencies = [ "serde", ] +[[package]] +name = "serdect" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a84f14a19e9a014bb9f4512488d9829a68e04ecabffb0f9904cd1ace94598177" +dependencies = [ + "base16ct", + "serde", +] + [[package]] name = "sha-1" version = "0.9.8" @@ -11431,6 +14403,18 @@ dependencies = [ "opaque-debug 0.3.1", ] +[[package]] +name = "sha-1" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", + "sha1-asm", +] + [[package]] name = "sha1" version = "0.10.6" @@ -11442,6 +14426,15 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "sha1-asm" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "286acebaf8b67c1130aedffad26f594eff0c1292389158135327d2e23aed582b" +dependencies = [ + "cc", +] + [[package]] name = "sha2" version = "0.9.9" @@ -11500,6 +14493,12 @@ dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" + [[package]] name = "signature" version = "2.2.0" @@ -11523,10 +14522,40 @@ dependencies = [ "wide", ] +[[package]] +name = "similar" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" +dependencies = [ + "bstr", + "unicode-segmentation", +] + +[[package]] +name = "similar-asserts" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe85670573cd6f0fa97940f26e7e6601213c3b0555246c24234131f88c5709e" +dependencies = [ + "console", + "similar", +] + +[[package]] +name = "simple-dns" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cae9a3fcdadafb6d97f4c0e007e4247b114ee0f119f650c3cbf3a8b3a1479694" +dependencies = [ + "bitflags 2.5.0", +] + [[package]] name = "simple-mermaid" -version = "0.1.0" -source = "git+https://github.com/kianenigma/simple-mermaid.git?rev=e48b187bcfd5cc75111acd9d241f1bd36604344b#e48b187bcfd5cc75111acd9d241f1bd36604344b" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "620a1d43d70e142b1d46a929af51d44f383db9c7a2ec122de2cd992ccfcf3c18" [[package]] name = "siphasher" @@ -11551,14 +14580,13 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[package]] name = "slot-range-helper" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "15.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "enumn", "parity-scale-codec", "paste", - "sp-runtime", - "sp-std 8.0.0", + "sp-runtime 39.0.0", ] [[package]] @@ -11609,7 +14637,7 @@ dependencies = [ "chacha20", "crossbeam-queue", "derive_more", - "ed25519-zebra 4.0.3", + "ed25519-zebra", "either", "event-listener 2.5.3", "fnv", @@ -11626,10 +14654,10 @@ dependencies = [ "num-bigint", "num-rational", "num-traits", - "pbkdf2 0.12.2", + "pbkdf2", "pin-project", "poly1305", - "rand", + "rand 0.8.5", "rand_chacha 0.3.1", "ruzstd", "schnorrkel 0.10.2", @@ -11640,7 +14668,7 @@ dependencies = [ "siphasher", "slab", "smallvec", - "soketto", + "soketto 0.7.1", "twox-hash", "wasmi", "x25519-dalek 2.0.1", @@ -11672,7 +14700,7 @@ dependencies = [ "no-std-net", "parking_lot 0.12.3", "pin-project", - "rand", + "rand 0.8.5", "rand_chacha 0.3.1", "serde", "serde_json", @@ -11703,7 +14731,7 @@ dependencies = [ "ring 0.17.8", "rustc_version", "sha2 0.10.8", - "subtle 2.4.1", + "subtle 2.6.1", ] [[package]] @@ -11736,42 +14764,95 @@ dependencies = [ "bytes", "flate2", "futures", - "http", + "http 0.2.12", + "httparse", + "log", + "rand 0.8.5", + "sha-1 0.9.8", +] + +[[package]] +name = "soketto" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37468c595637c10857701c990f93a40ce0e357cedb0953d1c26c8d8027f9bb53" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures", + "http 1.1.0", "httparse", "log", - "rand", - "sha-1", + "rand 0.8.5", + "sha1", ] [[package]] name = "sp-api" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "hash-db", + "log", + "parity-scale-codec", + "scale-info", + "sp-api-proc-macro 15.0.0", + "sp-core 28.0.0", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-metadata-ir 0.6.0", + "sp-runtime 31.0.1", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-state-machine 0.35.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-trie 29.0.0", + "sp-version 29.0.0", + "thiserror", +] + +[[package]] +name = "sp-api" +version = "34.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ + "docify", "hash-db", "log", "parity-scale-codec", "scale-info", - "sp-api-proc-macro", - "sp-core", - "sp-externalities 0.19.0", - "sp-metadata-ir", - "sp-runtime", - "sp-state-machine", - "sp-std 8.0.0", - "sp-trie", - "sp-version", + "sp-api-proc-macro 20.0.0", + "sp-core 34.0.0", + "sp-externalities 0.29.0", + "sp-metadata-ir 0.7.0", + "sp-runtime 39.0.0", + "sp-runtime-interface 28.0.0", + "sp-state-machine 0.43.0", + "sp-trie 37.0.0", + "sp-version 37.0.0", "thiserror", ] [[package]] name = "sp-api-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "15.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "Inflector", + "blake2 0.10.6", + "expander", + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "sp-api-proc-macro" +version = "20.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "Inflector", "blake2 0.10.6", - "expander 2.2.1", + "expander", "proc-macro-crate 3.1.0", "proc-macro2", "quote", @@ -11780,28 +14861,55 @@ dependencies = [ [[package]] name = "sp-application-crypto" +version = "30.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", +] + +[[package]] +name = "sp-application-crypto" +version = "38.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 34.0.0", + "sp-io 38.0.0", +] + +[[package]] +name = "sp-arithmetic" version = "23.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ + "docify", + "integer-sqrt", + "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-std 8.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "static_assertions", ] [[package]] name = "sp-arithmetic" -version = "16.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ + "docify", "integer-sqrt", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-std 8.0.0", "static_assertions", ] @@ -11825,186 +14933,300 @@ dependencies = [ [[package]] name = "sp-authority-discovery" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "parity-scale-codec", + "scale-info", + "sp-api 26.0.0", + "sp-application-crypto 30.0.0", + "sp-runtime 31.0.1", +] + +[[package]] +name = "sp-authority-discovery" +version = "34.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "parity-scale-codec", "scale-info", - "sp-api", - "sp-application-crypto", - "sp-runtime", - "sp-std 8.0.0", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "sp-block-builder" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "sp-api 26.0.0", + "sp-inherents 26.0.0", + "sp-runtime 31.0.1", +] + +[[package]] +name = "sp-block-builder" +version = "34.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "sp-api", - "sp-inherents", - "sp-runtime", - "sp-std 8.0.0", + "sp-api 34.0.0", + "sp-inherents 34.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "sp-blockchain" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "futures", "log", "parity-scale-codec", "parking_lot 0.12.3", "schnellru", - "sp-api", - "sp-consensus", - "sp-database", - "sp-runtime", - "sp-state-machine", + "sp-api 26.0.0", + "sp-consensus 0.32.0", + "sp-database 10.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-runtime 31.0.1", + "sp-state-machine 0.35.0", + "thiserror", +] + +[[package]] +name = "sp-blockchain" +version = "37.0.1" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" +dependencies = [ + "futures", + "parity-scale-codec", + "parking_lot 0.12.3", + "schnellru", + "sp-api 34.0.0", + "sp-consensus 0.40.0", + "sp-core 34.0.0", + "sp-database 10.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-runtime 39.0.0", + "sp-state-machine 0.43.0", "thiserror", + "tracing", ] [[package]] name = "sp-consensus" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.32.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "async-trait", "futures", "log", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-state-machine", + "sp-core 28.0.0", + "sp-inherents 26.0.0", + "sp-runtime 31.0.1", + "sp-state-machine 0.35.0", "thiserror", ] [[package]] -name = "sp-consensus-aura" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +name = "sp-consensus" +version = "0.40.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "async-trait", - "parity-scale-codec", - "scale-info", - "sp-api", - "sp-application-crypto", - "sp-consensus-slots", - "sp-inherents", - "sp-runtime", - "sp-std 8.0.0", - "sp-timestamp", + "futures", + "log", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-runtime 39.0.0", + "sp-state-machine 0.43.0", + "thiserror", ] [[package]] -name = "sp-consensus-babe" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +name = "sp-consensus-aura" +version = "0.32.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "async-trait", "parity-scale-codec", "scale-info", - "serde", - "sp-api", - "sp-application-crypto", - "sp-consensus-slots", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-std 8.0.0", - "sp-timestamp", + "sp-api 26.0.0", + "sp-application-crypto 30.0.0", + "sp-consensus-slots 0.32.0", + "sp-inherents 26.0.0", + "sp-runtime 31.0.1", + "sp-timestamp 26.0.0", +] + +[[package]] +name = "sp-consensus-aura" +version = "0.40.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" +dependencies = [ + "async-trait", + "parity-scale-codec", + "scale-info", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-consensus-slots 0.40.0", + "sp-inherents 34.0.0", + "sp-runtime 39.0.0", + "sp-timestamp 34.0.0", +] + +[[package]] +name = "sp-consensus-babe" +version = "0.32.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "async-trait", + "parity-scale-codec", + "scale-info", + "serde", + "sp-api 26.0.0", + "sp-application-crypto 30.0.0", + "sp-consensus-slots 0.32.0", + "sp-core 28.0.0", + "sp-inherents 26.0.0", + "sp-runtime 31.0.1", + "sp-timestamp 26.0.0", +] + +[[package]] +name = "sp-consensus-babe" +version = "0.40.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" +dependencies = [ + "async-trait", + "parity-scale-codec", + "scale-info", + "serde", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-consensus-slots 0.40.0", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-runtime 39.0.0", + "sp-timestamp 34.0.0", ] [[package]] name = "sp-consensus-beefy" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "22.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "lazy_static", "parity-scale-codec", "scale-info", "serde", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-io", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-core 34.0.0", + "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-io 38.0.0", + "sp-keystore 0.40.0", "sp-mmr-primitives", - "sp-runtime", - "sp-std 8.0.0", - "strum 0.24.1", + "sp-runtime 39.0.0", + "strum 0.26.3", ] [[package]] name = "sp-consensus-grandpa" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "13.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "finality-grandpa", "log", "parity-scale-codec", "scale-info", "serde", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-keystore", - "sp-runtime", - "sp-std 8.0.0", + "sp-api 26.0.0", + "sp-application-crypto 30.0.0", + "sp-core 28.0.0", + "sp-keystore 0.34.0", + "sp-runtime 31.0.1", +] + +[[package]] +name = "sp-consensus-grandpa" +version = "21.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" +dependencies = [ + "finality-grandpa", + "log", + "parity-scale-codec", + "scale-info", + "serde", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-core 34.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.0", +] + +[[package]] +name = "sp-consensus-slots" +version = "0.32.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-timestamp 26.0.0", ] [[package]] name = "sp-consensus-slots" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.40.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-std 8.0.0", - "sp-timestamp", + "sp-timestamp 34.0.0", ] [[package]] name = "sp-core" -version = "21.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ - "array-bytes 6.2.3", + "array-bytes", "bandersnatch_vrfs", - "bip39", "bitflags 1.3.2", "blake2 0.10.6", "bounded-collections", "bs58 0.5.1", "dyn-clonable", - "ed25519-zebra 3.1.0", + "ed25519-zebra", "futures", "hash-db", "hash256-std-hasher", "impl-serde", - "itertools 0.10.5", + "itertools 0.11.0", + "k256", "libsecp256k1", "log", "merlin", + "parity-bip39", "parity-scale-codec", "parking_lot 0.12.3", "paste", "primitive-types", - "rand", + "rand 0.8.5", "scale-info", "schnorrkel 0.11.4", "secp256k1", "secrecy", "serde", - "sp-core-hashing", - "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-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", "ss58-registry", - "substrate-bip39", + "substrate-bip39 0.4.7", "thiserror", "tracing", "w3f-bls", @@ -12012,26 +15234,49 @@ dependencies = [ ] [[package]] -name = "sp-core-hashing" -version = "9.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" -dependencies = [ - "blake2b_simd", - "byteorder", - "digest 0.10.7", - "sha2 0.10.8", - "sha3", - "twox-hash", -] - -[[package]] -name = "sp-core-hashing-proc-macro" -version = "9.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +name = "sp-core" +version = "34.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ - "quote", - "sp-core-hashing", - "syn 2.0.68", + "array-bytes", + "bitflags 1.3.2", + "blake2 0.10.6", + "bounded-collections", + "bs58 0.5.1", + "dyn-clonable", + "ed25519-zebra", + "futures", + "hash-db", + "hash256-std-hasher", + "impl-serde", + "itertools 0.11.0", + "k256", + "libsecp256k1", + "log", + "merlin", + "parity-bip39", + "parity-scale-codec", + "parking_lot 0.12.3", + "paste", + "primitive-types", + "rand 0.8.5", + "scale-info", + "schnorrkel 0.11.4", + "secp256k1", + "secrecy", + "serde", + "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-externalities 0.29.0", + "sp-runtime-interface 28.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-storage 21.0.0", + "ss58-registry", + "substrate-bip39 0.6.0", + "thiserror", + "tracing", + "w3f-bls", + "zeroize", ] [[package]] @@ -12051,13 +15296,68 @@ dependencies = [ "ark-ed-on-bls12-381-bandersnatch", "ark-ed-on-bls12-381-bandersnatch-ext", "ark-scale", - "sp-runtime-interface 24.0.0", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk)", +] + +[[package]] +name = "sp-crypto-hashing" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" +dependencies = [ + "blake2b_simd", + "byteorder", + "digest 0.10.7", + "sha2 0.10.8", + "sha3", + "twox-hash", +] + +[[package]] +name = "sp-crypto-hashing" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "blake2b_simd", + "byteorder", + "digest 0.10.7", + "sha2 0.10.8", + "sha3", + "twox-hash", +] + +[[package]] +name = "sp-crypto-hashing-proc-macro" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" +dependencies = [ + "quote", + "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "syn 2.0.68", +] + +[[package]] +name = "sp-crypto-hashing-proc-macro" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "quote", + "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "syn 2.0.68", ] [[package]] name = "sp-database" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "10.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" +dependencies = [ + "kvdb", + "parking_lot 0.12.3", +] + +[[package]] +name = "sp-database" +version = "10.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "kvdb", "parking_lot 0.12.3", @@ -12065,8 +15365,18 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "8.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "14.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "sp-debug-derive" +version = "14.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "proc-macro2", "quote", @@ -12085,13 +15395,12 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.19.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.25.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "environmental", "parity-scale-codec", - "sp-std 8.0.0", - "sp-storage 13.0.0", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", ] [[package]] @@ -12101,84 +15410,176 @@ source = "git+https://github.com/paritytech/polkadot-sdk#60d21e9c4314d5144c9ebdd dependencies = [ "environmental", "parity-scale-codec", - "sp-storage 19.0.0", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk)", +] + +[[package]] +name = "sp-externalities" +version = "0.29.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" +dependencies = [ + "environmental", + "parity-scale-codec", + "sp-storage 21.0.0", ] [[package]] name = "sp-genesis-builder" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.8.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ + "parity-scale-codec", + "scale-info", "serde_json", - "sp-api", - "sp-runtime", - "sp-std 8.0.0", + "sp-api 26.0.0", + "sp-runtime 31.0.1", +] + +[[package]] +name = "sp-genesis-builder" +version = "0.15.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde_json", + "sp-api 34.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "sp-inherents" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std 8.0.0", + "sp-runtime 31.0.1", + "thiserror", +] + +[[package]] +name = "sp-inherents" +version = "34.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" +dependencies = [ + "async-trait", + "impl-trait-for-tuples", + "parity-scale-codec", + "scale-info", + "sp-runtime 39.0.0", "thiserror", ] [[package]] name = "sp-io" -version = "23.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "30.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "bytes", - "ed25519-dalek", + "ed25519-dalek 2.1.1", + "libsecp256k1", + "log", + "parity-scale-codec", + "polkavm-derive", + "rustversion", + "secp256k1", + "sp-core 28.0.0", + "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-keystore 0.34.0", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-state-machine 0.35.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-trie 29.0.0", + "tracing", + "tracing-core", +] + +[[package]] +name = "sp-io" +version = "38.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" +dependencies = [ + "bytes", + "docify", + "ed25519-dalek 2.1.1", "libsecp256k1", "log", "parity-scale-codec", + "polkavm-derive", "rustversion", "secp256k1", - "sp-core", - "sp-externalities 0.19.0", - "sp-keystore", - "sp-runtime-interface 17.0.0", - "sp-state-machine", - "sp-std 8.0.0", - "sp-tracing 10.0.0", - "sp-trie", + "sp-core 34.0.0", + "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-externalities 0.29.0", + "sp-keystore 0.40.0", + "sp-runtime-interface 28.0.0", + "sp-state-machine 0.43.0", + "sp-tracing 17.0.0", + "sp-trie 37.0.0", "tracing", "tracing-core", ] [[package]] name = "sp-keyring" -version = "24.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "31.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ - "sp-core", - "sp-runtime", - "strum 0.24.1", + "sp-core 28.0.0", + "sp-runtime 31.0.1", + "strum 0.26.3", +] + +[[package]] +name = "sp-keyring" +version = "39.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" +dependencies = [ + "sp-core 34.0.0", + "sp-runtime 39.0.0", + "strum 0.26.3", ] [[package]] name = "sp-keystore" -version = "0.27.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.34.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", - "sp-core", - "sp-externalities 0.19.0", + "sp-core 28.0.0", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", +] + +[[package]] +name = "sp-keystore" +version = "0.40.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" +dependencies = [ + "parity-scale-codec", + "parking_lot 0.12.3", + "sp-core 34.0.0", + "sp-externalities 0.29.0", +] + +[[package]] +name = "sp-maybe-compressed-blob" +version = "11.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" +dependencies = [ "thiserror", + "zstd 0.12.4", ] [[package]] name = "sp-maybe-compressed-blob" -version = "4.1.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "11.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "thiserror", "zstd 0.12.4", @@ -12186,73 +15587,110 @@ dependencies = [ [[package]] name = "sp-metadata-ir" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.6.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "frame-metadata", + "parity-scale-codec", + "scale-info", +] + +[[package]] +name = "sp-metadata-ir" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "frame-metadata", "parity-scale-codec", "scale-info", - "sp-std 8.0.0", ] [[package]] name = "sp-mixnet" -version = "0.1.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.4.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "parity-scale-codec", + "scale-info", + "sp-api 26.0.0", + "sp-application-crypto 30.0.0", +] + +[[package]] +name = "sp-mixnet" +version = "0.12.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "parity-scale-codec", "scale-info", - "sp-api", - "sp-application-crypto", - "sp-std 8.0.0", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", ] [[package]] name = "sp-mmr-primitives" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "34.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "ckb-merkle-mountain-range", "log", "parity-scale-codec", + "polkadot-ckb-merkle-mountain-range", "scale-info", "serde", - "sp-api", - "sp-core", - "sp-debug-derive 8.0.0", - "sp-runtime", - "sp-std 8.0.0", + "sp-api 34.0.0", + "sp-core 34.0.0", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-runtime 39.0.0", "thiserror", ] [[package]] name = "sp-npos-elections" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "34.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-core", - "sp-runtime", - "sp-std 8.0.0", + "sp-arithmetic 26.0.0", + "sp-core 34.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "sp-offchain" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "sp-api 26.0.0", + "sp-core 28.0.0", + "sp-runtime 31.0.1", +] + +[[package]] +name = "sp-offchain" +version = "34.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "sp-api", - "sp-core", - "sp-runtime", + "sp-api 34.0.0", + "sp-core 34.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "sp-panic-handler" -version = "8.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "13.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" +dependencies = [ + "backtrace", + "lazy_static", + "regex", +] + +[[package]] +name = "sp-panic-handler" +version = "13.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "backtrace", "lazy_static", @@ -12261,53 +15699,91 @@ dependencies = [ [[package]] name = "sp-rpc" -version = "6.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "rustc-hash", "serde", - "sp-core", + "sp-core 28.0.0", +] + +[[package]] +name = "sp-rpc" +version = "32.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" +dependencies = [ + "rustc-hash", + "serde", + "sp-core 34.0.0", ] [[package]] name = "sp-runtime" -version = "24.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "31.0.1" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "docify", "either", "hash256-std-hasher", "impl-trait-for-tuples", "log", + "num-traits", "parity-scale-codec", "paste", - "rand", + "rand 0.8.5", "scale-info", "serde", "simple-mermaid", - "sp-application-crypto", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-std 8.0.0", - "sp-weights", + "sp-application-crypto 30.0.0", + "sp-arithmetic 23.0.0", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-weights 27.0.0", +] + +[[package]] +name = "sp-runtime" +version = "39.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" +dependencies = [ + "docify", + "either", + "hash256-std-hasher", + "impl-trait-for-tuples", + "log", + "num-traits", + "parity-scale-codec", + "paste", + "rand 0.8.5", + "scale-info", + "serde", + "simple-mermaid", + "sp-application-crypto 38.0.0", + "sp-arithmetic 26.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-weights 31.0.0", + "tracing", ] [[package]] name = "sp-runtime-interface" -version = "17.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "24.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", + "polkavm-derive", "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 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", "static_assertions", ] @@ -12321,22 +15797,41 @@ dependencies = [ "parity-scale-codec", "polkavm-derive", "primitive-types", - "sp-externalities 0.25.0", - "sp-runtime-interface-proc-macro 17.0.0", - "sp-std 14.0.0", - "sp-storage 19.0.0", - "sp-tracing 16.0.0", - "sp-wasm-interface 20.0.0", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk)", + "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/paritytech/polkadot-sdk)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk)", + "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk)", + "static_assertions", +] + +[[package]] +name = "sp-runtime-interface" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" +dependencies = [ + "bytes", + "impl-trait-for-tuples", + "parity-scale-codec", + "polkavm-derive", + "primitive-types", + "sp-externalities 0.29.0", + "sp-runtime-interface-proc-macro 18.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-storage 21.0.0", + "sp-tracing 17.0.0", + "sp-wasm-interface 21.0.0", "static_assertions", ] [[package]] name = "sp-runtime-interface-proc-macro" -version = "11.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "Inflector", - "expander 2.2.1", + "expander", "proc-macro-crate 3.1.0", "proc-macro2", "quote", @@ -12349,7 +15844,20 @@ version = "17.0.0" source = "git+https://github.com/paritytech/polkadot-sdk#60d21e9c4314d5144c9ebdd4fd851ee5f06b0f0d" dependencies = [ "Inflector", - "expander 2.2.1", + "expander", + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "sp-runtime-interface-proc-macro" +version = "18.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" +dependencies = [ + "Inflector", + "expander", "proc-macro-crate 3.1.0", "proc-macro2", "quote", @@ -12358,82 +15866,155 @@ dependencies = [ [[package]] name = "sp-session" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "27.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "parity-scale-codec", + "scale-info", + "sp-api 26.0.0", + "sp-core 28.0.0", + "sp-keystore 0.34.0", + "sp-runtime 31.0.1", + "sp-staking 26.0.0", +] + +[[package]] +name = "sp-session" +version = "35.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "parity-scale-codec", "scale-info", - "sp-api", - "sp-core", - "sp-keystore", - "sp-runtime", - "sp-staking", - "sp-std 8.0.0", + "sp-api 34.0.0", + "sp-core 34.0.0", + "sp-keystore 0.40.0", + "sp-runtime 39.0.0", + "sp-staking 34.0.0", ] [[package]] name = "sp-staking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-runtime", - "sp-std 8.0.0", + "sp-core 28.0.0", + "sp-runtime 31.0.1", +] + +[[package]] +name = "sp-staking" +version = "34.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" +dependencies = [ + "impl-trait-for-tuples", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 34.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "sp-state-machine" -version = "0.28.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.35.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "hash-db", "log", "parity-scale-codec", - "parking_lot 0.12.3", - "rand", - "smallvec", - "sp-core", - "sp-externalities 0.19.0", - "sp-panic-handler", - "sp-std 8.0.0", - "sp-trie", + "parking_lot 0.12.3", + "rand 0.8.5", + "smallvec", + "sp-core 28.0.0", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-panic-handler 13.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-trie 29.0.0", + "thiserror", + "tracing", + "trie-db", +] + +[[package]] +name = "sp-state-machine" +version = "0.43.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" +dependencies = [ + "hash-db", + "log", + "parity-scale-codec", + "parking_lot 0.12.3", + "rand 0.8.5", + "smallvec", + "sp-core 34.0.0", + "sp-externalities 0.29.0", + "sp-panic-handler 13.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-trie 37.0.0", + "thiserror", + "tracing", + "trie-db", +] + +[[package]] +name = "sp-statement-store" +version = "10.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "aes-gcm", + "curve25519-dalek 4.1.3", + "ed25519-dalek 2.1.1", + "hkdf", + "parity-scale-codec", + "rand 0.8.5", + "scale-info", + "sha2 0.10.8", + "sp-api 26.0.0", + "sp-application-crypto 30.0.0", + "sp-core 28.0.0", + "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-runtime 31.0.1", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", "thiserror", - "tracing", - "trie-db", + "x25519-dalek 2.0.1", ] [[package]] name = "sp-statement-store" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "18.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "aes-gcm", "curve25519-dalek 4.1.3", - "ed25519-dalek", + "ed25519-dalek 2.1.1", "hkdf", "parity-scale-codec", - "rand", + "rand 0.8.5", "scale-info", "sha2 0.10.8", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-externalities 0.19.0", - "sp-runtime", - "sp-runtime-interface 17.0.0", - "sp-std 8.0.0", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-core 34.0.0", + "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-externalities 0.29.0", + "sp-runtime 39.0.0", + "sp-runtime-interface 28.0.0", "thiserror", "x25519-dalek 2.0.1", ] [[package]] name = "sp-std" -version = "8.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "14.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" + +[[package]] +name = "sp-std" +version = "14.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" [[package]] name = "sp-std" @@ -12442,15 +16023,14 @@ source = "git+https://github.com/paritytech/polkadot-sdk#60d21e9c4314d5144c9ebdd [[package]] name = "sp-storage" -version = "13.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "19.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "impl-serde", "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 8.0.0", - "sp-std 8.0.0", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", ] [[package]] @@ -12462,32 +16042,54 @@ dependencies = [ "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 14.0.0", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk)", +] + +[[package]] +name = "sp-storage" +version = "21.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "ref-cast", + "serde", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", ] [[package]] name = "sp-timestamp" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "async-trait", + "parity-scale-codec", + "sp-inherents 26.0.0", + "sp-runtime 31.0.1", + "thiserror", +] + +[[package]] +name = "sp-timestamp" +version = "34.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "async-trait", "parity-scale-codec", - "sp-inherents", - "sp-runtime", - "sp-std 8.0.0", + "sp-inherents 34.0.0", + "sp-runtime 39.0.0", "thiserror", ] [[package]] name = "sp-tracing" -version = "10.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "16.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "parity-scale-codec", - "sp-std 8.0.0", "tracing", "tracing-core", - "tracing-subscriber 0.2.25", + "tracing-subscriber", ] [[package]] @@ -12498,51 +16100,106 @@ dependencies = [ "parity-scale-codec", "tracing", "tracing-core", - "tracing-subscriber 0.3.18", + "tracing-subscriber", +] + +[[package]] +name = "sp-tracing" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" +dependencies = [ + "parity-scale-codec", + "tracing", + "tracing-core", + "tracing-subscriber", ] [[package]] name = "sp-transaction-pool" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "sp-api 26.0.0", + "sp-runtime 31.0.1", +] + +[[package]] +name = "sp-transaction-pool" +version = "34.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "sp-api", - "sp-runtime", + "sp-api 34.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "sp-transaction-storage-proof" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "async-trait", + "parity-scale-codec", + "scale-info", + "sp-core 28.0.0", + "sp-inherents 26.0.0", + "sp-runtime 31.0.1", + "sp-trie 29.0.0", +] + +[[package]] +name = "sp-transaction-storage-proof" +version = "34.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "async-trait", "parity-scale-codec", "scale-info", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-std 8.0.0", - "sp-trie", + "sp-core 34.0.0", + "sp-inherents 34.0.0", + "sp-runtime 39.0.0", + "sp-trie 37.0.0", ] [[package]] name = "sp-trie" -version = "22.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "29.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "ahash", + "hash-db", + "lazy_static", + "memory-db", + "nohash-hasher", + "parity-scale-codec", + "parking_lot 0.12.3", + "rand 0.8.5", + "scale-info", + "schnellru", + "sp-core 28.0.0", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "thiserror", + "tracing", + "trie-db", + "trie-root", +] + +[[package]] +name = "sp-trie" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ - "ahash 0.8.11", + "ahash", "hash-db", "lazy_static", "memory-db", "nohash-hasher", "parity-scale-codec", "parking_lot 0.12.3", - "rand", + "rand 0.8.5", "scale-info", "schnellru", - "sp-core", - "sp-externalities 0.19.0", - "sp-std 8.0.0", + "sp-core 34.0.0", + "sp-externalities 0.29.0", "thiserror", "tracing", "trie-db", @@ -12551,25 +16208,42 @@ dependencies = [ [[package]] name = "sp-version" -version = "22.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "29.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "parity-wasm", + "scale-info", + "serde", + "sp-crypto-hashing-proc-macro 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-runtime 31.0.1", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-version-proc-macro 13.0.0", + "thiserror", +] + +[[package]] +name = "sp-version" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "impl-serde", "parity-scale-codec", "parity-wasm", "scale-info", "serde", - "sp-core-hashing-proc-macro", - "sp-runtime", - "sp-std 8.0.0", - "sp-version-proc-macro", + "sp-crypto-hashing-proc-macro 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-runtime 39.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-version-proc-macro 14.0.0", "thiserror", ] [[package]] name = "sp-version-proc-macro" -version = "8.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "13.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -12578,15 +16252,25 @@ dependencies = [ ] [[package]] -name = "sp-wasm-interface" +name = "sp-version-proc-macro" version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" +dependencies = [ + "parity-scale-codec", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "sp-wasm-interface" +version = "20.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "anyhow", "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std 8.0.0", "wasmtime", ] @@ -12600,19 +16284,44 @@ dependencies = [ "parity-scale-codec", ] +[[package]] +name = "sp-wasm-interface" +version = "21.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" +dependencies = [ + "anyhow", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "wasmtime", +] + [[package]] name = "sp-weights" -version = "20.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "27.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "bounded-collections", + "parity-scale-codec", + "scale-info", + "serde", + "smallvec", + "sp-arithmetic 23.0.0", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", +] + +[[package]] +name = "sp-weights" +version = "31.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "bounded-collections", "parity-scale-codec", "scale-info", "serde", "smallvec", - "sp-arithmetic", - "sp-debug-derive 8.0.0", - "sp-std 8.0.0", + "sp-arithmetic 26.0.0", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", ] [[package]] @@ -12638,6 +16347,15 @@ dependencies = [ "strum 0.24.1", ] +[[package]] +name = "spinning_top" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" +dependencies = [ + "lock_api", +] + [[package]] name = "spki" version = "0.7.3" @@ -12671,24 +16389,41 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "staging-parachain-info" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.16.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "cumulus-primitives-core", - "frame-support", + "cumulus-primitives-core 0.15.0", + "frame-support 37.0.0", "frame-system", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std 8.0.0", + "sp-runtime 39.0.0", ] [[package]] name = "staging-xcm" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "array-bytes", + "bounded-collections", + "derivative", + "environmental", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "scale-info", + "serde", + "sp-weights 27.0.0", + "xcm-procedural 7.0.0", +] + +[[package]] +name = "staging-xcm" +version = "14.1.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ - "array-bytes 6.2.3", + "array-bytes", "bounded-collections", "derivative", "environmental", @@ -12697,51 +16432,49 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-weights", - "xcm-procedural", + "sp-weights 31.0.0", + "xcm-procedural 10.1.0", ] [[package]] name = "staging-xcm-builder" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "16.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ - "frame-support", + "frame-support 37.0.0", "frame-system", "impl-trait-for-tuples", "log", "pallet-transaction-payment", "parity-scale-codec", - "polkadot-parachain-primitives", + "polkadot-parachain-primitives 14.0.0", "scale-info", - "sp-arithmetic", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", - "sp-weights", - "staging-xcm", + "sp-arithmetic 26.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-weights 31.0.0", + "staging-xcm 14.1.0", "staging-xcm-executor", ] [[package]] name = "staging-xcm-executor" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "16.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "environmental", "frame-benchmarking", - "frame-support", + "frame-support 37.0.0", "impl-trait-for-tuples", - "log", "parity-scale-codec", "scale-info", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std 8.0.0", - "sp-weights", - "staging-xcm", + "sp-arithmetic 26.0.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-runtime 39.0.0", + "sp-weights 31.0.0", + "staging-xcm 14.1.0", + "tracing", ] [[package]] @@ -12778,6 +16511,46 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "str0m" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3f10d3f68e60168d81110410428a435dbde28cc5525f5f7c6fdec92dbdc2800" +dependencies = [ + "combine", + "crc", + "hmac 0.12.1", + "once_cell", + "openssl", + "openssl-sys", + "rand 0.8.5", + "sctp-proto 0.1.7", + "serde", + "sha-1 0.10.1", + "thiserror", + "tracing", +] + +[[package]] +name = "str0m" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6706347e49b13373f7ddfafad47df7583ed52083d6fc8a594eb2c80497ef959d" +dependencies = [ + "combine", + "crc", + "fastrand 2.1.0", + "hmac 0.12.1", + "once_cell", + "openssl", + "openssl-sys", + "sctp-proto 0.2.2", + "serde", + "sha-1 0.10.1", + "thiserror", + "tracing", +] + [[package]] name = "strobe-rs" version = "0.8.1" @@ -12787,7 +16560,7 @@ dependencies = [ "bitflags 1.3.2", "byteorder", "keccak", - "subtle 2.4.1", + "subtle 2.6.1", "zeroize", ] @@ -12806,11 +16579,20 @@ dependencies = [ "strum_macros 0.24.3", ] +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" + [[package]] name = "strum" version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros 0.26.4", +] [[package]] name = "strum_macros" @@ -12825,6 +16607,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "strum_macros" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.68", +] + [[package]] name = "strum_macros" version = "0.26.4" @@ -12840,47 +16635,73 @@ dependencies = [ [[package]] name = "substrate-bip39" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a7590dc041b9bc2825e52ce5af8416c73dbe9d0654402bfd4b4941938b94d8f" +version = "0.4.7" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ - "hmac 0.11.0", - "pbkdf2 0.8.0", + "hmac 0.12.1", + "pbkdf2", "schnorrkel 0.11.4", - "sha2 0.9.9", + "sha2 0.10.8", + "zeroize", +] + +[[package]] +name = "substrate-bip39" +version = "0.6.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" +dependencies = [ + "hmac 0.12.1", + "pbkdf2", + "schnorrkel 0.11.4", + "sha2 0.10.8", "zeroize", ] [[package]] name = "substrate-build-script-utils" -version = "3.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "11.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" [[package]] name = "substrate-frame-rpc-system" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "38.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ + "docify", "frame-system-rpc-runtime-api", "futures", - "jsonrpsee", + "jsonrpsee 0.23.2", "log", "parity-scale-codec", - "sc-rpc-api", - "sc-transaction-pool-api", - "sp-api", - "sp-block-builder", - "sp-blockchain", - "sp-core", - "sp-runtime", + "sc-rpc-api 0.43.0", + "sc-transaction-pool-api 37.0.0", + "sp-api 34.0.0", + "sp-block-builder 34.0.0", + "sp-blockchain 37.0.1", + "sp-core 34.0.0", + "sp-runtime 39.0.0", +] + +[[package]] +name = "substrate-prometheus-endpoint" +version = "0.17.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" +dependencies = [ + "http-body-util", + "hyper 1.4.1", + "hyper-util", + "log", + "prometheus", + "thiserror", + "tokio", ] [[package]] name = "substrate-prometheus-endpoint" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.17.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ - "hyper", + "hyper 0.14.29", "log", "prometheus", "thiserror", @@ -12889,55 +16710,56 @@ dependencies = [ [[package]] name = "substrate-rpc-client" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.33.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ "async-trait", - "jsonrpsee", + "jsonrpsee 0.22.5", "log", - "sc-rpc-api", + "sc-rpc-api 0.33.0", "serde", - "sp-runtime", + "sp-runtime 31.0.1", ] [[package]] name = "substrate-state-trie-migration-rpc" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "jsonrpsee", + "jsonrpsee 0.23.2", "parity-scale-codec", - "sc-client-api", - "sc-rpc-api", + "sc-client-api 37.0.0", + "sc-rpc-api 0.43.0", "serde", - "sp-core", - "sp-runtime", - "sp-state-machine", - "sp-trie", + "sp-core 34.0.0", + "sp-runtime 39.0.0", + "sp-state-machine 0.43.0", + "sp-trie 37.0.0", "trie-db", ] [[package]] name = "substrate-wasm-builder" -version = "5.0.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "24.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "ansi_term", - "array-bytes 6.2.3", + "array-bytes", "build-helper", "cargo_metadata", + "console", "filetime", "frame-metadata", "merkleized-metadata", "parity-scale-codec", "parity-wasm", - "sc-executor", - "sp-core", - "sp-io", - "sp-maybe-compressed-blob", - "sp-tracing 10.0.0", - "sp-version", - "strum 0.24.1", + "polkavm-linker", + "sc-executor 0.40.0", + "sp-core 34.0.0", + "sp-io 38.0.0", + "sp-maybe-compressed-blob 11.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", + "sp-tracing 17.0.0", + "sp-version 37.0.0", + "strum 0.26.3", "tempfile", "toml 0.8.14", "walkdir", @@ -12952,9 +16774,9 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" [[package]] name = "subtle" -version = "2.4.1" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "subtle-ng" @@ -13265,20 +17087,42 @@ dependencies = [ name = "tokio-retry" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" +checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" +dependencies = [ + "pin-project", + "rand 0.8.5", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.12", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "pin-project", - "rand", + "rustls 0.22.4", + "rustls-pki-types", "tokio", ] [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.21.12", + "rustls 0.23.13", + "rustls-pki-types", "tokio", ] @@ -13294,6 +17138,21 @@ dependencies = [ "tokio-util", ] +[[package]] +name = "tokio-tungstenite" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" +dependencies = [ + "futures-util", + "log", + "rustls 0.21.12", + "rustls-native-certs 0.6.3", + "tokio", + "tokio-rustls 0.24.1", + "tungstenite", +] + [[package]] name = "tokio-util" version = "0.7.11" @@ -13379,6 +17238,11 @@ version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite 0.2.14", + "tokio", "tower-layer", "tower-service", "tracing", @@ -13394,14 +17258,30 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http", - "http-body", + "http 0.2.12", + "http-body 0.4.6", "http-range-header", "pin-project-lite 0.2.14", "tower-layer", "tower-service", ] +[[package]] +name = "tower-http" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" +dependencies = [ + "bitflags 2.5.0", + "bytes", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "pin-project-lite 0.2.14", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.2" @@ -13459,21 +17339,32 @@ dependencies = [ [[package]] name = "tracing-gum" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "coarsetime", + "polkadot-primitives 7.0.0", + "tracing", + "tracing-gum-proc-macro 5.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", +] + +[[package]] +name = "tracing-gum" +version = "15.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "coarsetime", - "polkadot-primitives", + "polkadot-primitives 15.0.0", "tracing", - "tracing-gum-proc-macro", + "tracing-gum-proc-macro 5.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407)", ] [[package]] name = "tracing-gum-proc-macro" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "5.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "expander 2.2.1", + "expander", "proc-macro-crate 3.1.0", "proc-macro2", "quote", @@ -13481,14 +17372,15 @@ dependencies = [ ] [[package]] -name = "tracing-log" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +name = "tracing-gum-proc-macro" +version = "5.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" dependencies = [ - "log", - "once_cell", - "tracing-core", + "expander", + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.68", ] [[package]] @@ -13502,65 +17394,32 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "tracing-serde" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" -dependencies = [ - "serde", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" -dependencies = [ - "ansi_term", - "chrono", - "lazy_static", - "matchers 0.0.1", - "parking_lot 0.11.2", - "regex", - "serde", - "serde_json", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log 0.1.4", - "tracing-serde", -] - [[package]] name = "tracing-subscriber" version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ - "matchers 0.1.0", + "matchers", "nu-ansi-term", "once_cell", + "parking_lot 0.12.3", "regex", "sharded-slab", "smallvec", "thread_local", "tracing", "tracing-core", - "tracing-log 0.2.0", + "tracing-log", ] [[package]] name = "trie-db" -version = "0.28.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff28e0f815c2fea41ebddf148e008b077d2faddb026c9555b29696114d602642" +checksum = "0c992b4f40c234a074d48a757efeabb1a6be88af84c0c23f7ca158950cb0ae7f" dependencies = [ "hash-db", - "hashbrown 0.13.2", "log", "rustc-hex", "smallvec", @@ -13584,14 +17443,14 @@ dependencies = [ "async-trait", "cfg-if", "data-encoding", - "enum-as-inner", + "enum-as-inner 0.5.1", "futures-channel", "futures-io", "futures-util", "idna 0.2.3", "ipnet", "lazy_static", - "rand", + "rand 0.8.5", "smallvec", "socket2 0.4.10", "thiserror", @@ -13601,6 +17460,31 @@ dependencies = [ "url", ] +[[package]] +name = "trust-dns-proto" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner 0.6.1", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.4.0", + "ipnet", + "once_cell", + "rand 0.8.5", + "smallvec", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + [[package]] name = "trust-dns-resolver" version = "0.22.0" @@ -13618,7 +17502,28 @@ dependencies = [ "thiserror", "tokio", "tracing", - "trust-dns-proto", + "trust-dns-proto 0.22.0", +] + +[[package]] +name = "trust-dns-resolver" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6" +dependencies = [ + "cfg-if", + "futures-util", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot 0.12.3", + "rand 0.8.5", + "resolv-conf", + "smallvec", + "thiserror", + "tokio", + "tracing", + "trust-dns-proto 0.23.2", ] [[package]] @@ -13629,37 +17534,69 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "try-runtime-cli" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "0.7.0" +source = "git+https://github.com/paritytech/try-runtime-cli#063cd172d44dc50769323937e14857e0ef9eae5b" +dependencies = [ + "clap", + "env_logger", + "frame-support 28.0.0", + "parity-scale-codec", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "sp-state-machine 0.35.0", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "tokio", + "try-runtime-core", +] + +[[package]] +name = "try-runtime-core" +version = "0.7.0" +source = "git+https://github.com/paritytech/try-runtime-cli#063cd172d44dc50769323937e14857e0ef9eae5b" dependencies = [ + "array-bytes", "async-trait", + "bytesize", "clap", + "cumulus-client-parachain-inherent 0.1.0", + "cumulus-primitives-core 0.7.0", + "cumulus-primitives-parachain-inherent 0.7.0", "frame-remote-externalities", + "frame-support 28.0.0", + "frame-try-runtime 0.34.0", "hex", + "itertools 0.11.0", "log", + "paris", "parity-scale-codec", - "sc-cli", - "sc-executor", + "polkadot-primitives 7.0.0", + "sc-cli 0.36.0", + "sc-executor 0.32.0", "serde", "serde_json", - "sp-api", - "sp-consensus-aura", - "sp-consensus-babe", - "sp-core", - "sp-debug-derive 8.0.0", - "sp-externalities 0.19.0", - "sp-inherents", - "sp-io", - "sp-keystore", - "sp-rpc", - "sp-runtime", - "sp-state-machine", - "sp-timestamp", - "sp-transaction-storage-proof", - "sp-version", - "sp-weights", + "similar-asserts", + "sp-api 26.0.0", + "sp-consensus-aura 0.32.0", + "sp-consensus-babe 0.32.0", + "sp-core 28.0.0", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-inherents 26.0.0", + "sp-io 30.0.0", + "sp-keystore 0.34.0", + "sp-rpc 26.0.0", + "sp-runtime 31.0.1", + "sp-state-machine 0.35.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03)", + "sp-timestamp 26.0.0", + "sp-transaction-storage-proof 26.0.0", + "sp-version 29.0.0", + "sp-weights 27.0.0", + "strum 0.25.0", + "strum_macros 0.25.3", "substrate-rpc-client", - "zstd 0.12.4", + "tokio", + "zstd 0.11.2+zstd.1.5.2", ] [[package]] @@ -13668,6 +17605,26 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df" +[[package]] +name = "tungstenite" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 0.2.12", + "httparse", + "log", + "rand 0.8.5", + "rustls 0.21.12", + "sha1", + "thiserror", + "url", + "utf-8", +] + [[package]] name = "twox-hash" version = "1.6.3" @@ -13676,7 +17633,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.7", - "rand", + "rand 0.7.3", "static_assertions", ] @@ -13725,6 +17682,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + [[package]] name = "unicode-width" version = "0.1.13" @@ -13744,7 +17707,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ "crypto-common", - "subtle 2.4.1", + "subtle 2.6.1", ] [[package]] @@ -13757,6 +17720,17 @@ dependencies = [ "bytes", "futures-io", "futures-util", + "tokio-util", +] + +[[package]] +name = "unsigned-varint" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06" +dependencies = [ + "bytes", + "tokio-util", ] [[package]] @@ -13782,6 +17756,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + [[package]] name = "utf8parse" version = "0.2.2" @@ -13827,7 +17807,7 @@ dependencies = [ "arrayref", "constcat", "digest 0.10.7", - "rand", + "rand 0.8.5", "rand_chacha 0.3.1", "rand_core 0.6.4", "sha2 0.10.8", @@ -13950,9 +17930,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-instrument" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa1dafb3e60065305741e83db35c6c2584bb3725b692b5b66148a38d72ace6cd" +checksum = "2a47ecb37b9734d1085eaa5ae1a81e60801fd8c28d4cabdd8aedb982021918bc" dependencies = [ "parity-wasm", ] @@ -14237,7 +18217,7 @@ dependencies = [ "memfd", "memoffset", "paste", - "rand", + "rand 0.8.5", "rustix 0.36.17", "wasmtime-asm-macros", "wasmtime-environ", @@ -14292,10 +18272,19 @@ version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +[[package]] +name = "webpki-roots" +version = "0.26.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "westend-runtime" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ "binary-merkle-tree", "bitvec", @@ -14303,12 +18292,12 @@ dependencies = [ "frame-election-provider-support", "frame-executive", "frame-metadata-hash-extension", - "frame-support", + "frame-support 37.0.0", "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", - "frame-try-runtime", - "hex-literal 0.4.1", + "frame-try-runtime 0.43.0", + "hex-literal", "log", "pallet-asset-rate", "pallet-authority-discovery", @@ -14320,6 +18309,7 @@ dependencies = [ "pallet-beefy-mmr", "pallet-collective", "pallet-conviction-voting", + "pallet-delegated-staking", "pallet-democracy", "pallet-election-provider-multi-phase", "pallet-election-provider-support-benchmarking", @@ -14327,7 +18317,6 @@ dependencies = [ "pallet-fast-unstake", "pallet-grandpa", "pallet-identity", - "pallet-im-online", "pallet-indices", "pallet-membership", "pallet-message-queue", @@ -14362,56 +18351,55 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-parachain-primitives", - "polkadot-primitives", + "polkadot-parachain-primitives 14.0.0", + "polkadot-primitives 15.0.0", "polkadot-runtime-common", "polkadot-runtime-parachains", - "rustc-hex", "scale-info", "serde", "serde_derive", "smallvec", - "sp-api", - "sp-application-crypto", - "sp-arithmetic", - "sp-authority-discovery", - "sp-block-builder", - "sp-consensus-babe", + "sp-api 34.0.0", + "sp-application-crypto 38.0.0", + "sp-arithmetic 26.0.0", + "sp-authority-discovery 34.0.0", + "sp-block-builder 34.0.0", + "sp-consensus-babe 0.40.0", "sp-consensus-beefy", - "sp-core", - "sp-genesis-builder", - "sp-inherents", - "sp-io", + "sp-core 34.0.0", + "sp-genesis-builder 0.15.0", + "sp-inherents 34.0.0", + "sp-io 38.0.0", "sp-mmr-primitives", "sp-npos-elections", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std 8.0.0", - "sp-storage 13.0.0", - "sp-transaction-pool", - "sp-version", - "staging-xcm", + "sp-offchain 34.0.0", + "sp-runtime 39.0.0", + "sp-session 35.0.0", + "sp-staking 34.0.0", + "sp-storage 21.0.0", + "sp-transaction-pool 34.0.0", + "sp-version 37.0.0", + "staging-xcm 14.1.0", "staging-xcm-builder", "staging-xcm-executor", "substrate-wasm-builder", "westend-runtime-constants", + "xcm-runtime-apis", ] [[package]] name = "westend-runtime-constants" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "16.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#deb354e5650f9029c6dd2a985279934cbe742a56" dependencies = [ - "frame-support", - "polkadot-primitives", + "frame-support 37.0.0", + "polkadot-primitives 15.0.0", "polkadot-runtime-common", "smallvec", - "sp-core", - "sp-runtime", - "sp-weights", - "staging-xcm", + "sp-core 34.0.0", + "sp-runtime 39.0.0", + "sp-weights 31.0.0", + "staging-xcm 14.1.0", "staging-xcm-builder", ] @@ -14502,6 +18490,21 @@ dependencies = [ "windows-targets 0.52.5", ] +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -14773,13 +18776,47 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" dependencies = [ - "asn1-rs", + "asn1-rs 0.5.2", "base64 0.13.1", "data-encoding", - "der-parser", + "der-parser 8.2.0", + "lazy_static", + "nom", + "oid-registry 0.6.1", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "x509-parser" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" +dependencies = [ + "asn1-rs 0.5.2", + "data-encoding", + "der-parser 8.2.0", + "lazy_static", + "nom", + "oid-registry 0.6.1", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "x509-parser" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69" +dependencies = [ + "asn1-rs 0.6.2", + "data-encoding", + "der-parser 9.0.0", "lazy_static", "nom", - "oid-registry", + "oid-registry 0.7.1", "rusticata-macros", "thiserror", "time", @@ -14787,8 +18824,19 @@ dependencies = [ [[package]] name = "xcm-procedural" -version = "1.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#f00a911c52c047db3119dedfddc86c332ff6626b" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?rev=289f5bbf7a45dc0380904a435464b15ec711ed03#289f5bbf7a45dc0380904a435464b15ec711ed03" +dependencies = [ + "Inflector", + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "xcm-procedural" +version = "10.1.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" dependencies = [ "Inflector", "proc-macro2", @@ -14796,6 +18844,35 @@ dependencies = [ "syn 2.0.68", ] +[[package]] +name = "xcm-runtime-apis" +version = "0.3.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#51a1705d9ce56a5513241b9a3a770fb788812da9" +dependencies = [ + "frame-support 37.0.0", + "parity-scale-codec", + "scale-info", + "sp-api 34.0.0", + "sp-weights 31.0.0", + "staging-xcm 14.1.0", + "staging-xcm-executor", +] + +[[package]] +name = "xml-rs" +version = "0.8.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26" + +[[package]] +name = "xmltree" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7d8a75eaf6557bb84a65ace8609883db44a29951042ada9b393151532e41fcb" +dependencies = [ + "xml-rs", +] + [[package]] name = "yamux" version = "0.10.2" @@ -14806,7 +18883,22 @@ dependencies = [ "log", "nohash-hasher", "parking_lot 0.12.3", - "rand", + "rand 0.8.5", + "static_assertions", +] + +[[package]] +name = "yamux" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed0164ae619f2dc144909a9f082187ebb5893693d8c0196e8085283ccd4b776" +dependencies = [ + "futures", + "log", + "nohash-hasher", + "parking_lot 0.12.3", + "pin-project", + "rand 0.8.5", "static_assertions", ] diff --git a/invarch/Cargo.toml b/invarch/Cargo.toml index 41aa376e..8c55d635 100644 --- a/invarch/Cargo.toml +++ b/invarch/Cargo.toml @@ -18,143 +18,154 @@ panic = 'unwind' [workspace.dependencies] # [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } +substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } -async-trait = { version = "0.1.48" } -clap = { version = "4.0.29", features = ["derive"] } -codec = { package = "parity-scale-codec", version = "3.6.5", features = [ +array-bytes = { version = "6.2" } +async-trait = { version = "0.1.79" } +clap = { version = "4.5.3"} +codec = { package = "parity-scale-codec", version = "3.6.12", features = [ "derive", ], default-features = false } -derive_more = "0.99.2" +color-print = { version = "0.3.4" } +derive_more = "0.99.17" +docify = { version = "0.2.8" } futures = "0.3.29" -hex-literal = { version = "0.3.4" } -jsonrpsee = { version = "0.16.2", features = ["server"] } -log = { version = "0.4.20", default-features = false } -scale-info = { version = "2.10.0", features = [ +hex-literal = { version = "0.4.1" } +jsonrpsee = { version = "0.23.2", features = ["server"] } +log = { version = "0.4.21", default-features = false } +scale-info = { version = "2.11.1", features = [ "derive", ], default-features = false } -serde = { version = "1.0.189", features = ["derive"] } -serde_json = "1.0.111" -smallvec = "1.6.1" +serde = { version = "1.0.197", default-features = false, features = ["derive"] } +serde_json = { version = "1.0.121", default-features = false } +smallvec = { version = "1.11.0", default-features = false } # Local dependencies new-modified-construct-runtime = { path = "../new-modified-construct-runtime", default-features = false } -pallet-tx-pause = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } +pallet-tx-pause = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } # InvArch pallet-dao-manager = { path = "../pallets/pallet-dao-manager", default-features = false } pallet-dao-staking = { path = "../pallets/pallet-dao-staking", default-features = false } pallet-checked-inflation = { path = "../pallets/pallet-checked-inflation", default-features = false } -pallet-rings = { path = "../pallets/pallet-rings", default-features = false } # Substrate -frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -frame-executive = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -pallet-identity = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -frame-metadata-hash-extension = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false} -pallet-session = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -sp-api = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -sp-genesis-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -sp-session = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -sp-version = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +frame-executive = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +pallet-identity = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +frame-metadata-hash-extension = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false} +pallet-session = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +sp-genesis-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +sp-session = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +sp-version = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } # ORML -orml-tokens = { git = "https://github.com/Abstracted-Labs/open-runtime-module-library.git", branch = "polkadot-v1.6.0", default-features = false } -orml-traits = { git = "https://github.com/Abstracted-Labs/open-runtime-module-library.git", branch = "polkadot-v1.6.0", default-features = false } -orml-vesting = { git = "https://github.com/Abstracted-Labs/open-runtime-module-library.git", branch = "polkadot-v1.6.0", default-features = false } -orml-xcm = { git = "https://github.com/Abstracted-Labs/open-runtime-module-library.git", branch = "polkadot-v1.6.0", default-features = false } +orml-asset-registry = { git = "https://github.com/Anny0nn/open-runtime-module-library.git", branch = "stable2407", default-features = false } +orml-currencies = { git = "https://github.com/Anny0nn/open-runtime-module-library.git", branch = "stable2407", default-features = false } +orml-tokens = { git = "https://github.com/Abstracted-Labs/open-runtime-module-library.git", branch = "stable2407", default-features = false } +orml-tokens2 = { package = "orml-tokens", git = "https://github.com/Anny0nn/open-runtime-module-library.git", branch = "stable2407", default-features = false } +orml-traits = { git = "https://github.com/Abstracted-Labs/open-runtime-module-library.git", branch = "stable2407", default-features = false } +orml-traits2 = { package = "orml-traits", git = "https://github.com/Anny0nn/open-runtime-module-library.git", branch = "stable2407", default-features = false } +orml-vesting = { git = "https://github.com/Abstracted-Labs/open-runtime-module-library.git", branch = "stable2407", default-features = false } +orml-xcm = { git = "https://github.com/Abstracted-Labs/open-runtime-module-library.git", branch = "stable2407", default-features = false } +orml-xcm-support = { git = "https://github.com/Anny0nn/open-runtime-module-library.git", branch = "stable2407", default-features = false } +orml-xtokens = { git = "https://github.com/Anny0nn/open-runtime-module-library.git", branch = "stable2407", default-features = false } # Polkadot -pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } # Cumulus -cumulus-client-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -cumulus-client-collator = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -cumulus-client-consensus-proposer = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -cumulus-client-network = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -cumulus-client-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -pallet-collator-selection = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -parachain-info = { package = "staging-parachain-info", git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -try-runtime-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } +cumulus-client-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +cumulus-client-collator = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +cumulus-client-consensus-proposer = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +cumulus-client-network = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +cumulus-client-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +cumulus-primitives-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +pallet-collator-selection = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +parachain-info = { package = "staging-parachain-info", git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +try-runtime-cli = { git = "https://github.com/paritytech/try-runtime-cli", commit = "stable2407", default-features = false } # Substrate Client Dependencies -sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -sc-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -sc-executor = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -sc-keystore = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -sc-network = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -sc-rpc-api = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -sc-service = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -sc-sysinfo = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -sc-tracing = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } +sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +sc-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +sc-executor = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +sc-keystore = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +sc-network = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +sc-rpc-api = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +sc-service = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +sc-sysinfo = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +sc-tracing = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } # Polkadot dependencies Dependencies -polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } -polkadot-service = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +polkadot-service = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } +prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } \ No newline at end of file diff --git a/invarch/node/Cargo.toml b/invarch/node/Cargo.toml index abe637e6..defef816 100644 --- a/invarch/node/Cargo.toml +++ b/invarch/node/Cargo.toml @@ -18,102 +18,76 @@ name = "invarch-collator" path = "src/main.rs" [dependencies] -clap = { workspace = true } -derive_more = { workspace = true } -log = { workspace = true } -codec = { workspace = true } -serde = { workspace = true } -serde_json = { workspace = true } -hex-literal = { workspace = true } async-trait = { workspace = true } - -## RPC related Dependencies -jsonrpsee = { workspace = true } +array-bytes = { workspace = true } +clap = { features = ["derive"], workspace = true } +log = { workspace = true, default-features = true } +codec = { workspace = true, default-features = true } +serde = { features = ["derive"], workspace = true, default-features = true } +jsonrpsee = { features = ["server"], workspace = true } futures = { workspace = true } ## Local Dependencies invarch-runtime = { path = "../runtime" } - -## Substrate Dependencies -frame-benchmarking = { workspace = true } -frame-benchmarking-cli = { workspace = true } -pallet-transaction-payment-rpc = { workspace = true } - -## Substrate Client Dependencies -sc-basic-authorship = { workspace = true } -sc-chain-spec = { workspace = true } -sc-cli = { workspace = true } -sc-client-api = { workspace = true } -sc-consensus = { workspace = true } +serde_json = { workspace = true, default-features = true } +docify = { workspace = true } +frame-benchmarking = { workspace = true, default-features = true } +frame-benchmarking-cli = { workspace = true, default-features = true } +pallet-transaction-payment-rpc = { workspace = true, default-features = true } +sc-basic-authorship = { workspace = true, default-features = true } +sc-chain-spec = { workspace = true, default-features = true } +sc-cli = { workspace = true, default-features = true } +sc-client-api = { workspace = true, default-features = true } sc-consensus-aura = { workspace = true } -sc-consensus-manual-seal = { workspace = true } -sc-executor = { workspace = true } -sc-keystore = { workspace = true } -sc-network = { workspace = true } -sc-network-sync = { workspace = true } -sc-rpc = { workspace = true } -sc-rpc-api = { workspace = true } -sc-service = { workspace = true } -sc-sysinfo = { workspace = true } -sc-telemetry = { workspace = true } -sc-tracing = { workspace = true } -sc-transaction-pool = { workspace = true } -sc-transaction-pool-api = { workspace = true } - -## Substrate Primitive -sp-api = { workspace = true } -sp-io = { workspace = true } -sp-block-builder = { workspace = true } -sp-blockchain = { workspace = true } -sp-consensus = { workspace = true } -sp-consensus-aura = { workspace = true } -sp-core = { workspace = true } -sp-inherents = { workspace = true } -sp-keystore = { workspace = true } -sp-offchain = { workspace = true } -sp-runtime = { workspace = true } -sp-session = { workspace = true } -sp-timestamp = { workspace = true } -sp-transaction-pool = { workspace = true } - -substrate-frame-rpc-system = { workspace = true } -substrate-prometheus-endpoint = { workspace = true } -try-runtime-cli = { workspace = true, optional = true } - -## Polkadot dependencies Dependencies -polkadot-cli = { workspace = true } -polkadot-parachain = { workspace = true } -polkadot-primitives = { workspace = true } -polkadot-service = { workspace = true } +sc-offchain = { workspace = true, default-features = true } +sc-consensus = { workspace = true, default-features = true } +sc-executor = { workspace = true, default-features = true } +sc-network = { workspace = true, default-features = true } +sc-network-sync = { workspace = true, default-features = true } +sc-rpc = { workspace = true, default-features = true } +sc-service = { workspace = true, default-features = true } +sc-sysinfo = { workspace = true, default-features = true } +sc-telemetry = { workspace = true, default-features = true } +sc-tracing = { workspace = true, default-features = true } +sc-transaction-pool = { workspace = true, default-features = true } +sc-transaction-pool-api = { workspace = true, default-features = true } +sp-api = { workspace = true, default-features = true } +sp-block-builder = { workspace = true, default-features = true } +sp-blockchain = { workspace = true, default-features = true } +sp-consensus-aura = { workspace = true, default-features = true } +sp-core = { workspace = true, default-features = true } +sp-keystore = { workspace = true, default-features = true } +sp-io = { workspace = true, default-features = true } +sp-runtime = { workspace = true, default-features = true } +sp-timestamp = { workspace = true, default-features = true } +substrate-frame-rpc-system = { workspace = true, default-features = true } +prometheus-endpoint = { workspace = true, default-features = true } +polkadot-cli = { features = [ + "rococo-native", +], workspace = true, default-features = true } +polkadot-primitives = { workspace = true, default-features = true } xcm = { workspace = true } - -## Cumulus dependencies Dependencies -cumulus-client-cli = { workspace = true } -cumulus-client-collator = { workspace = true } -cumulus-client-consensus-aura = { workspace = true } -cumulus-client-consensus-common = { workspace = true } -cumulus-client-consensus-proposer = { workspace = true } -cumulus-client-network = { workspace = true } +cumulus-client-cli = { workspace = true, default-features = true } +cumulus-client-collator = { workspace = true, default-features = true } +cumulus-client-consensus-aura = { workspace = true, default-features = true } +cumulus-client-consensus-common = { workspace = true, default-features = true } +cumulus-client-consensus-proposer = { workspace = true, default-features = true } cumulus-client-parachain-inherent = { workspace = true } -cumulus-client-service = { workspace = true } -cumulus-primitives-core = { workspace = true } -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-client-service = { workspace = true, default-features = true } +cumulus-primitives-core = { workspace = true, default-features = true } +cumulus-primitives-parachain-inherent = { workspace = true, default-features = true } +cumulus-relay-chain-interface = { workspace = true, default-features = true } +color-print = { workspace = true } +try-runtime-cli = { workspace = true, optional = true } [build-dependencies] -substrate-build-script-utils = { workspace = true } +substrate-build-script-utils = { workspace = true, default-features = true } [features] runtime-benchmarks = [ "invarch-runtime/runtime-benchmarks", - "polkadot-cli/runtime-benchmarks" - ] - -try-runtime = [ - "invarch-runtime/try-runtime", - "try-runtime-cli", + "polkadot-cli/runtime-benchmarks", ] + +try-runtime = ["invarch-runtime/try-runtime", "try-runtime-cli"] diff --git a/invarch/node/src/chain_spec.rs b/invarch/node/src/chain_spec.rs index 10eaa8a7..e85b336b 100644 --- a/invarch/node/src/chain_spec.rs +++ b/invarch/node/src/chain_spec.rs @@ -19,10 +19,8 @@ //! Learn more about Substrate chain specifications at //! https://docs.substrate.io/v3/runtime/chain-specs/ -use invarch_runtime::{ - AccountId, AuraId, RuntimeGenesisConfig, SessionKeys, Signature, EXISTENTIAL_DEPOSIT, - WASM_BINARY, -}; +use invarch_runtime as runtime; +use runtime::{AccountId, AuraId, Signature, EXISTENTIAL_DEPOSIT, WASM_BINARY}; use cumulus_primitives_core::ParaId; use sc_chain_spec::{ChainSpecExtension, ChainSpecGroup}; @@ -32,13 +30,13 @@ use sp_core::{sr25519, Pair, Public}; use sp_runtime::traits::{IdentifyAccount, Verify}; /// Specialized `ChainSpec` for the normal parachain runtime. -pub type ChainSpec = sc_service::GenericChainSpec; +pub type ChainSpec = sc_service::GenericChainSpec; /// The default XCM version to set in genesis config. const SAFE_XCM_VERSION: u32 = xcm::prelude::XCM_VERSION; /// Helper function to generate a crypto pair from seed -pub fn get_public_from_seed(seed: &str) -> ::Public { +pub fn get_from_seed(seed: &str) -> ::Public { TPublic::Pair::from_string(&format!("//{}", seed), None) .expect("static values are valid; qed") .public() @@ -46,13 +44,15 @@ pub fn get_public_from_seed(seed: &str) -> Option<&Self> { @@ -66,24 +66,22 @@ type AccountPublic = ::Signer; /// /// This function's return type must always match the session keys of the chain in tuple format. pub fn get_collator_keys_from_seed(seed: &str) -> AuraId { - get_public_from_seed::(seed) + get_from_seed::(seed) } -// TODO: Update to AccountId32::new([..]) - /// Helper function to generate an account ID from seed pub fn get_account_id_from_seed(seed: &str) -> AccountId where AccountPublic: From<::Public>, { - AccountPublic::from(get_public_from_seed::(seed)).into_account() + AccountPublic::from(get_from_seed::(seed)).into_account() } /// Generate the session keys from individual elements. /// /// The input must be a tuple of individual keys (a single arg for now since we have just one key). -pub fn template_session_keys(keys: AuraId) -> SessionKeys { - SessionKeys { aura: keys } +pub fn template_session_keys(keys: AuraId) -> runtime::SessionKeys { + runtime::SessionKeys { aura: keys } } pub fn invarch_live() -> ChainSpec { @@ -104,17 +102,18 @@ pub fn development_config() -> ChainSpec { properties.insert("ss58Format".into(), 117u32.into()); ChainSpec::builder( - WASM_BINARY.expect("WASM binary was not built, please build it!"), + runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"), Extensions { - relay_chain: "rococo-local".into(), // TODO: You MUST set this to the correct network! + relay_chain: "rococo-local".into(), + // You MUST set this to the correct network! para_id: 1000, }, ) .with_name("InvArch Dev Net") .with_id("invarch-dev") .with_chain_type(ChainType::Development) - .with_properties(properties) .with_genesis_config_patch(testnet_genesis( + // initial collators. vec![ ( get_account_id_from_seed::("Alice"), @@ -198,11 +197,12 @@ pub fn local_testnet_config() -> ChainSpec { // Give your base currency a unit name and decimal places let mut properties = sc_chain_spec::Properties::new(); properties.insert("tokenSymbol".into(), "UNIT".into()); - properties.insert("tokenDecimals".into(), 12u32.into()); - properties.insert("ss58Format".into(), 42u32.into()); + properties.insert("tokenDecimals".into(), 12.into()); + properties.insert("ss58Format".into(), 42.into()); + #[allow(deprecated)] ChainSpec::builder( - WASM_BINARY.expect("WASM binary was not built, please build it!"), + runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"), Extensions { relay_chain: "polkadot-local".into(), // TODO: You MUST set this to the correct network! para_id: 1000, @@ -211,8 +211,8 @@ pub fn local_testnet_config() -> ChainSpec { .with_name("InvArch Local Testnet") .with_id("invarch-local-testnet") .with_chain_type(ChainType::Local) - .with_properties(properties) .with_genesis_config_patch(testnet_genesis( + // initial collators. vec![ ( get_account_id_from_seed::("Alice"), @@ -240,6 +240,8 @@ pub fn local_testnet_config() -> ChainSpec { get_account_id_from_seed::("Alice"), 1000.into(), )) + .with_protocol_id("template-local") + .with_properties(properties) .build() } diff --git a/invarch/node/src/cli.rs b/invarch/node/src/cli.rs index 4de46637..f5ef7695 100644 --- a/invarch/node/src/cli.rs +++ b/invarch/node/src/cli.rs @@ -1,4 +1,3 @@ -use crate::chain_spec; use clap::Parser; use std::path::PathBuf; @@ -6,18 +5,6 @@ use std::path::PathBuf; #[allow(clippy::large_enum_variant)] #[derive(Debug, clap::Subcommand)] pub enum Subcommand { - /// Key management cli utilities - #[clap(subcommand)] - Key(sc_cli::KeySubcommand), - - /// Export the genesis state of the parachain. - #[command(alias = "export-genesis-state")] - ExportGenesisHead(cumulus_client_cli::ExportGenesisHeadCommand), - - /// Export the genesis wasm of the parachain. - #[clap(name = "export-genesis-wasm")] - ExportGenesisWasm(cumulus_client_cli::ExportGenesisWasmCommand), - /// Build a chain specification. BuildSpec(sc_cli::BuildSpecCmd), @@ -33,15 +20,24 @@ pub enum Subcommand { /// Import blocks. ImportBlocks(sc_cli::ImportBlocksCmd), + /// Revert the chain to a previous state. + Revert(sc_cli::RevertCmd), + /// Remove the whole chain. PurgeChain(cumulus_client_cli::PurgeChainCmd), - /// Revert the chain to a previous state. - Revert(sc_cli::RevertCmd), + /// Export the genesis head data of the parachain. + /// + /// Head data is the encoded block header. + #[command(alias = "export-genesis-state")] + ExportGenesisHead(cumulus_client_cli::ExportGenesisHeadCommand), + + /// Export the genesis wasm of the parachain. + ExportGenesisWasm(cumulus_client_cli::ExportGenesisWasmCommand), /// Sub-commands concerned with benchmarking. /// The pallet benchmarking moved to the `pallet` sub-command. - #[clap(subcommand)] + #[command(subcommand)] Benchmark(frame_benchmarking_cli::BenchmarkCmd), /// Try some testing command against a specified runtime state. @@ -60,10 +56,10 @@ pub enum Subcommand { subcommand_negates_reqs = true )] pub struct Cli { - #[clap(subcommand)] + #[command(subcommand)] pub subcommand: Option, - #[clap(flatten)] + #[command(flatten)] pub run: cumulus_client_cli::RunCmd, /// Disable automatic hardware benchmarks. @@ -73,11 +69,11 @@ pub struct Cli { /// /// The results are then printed out in the logs, and also sent as part of /// telemetry, if telemetry is enabled. - #[clap(long)] + #[arg(long)] pub no_hardware_benchmarks: bool, /// Relay chain arguments - #[clap(raw = true)] + #[arg(raw = true)] pub relay_chain_args: Vec, } @@ -99,13 +95,13 @@ impl RelayChainCli { para_config: &sc_service::Configuration, relay_chain_args: impl Iterator, ) -> Self { - let extension = chain_spec::Extensions::try_get(&*para_config.chain_spec); + let extension = crate::chain_spec::Extensions::try_get(&*para_config.chain_spec); let chain_id = extension.map(|e| e.relay_chain.clone()); let base_path = para_config.base_path.path().join("polkadot"); Self { base_path: Some(base_path), chain_id, - base: polkadot_cli::RunCmd::parse_from(relay_chain_args), + base: clap::Parser::parse_from(relay_chain_args), } } } diff --git a/invarch/node/src/command.rs b/invarch/node/src/command.rs index b9a9d61e..258df6c0 100644 --- a/invarch/node/src/command.rs +++ b/invarch/node/src/command.rs @@ -1,23 +1,25 @@ use invarch_runtime::Block; +#[cfg(feature = "try-runtime")] +use crate::service::ParachainExecutor; use crate::{ chain_spec, cli::{Cli, RelayChainCli, Subcommand}, - service::{new_partial, ChainIdentify, ParachainNativeExecutor}, + service::{new_partial, ChainIdentify}, }; +use cumulus_client_service::storage_proof_size::HostFunctions as ReclaimHostFunctions; use cumulus_primitives_core::ParaId; use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE}; use log::info; -use sc_chain_spec::ChainSpec; use sc_cli::{ - CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, NetworkParams, - Result, SharedParams, SubstrateCli, + ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, + NetworkParams, Result, SharedParams, SubstrateCli, }; use sc_service::config::{BasePath, PrometheusConfig}; use sp_runtime::traits::AccountIdConversion; use std::net::SocketAddr; -fn load_spec(id: &str) -> std::result::Result, String> { +fn load_spec(id: &str) -> std::result::Result, String> { Ok(match id { "solo-dev" => Box::new(chain_spec::solo_dev_config()), "dev" => Box::new(chain_spec::development_config()), @@ -40,11 +42,13 @@ impl SubstrateCli for Cli { } fn description() -> String { - "InvArch Node\n\nThe command-line arguments provided first will be \ + format!( + "InvArch Node\n\nThe command-line arguments provided first will be \ passed to the parachain node, while the arguments provided after -- will be passed \ to the relay chain node.\n\n\ - parachain-collator -- " - .into() + {} -- ", + Self::executable_name() + ) } fn author() -> String { @@ -74,11 +78,13 @@ impl SubstrateCli for RelayChainCli { } fn description() -> String { - "InvArch Collator\n\nThe command-line arguments provided first will be \ + format!( + "InvArch Collator\n\nThe command-line arguments provided first will be \ passed to the parachain node, while the arguments provided after -- will be passed \ to the relay chain node.\n\n\ - parachain-collator -- " - .into() + {} -- ", + Self::executable_name() + ) } fn author() -> String { @@ -102,9 +108,7 @@ macro_rules! construct_async_run { (|$components:ident, $cli:ident, $cmd:ident, $config:ident| $( $code:tt )* ) => {{ let runner = $cli.create_runner($cmd)?; runner.async_run(|$config| { - let $components = new_partial( - &$config - )?; + let $components = new_partial(&$config)?; let task_manager = $components.task_manager; { $( $code )* }.map(|v| (v, task_manager)) }) @@ -116,7 +120,6 @@ pub fn run() -> Result<()> { let cli = Cli::from_args(); match &cli.subcommand { - Some(Subcommand::Key(cmd)) => cmd.run(&cli), Some(Subcommand::BuildSpec(cmd)) => { let runner = cli.create_runner(cmd)?; runner.sync_run(|config| cmd.run(config.chain_spec, config.network)) @@ -141,6 +144,11 @@ pub fn run() -> Result<()> { Ok(cmd.run(components.client, components.import_queue)) }) } + Some(Subcommand::Revert(cmd)) => { + construct_async_run!(|components, cli, cmd, config| { + Ok(cmd.run(components.client, components.backend, None)) + }) + } Some(Subcommand::PurgeChain(cmd)) => { let runner = cli.create_runner(cmd)?; @@ -162,11 +170,6 @@ pub fn run() -> Result<()> { cmd.run(config, polkadot_config) }) } - Some(Subcommand::Revert(cmd)) => { - construct_async_run!(|components, cli, cmd, config| { - Ok(cmd.run(components.client, components.backend, None)) - }) - } Some(Subcommand::ExportGenesisHead(cmd)) => { let runner = cli.create_runner(cmd)?; runner.sync_run(|config| { @@ -188,26 +191,21 @@ pub fn run() -> Result<()> { match cmd { BenchmarkCmd::Pallet(cmd) => { if cfg!(feature = "runtime-benchmarks") { - use sc_executor::{ - sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch, - }; - type HostFunctionsOf = ExtendedHostFunctions< - sp_io::SubstrateHostFunctions, - ::ExtendHostFunctions, - >; - runner.sync_run(|config| { - cmd.run::>(config) - }) + runner.sync_run(|config| cmd.run_with_spec::, ReclaimHostFunctions>(Some(config.chain_spec))) } else { Err("Benchmarking wasn't enabled when building the node. \ You can enable it with `--features runtime-benchmarks`." .into()) } } + BenchmarkCmd::Block(cmd) => runner.sync_run(|config| { + let partials = new_partial(&config)?; + cmd.run(partials.client) + }), #[cfg(not(feature = "runtime-benchmarks"))] BenchmarkCmd::Storage(_) => Err(sc_cli::Error::Input( "Compile with --features=runtime-benchmarks \ - to enable storage benchmarks." + to enable storage benchmarks." .into(), )), #[cfg(feature = "runtime-benchmarks")] @@ -254,9 +252,7 @@ pub fn run() -> Result<()> { runner.async_run(|_| { Ok(( - cmd.run::, _>(Some( - info_provider, - )), + cmd.run::, _>(Some(info_provider)), task_manager, )) }) @@ -288,8 +284,10 @@ pub fn run() -> Result<()> { .map(|e| e.para_id) .ok_or("Could not find parachain ID in chain-spec.")?; + let id = ParaId::from(para_id); + if is_solo_dev { - return crate::service::start_solo_dev(config) + return crate::service::start_solo_dev(config, id) .await .map(|r| r.0) .map_err(Into::into); @@ -302,8 +300,6 @@ pub fn run() -> Result<()> { .chain(cli.relay_chain_args.iter()), ); - let id = ParaId::from(para_id); - let parachain_account = AccountIdConversion::::into_account_truncating( &id, @@ -423,6 +419,10 @@ impl CliConfiguration for RelayChainCli { self.base.base.transaction_pool(is_dev) } + fn trie_cache_maximum_size(&self) -> Result> { + self.base.base.trie_cache_maximum_size() + } + fn rpc_methods(&self) -> Result { self.base.base.rpc_methods() } diff --git a/invarch/node/src/main.rs b/invarch/node/src/main.rs index 16d41410..60e49b7b 100644 --- a/invarch/node/src/main.rs +++ b/invarch/node/src/main.rs @@ -1,13 +1,12 @@ -//! InvArch Parachain Node CLI. +//! Substrate Parachain Node Template CLI #![warn(missing_docs)] mod chain_spec; -#[macro_use] -mod service; mod cli; mod command; mod rpc; +mod service; fn main() -> sc_cli::Result<()> { command::run() diff --git a/invarch/node/src/rpc.rs b/invarch/node/src/rpc.rs index 4e22523d..0fffb0df 100644 --- a/invarch/node/src/rpc.rs +++ b/invarch/node/src/rpc.rs @@ -1,21 +1,20 @@ //! A collection of node-specific RPC methods. -//! Substrate provides the `sc-rpc` crate, which defines the dao RPC layer +//! +//! Substrate provides the `sc-rpc` crate, which defines the core RPC layer //! used by Substrate nodes. This file extends those RPC definitions with //! capabilities that are specific to this project's runtime configuration. #![warn(missing_docs)] -use invarch_runtime::{opaque::Block, AccountId, Balance, Hash, Nonce}; +use std::sync::Arc; + +use invarch_runtime::{opaque::Block, AccountId, Balance, Nonce}; -use sc_client_api::AuxStore; pub use sc_rpc::DenyUnsafe; use sc_transaction_pool_api::TransactionPool; use sp_api::ProvideRuntimeApi; use sp_block_builder::BlockBuilder; use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata}; -use std::sync::Arc; - -use sc_consensus_manual_seal::rpc::EngineCommand; /// A type representing all RPC extensions. pub type RpcExtension = jsonrpsee::RpcModule<()>; @@ -28,8 +27,6 @@ pub struct FullDeps { pub pool: Arc

, /// Whether to deny unsafe calls pub deny_unsafe: DenyUnsafe, - /// Command sink used for solo-dev mode - pub command_sink: Option>>, } /// Instantiate all RPC extensions. @@ -39,7 +36,6 @@ pub fn create_full( where C: ProvideRuntimeApi + HeaderBackend - + AuxStore + HeaderMetadata + Send + Sync @@ -57,7 +53,6 @@ where client, pool, deny_unsafe, - command_sink: _, } = deps; module.merge(System::new(client.clone(), pool, deny_unsafe).into_rpc())?; diff --git a/invarch/node/src/service.rs b/invarch/node/src/service.rs index f5dc90c8..478838a0 100644 --- a/invarch/node/src/service.rs +++ b/invarch/node/src/service.rs @@ -1,7 +1,17 @@ +//! Service and ServiceFactory implementation. Specialized wrapper over substrate service. + +// std +use std::{sync::Arc, time::Duration}; + use cumulus_client_cli::CollatorOptions; +// Local Runtime Types +use invarch_runtime::{opaque::Block, Hash, RuntimeApi}; + +// Cumulus Imports use cumulus_client_collator::service::CollatorService; +#[docify::export(lookahead_collator)] use cumulus_client_consensus_aura::{ - collators::basic::{self as basic_aura, Params as BasicAuraParams}, + collators::lookahead::{self as aura, Params as AuraParams}, SlotProportion, }; use cumulus_client_consensus_common::ParachainBlockImport as TParachainBlockImport; @@ -9,43 +19,32 @@ use cumulus_client_consensus_proposer::Proposer; use cumulus_client_parachain_inherent::{MockValidationDataInherentDataProvider, MockXcmConfig}; use cumulus_client_service::{ build_network, build_relay_chain_interface, prepare_node_config, start_relay_chain_tasks, - BuildNetworkParams, CollatorSybilResistance, DARecoveryProfile, StartRelayChainTasksParams, + BuildNetworkParams, CollatorSybilResistance, DARecoveryProfile, ParachainHostFunctions, + StartRelayChainTasksParams, +}; +#[docify::export(cumulus_primitives)] +use cumulus_primitives_core::{ + relay_chain::{CollatorPair, ValidationCode}, + ParaId, }; -use cumulus_primitives_core::{relay_chain::CollatorPair, ParaId}; use cumulus_relay_chain_interface::{OverseerHandle, RelayChainInterface}; -use frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE; -use invarch_runtime::{opaque::Block, Hash, RuntimeApi}; use sc_client_api::HeaderBackend; + +// Substrate Imports +use frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE; +use prometheus_endpoint::Registry; +use sc_client_api::Backend; use sc_consensus::ImportQueue; -use sc_executor::{ - HeapAllocStrategy, NativeElseWasmExecutor, WasmExecutor, DEFAULT_HEAP_ALLOC_STRATEGY, -}; -use sc_network::NetworkBlock; -use sc_network_sync::SyncingService; -use sc_service::{ - ChainSpec, Configuration, PartialComponents, TFullBackend, TFullClient, TaskManager, -}; +use sc_executor::{HeapAllocStrategy, WasmExecutor, DEFAULT_HEAP_ALLOC_STRATEGY}; +use sc_network::{NetworkBlock, NotificationMetrics}; +use sc_service::{Configuration, PartialComponents, TFullBackend, TFullClient, TaskManager}; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; +use sc_transaction_pool_api::OffchainTransactionPoolFactory; +use sp_core::Encode; use sp_keystore::KeystorePtr; -use std::{sync::Arc, time::Duration}; -use substrate_prometheus_endpoint::Registry; - -/// Native executor type. -pub struct ParachainNativeExecutor; -impl sc_executor::NativeExecutionDispatch for ParachainNativeExecutor { - type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; - - fn dispatch(method: &str, data: &[u8]) -> Option> { - invarch_runtime::api::dispatch(method, data) - } - - fn native_version() -> sc_executor::NativeVersion { - invarch_runtime::native_version() - } -} - -type ParachainExecutor = NativeElseWasmExecutor; +// #[docify::export(wasm_executor)] +pub type ParachainExecutor = WasmExecutor; type ParachainClient = TFullClient; @@ -80,7 +79,7 @@ pub trait ChainIdentify { fn is_solo_dev(&self) -> bool; } -impl ChainIdentify for Box { +impl ChainIdentify for Box { fn is_solo_dev(&self) -> bool { self.id().starts_with("invarch-solo-dev") } @@ -90,6 +89,7 @@ impl ChainIdentify for Box { /// /// Use this macro if you don't actually need the full service, but just the builder in order to /// be able to perform chain operations. +#[docify::export(component_instantiation)] pub fn new_partial(config: &Configuration) -> Result { let telemetry = config .telemetry_endpoints @@ -108,7 +108,7 @@ pub fn new_partial(config: &Configuration) -> Result extra_pages: h as _, }); - let wasm = WasmExecutor::builder() + let executor = ParachainExecutor::builder() .with_execution_method(config.wasm_method) .with_onchain_heap_alloc_strategy(heap_pages) .with_offchain_heap_alloc_strategy(heap_pages) @@ -116,13 +116,12 @@ pub fn new_partial(config: &Configuration) -> Result .with_runtime_cache_size(config.runtime_cache_size) .build(); - let executor = ParachainExecutor::new_with_wasm_executor(wasm); - let (client, backend, keystore_container, task_manager) = - sc_service::new_full_parts::( + sc_service::new_full_parts_record_import::( config, telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()), executor, + true, )?; let client = Arc::new(client); @@ -151,7 +150,7 @@ pub fn new_partial(config: &Configuration) -> Result config, telemetry.as_ref().map(|telemetry| telemetry.handle()), &task_manager, - )?; + ); Ok(PartialComponents { backend, @@ -165,11 +164,102 @@ pub fn new_partial(config: &Configuration) -> Result }) } +/// Build the import queue for the parachain runtime. +fn build_import_queue( + client: Arc, + block_import: ParachainBlockImport, + config: &Configuration, + telemetry: Option, + task_manager: &TaskManager, +) -> sc_consensus::DefaultImportQueue { + cumulus_client_consensus_aura::equivocation_import_queue::fully_verifying_import_queue::< + sp_consensus_aura::sr25519::AuthorityPair, + _, + _, + _, + _, + >( + client, + block_import, + move |_, _| async move { + let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); + Ok(timestamp) + }, + &task_manager.spawn_essential_handle(), + config.prometheus_registry(), + telemetry, + ) +} + +#[allow(clippy::too_many_arguments)] +fn start_consensus( + client: Arc, + backend: Arc, + block_import: ParachainBlockImport, + prometheus_registry: Option<&Registry>, + telemetry: Option, + task_manager: &TaskManager, + relay_chain_interface: Arc, + transaction_pool: Arc>, + keystore: KeystorePtr, + relay_chain_slot_duration: Duration, + para_id: ParaId, + collator_key: CollatorPair, + overseer_handle: OverseerHandle, + announce_block: Arc>) + Send + Sync>, +) -> Result<(), sc_service::Error> { + let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording( + task_manager.spawn_handle(), + client.clone(), + transaction_pool, + prometheus_registry, + telemetry.clone(), + ); + + let proposer = Proposer::new(proposer_factory); + + let collator_service = CollatorService::new( + client.clone(), + Arc::new(task_manager.spawn_handle()), + announce_block, + client.clone(), + ); + + let params = AuraParams { + create_inherent_data_providers: move |_, ()| async move { Ok(()) }, + block_import, + para_client: client.clone(), + para_backend: backend, + relay_client: relay_chain_interface, + code_hash_provider: move |block_hash| { + client + .code_at(block_hash) + .ok() + .map(|c| ValidationCode::from(c).hash()) + }, + keystore, + collator_key, + para_id, + overseer_handle, + relay_chain_slot_duration, + proposer, + collator_service, + authoring_duration: Duration::from_millis(2000), + reinitialize: false, + }; + let fut = aura::run::( + params, + ); + task_manager + .spawn_essential_handle() + .spawn("aura", None, fut); + + Ok(()) +} + /// Start a node with the given parachain `Configuration` and relay chain `Configuration`. -/// -/// This is the actual implementation that is abstract over the executor and the runtime api. #[sc_tracing::logging::prefix_logs_with("Parachain")] -async fn start_node_impl( +pub async fn start_parachain_node( parachain_config: Configuration, polkadot_config: Configuration, collator_options: CollatorOptions, @@ -180,7 +270,11 @@ async fn start_node_impl( let params = new_partial(¶chain_config)?; let (block_import, mut telemetry, telemetry_worker_handle) = params.other; - let net_config = sc_network::config::FullNetworkConfiguration::new(¶chain_config.network); + let net_config = sc_network::config::FullNetworkConfiguration::< + _, + _, + sc_network::NetworkWorker, + >::new(¶chain_config.network); let client = params.client.clone(); let backend = params.backend.clone(); @@ -202,6 +296,8 @@ async fn start_node_impl( let transaction_pool = params.transaction_pool.clone(); let import_queue_service = params.import_queue.service(); + // NOTE: because we use Aura here explicitly, we can use `CollatorSybilResistance::Resistant` + // when starting the network. let (network, system_rpc_tx, tx_handler_controller, start_network, sync_service) = build_network(BuildNetworkParams { parachain_config: ¶chain_config, @@ -216,6 +312,29 @@ async fn start_node_impl( }) .await?; + if parachain_config.offchain_worker.enabled { + use futures::FutureExt; + + task_manager.spawn_handle().spawn( + "offchain-workers-runner", + "offchain-work", + sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions { + runtime_api_provider: client.clone(), + keystore: Some(params.keystore_container.keystore()), + offchain_db: backend.offchain_storage(), + transaction_pool: Some(OffchainTransactionPoolFactory::new( + transaction_pool.clone(), + )), + network_provider: Arc::new(network.clone()), + is_validator: parachain_config.role.is_authority(), + enable_http_requests: false, + custom_extensions: move |_| vec![], + }) + .run(client.clone(), task_manager.spawn_handle()) + .boxed(), + ); + } + let rpc_builder = { let client = client.clone(); let transaction_pool = transaction_pool.clone(); @@ -225,7 +344,6 @@ async fn start_node_impl( client: client.clone(), pool: transaction_pool.clone(), deny_unsafe, - command_sink: None, }; crate::rpc::create_full(deps).map_err(Into::into) @@ -239,8 +357,8 @@ async fn start_node_impl( task_manager: &mut task_manager, config: parachain_config, keystore: params.keystore_container.keystore(), - backend, - network: network.clone(), + backend: backend.clone(), + network, sync_service: sync_service.clone(), system_rpc_tx, tx_handler_controller, @@ -303,13 +421,13 @@ async fn start_node_impl( if validator { start_consensus( client.clone(), + backend, block_import, prometheus_registry.as_ref(), telemetry.as_ref().map(|t| t.handle()), &task_manager, - relay_chain_interface.clone(), + relay_chain_interface, transaction_pool, - sync_service.clone(), params.keystore_container.keystore(), relay_chain_slot_duration, para_id, @@ -324,153 +442,42 @@ async fn start_node_impl( Ok((task_manager, client)) } -/// Build the import queue for the parachain runtime. -fn build_import_queue( - client: Arc, - block_import: ParachainBlockImport, - config: &Configuration, - telemetry: Option, - task_manager: &TaskManager, -) -> Result, sc_service::Error> { - let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?; - - Ok( - cumulus_client_consensus_aura::equivocation_import_queue::fully_verifying_import_queue::< - sp_consensus_aura::sr25519::AuthorityPair, - _, - _, - _, - _, - >( - client, - block_import, - move |_, _| async move { - let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); - Ok(timestamp) - }, - slot_duration, - &task_manager.spawn_essential_handle(), - config.prometheus_registry(), - telemetry, - ), - ) -} - -fn start_consensus( - client: Arc, - block_import: ParachainBlockImport, - prometheus_registry: Option<&Registry>, - telemetry: Option, - task_manager: &TaskManager, - relay_chain_interface: Arc, - transaction_pool: Arc>, - sync_oracle: Arc>, - keystore: KeystorePtr, - relay_chain_slot_duration: Duration, - para_id: ParaId, - collator_key: CollatorPair, - overseer_handle: OverseerHandle, - announce_block: Arc>) + Send + Sync>, -) -> Result<(), sc_service::Error> { - // NOTE: because we use Aura here explicitly, we can use `CollatorSybilResistance::Resistant` - // when starting the network. - - let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?; - - let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording( - task_manager.spawn_handle(), - client.clone(), - transaction_pool, - prometheus_registry, - telemetry.clone(), - ); - - let proposer = Proposer::new(proposer_factory); - - let collator_service = CollatorService::new( - client.clone(), - Arc::new(task_manager.spawn_handle()), - announce_block, - client.clone(), - ); - - let params = BasicAuraParams { - create_inherent_data_providers: move |_, ()| async move { Ok(()) }, - block_import, - para_client: client, - relay_client: relay_chain_interface, - sync_oracle, - keystore, - collator_key, - para_id, - overseer_handle, - slot_duration, - relay_chain_slot_duration, - proposer, - collator_service, - // Very limited proposal time. - authoring_duration: Duration::from_millis(500), - collation_request_receiver: None, - }; - - let fut = - basic_aura::run::( - params, - ); - task_manager - .spawn_essential_handle() - .spawn("aura", None, fut); - - Ok(()) -} - -/// Start a parachain node. -pub async fn start_parachain_node( - parachain_config: Configuration, - polkadot_config: Configuration, - collator_options: CollatorOptions, - para_id: ParaId, - hwbench: Option, -) -> sc_service::error::Result<(TaskManager, Arc)> { - start_node_impl( - parachain_config, - polkadot_config, - collator_options, - para_id, - hwbench, - ) - .await -} - pub async fn start_solo_dev( config: Configuration, + para_id: ParaId, ) -> sc_service::error::Result<(TaskManager, Arc)> { - start_solo_node_impl(config).await + start_solo_node_impl(config, para_id).await } #[sc_tracing::logging::prefix_logs_with("Parachain")] pub async fn start_solo_node_impl( config: Configuration, + para_id: ParaId, ) -> sc_service::error::Result<(TaskManager, Arc)> { - let params = new_partial_solo(&config)?; - let mut telemetry = params.other.0; - let net_config = sc_network::config::FullNetworkConfiguration::new(&config.network); + let parachain_config = prepare_node_config(config); + + let params = new_partial_solo(¶chain_config, para_id)?; + let (mut telemetry, _telemetry_worker_handle) = params.other; + let net_config = sc_network::config::FullNetworkConfiguration::< + _, + _, + sc_network::NetworkWorker, + >::new(¶chain_config.network); - let role = config.role.clone(); - let force_authoring = config.force_authoring; - let backoff_authoring_blocks: Option<()> = None; let client = params.client.clone(); let backend = params.backend.clone(); let mut task_manager = params.task_manager; - let prometheus_registry = config.prometheus_registry().cloned(); + let transaction_pool = params.transaction_pool.clone(); let import_queue = params.import_queue; let select_chain = params.select_chain; - let keystore_container = params.keystore_container; + let force_authoring = parachain_config.force_authoring; + let backoff_authoring_blocks: Option<()> = None; + let role = parachain_config.role.clone(); let (network, system_rpc_tx, tx_handler_controller, network_starter, sync_service) = sc_service::build_network(sc_service::BuildNetworkParams { - config: &config, + config: ¶chain_config, client: client.clone(), transaction_pool: transaction_pool.clone(), spawn_handle: task_manager.spawn_handle(), @@ -479,20 +486,43 @@ pub async fn start_solo_node_impl( warp_sync_params: None, net_config, block_relay: None, + metrics: NotificationMetrics::new(None), })?; - let command_sink = if role.is_authority() { + if parachain_config.offchain_worker.enabled { + use futures::FutureExt; + + task_manager.spawn_handle().spawn( + "offchain-workers-runner", + "offchain-work", + sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions { + runtime_api_provider: client.clone(), + keystore: Some(params.keystore_container.keystore()), + offchain_db: backend.offchain_storage(), + transaction_pool: Some(OffchainTransactionPoolFactory::new( + transaction_pool.clone(), + )), + network_provider: Arc::new(network.clone()), + is_validator: parachain_config.role.is_authority(), + enable_http_requests: false, + custom_extensions: move |_| vec![], + }) + .run(client.clone(), task_manager.spawn_handle()) + .boxed(), + ); + } + + if role.is_authority() { let proposer_factory = sc_basic_authorship::ProposerFactory::new( task_manager.spawn_handle(), client.clone(), transaction_pool.clone(), - prometheus_registry.as_ref(), + None, telemetry.as_ref().map(|x| x.handle()), ); let slot_duration = sc_consensus_aura::slot_duration(&*client)?; let client_for_cidp = client.clone(); - let aura = sc_consensus_aura::start_aura::< sp_consensus_aura::sr25519::AuthorityPair, _, @@ -517,30 +547,39 @@ pub async fn start_solo_node_impl( .expect("Header lookup should succeed") .expect("Header passed in as parent should be present in backend."); let client_for_xcm = client_for_cidp.clone(); - + let additional_key_values = Some(vec![( + array_bytes::hex2bytes_unchecked( + "1cb6f36e027abb2091cfb5110ab5087f06155b3cd9a8c9e5e9a23fd5dc13a5ed", + ), + sp_consensus_aura::Slot::from_timestamp( + sp_timestamp::Timestamp::current(), + slot_duration, + ) + .encode(), + )]); + let current_para_block_head = client_for_cidp + .expect_header(block) + .ok() + .map(|h| (polkadot_primitives::HeadData(h.encode()))); async move { let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( - *timestamp, - slot_duration, - ); - + *timestamp, + slot_duration, + ); let mocked_parachain = MockValidationDataInherentDataProvider { current_para_block, + current_para_block_head, + para_id, relay_offset: 1000, - relay_blocks_per_para_block: 2, - xcm_config: MockXcmConfig::new( - &*client_for_xcm, - block, - Default::default(), - Default::default(), - ), + relay_blocks_per_para_block: 1, + xcm_config: MockXcmConfig::new(&*client_for_xcm, block, Default::default()), raw_downward_messages: vec![], raw_horizontal_messages: vec![], para_blocks_per_relay_epoch: 0, relay_randomness_config: (), - additional_key_values: None, + additional_key_values, }; Ok((slot, timestamp, mocked_parachain)) @@ -548,7 +587,7 @@ pub async fn start_solo_node_impl( }, force_authoring, backoff_authoring_blocks, - keystore: keystore_container.keystore(), + keystore: params.keystore_container.keystore(), sync_oracle: sync_service.clone(), justification_sync_link: sync_service.clone(), // We got around 500ms for proposing @@ -564,11 +603,7 @@ pub async fn start_solo_node_impl( task_manager .spawn_essential_handle() .spawn_blocking("aura", Some("block-authoring"), aura); - - None - } else { - None - }; + } let rpc_builder = { let client = client.clone(); @@ -579,7 +614,6 @@ pub async fn start_solo_node_impl( client: client.clone(), pool: transaction_pool.clone(), deny_unsafe, - command_sink: command_sink.clone(), }; crate::rpc::create_full(deps).map_err(Into::into) @@ -591,10 +625,10 @@ pub async fn start_solo_node_impl( client: client.clone(), transaction_pool: transaction_pool.clone(), task_manager: &mut task_manager, - config, - keystore: keystore_container.keystore(), - backend, - network: network.clone(), + config: parachain_config, + keystore: params.keystore_container.keystore(), + backend: backend.clone(), + network, sync_service: sync_service.clone(), system_rpc_tx, tx_handler_controller, @@ -606,7 +640,10 @@ pub async fn start_solo_node_impl( Ok((task_manager, client)) } -pub fn new_partial_solo(config: &Configuration) -> Result { +pub fn new_partial_solo( + config: &Configuration, + para_id: ParaId, +) -> Result { let telemetry = config .telemetry_endpoints .clone() @@ -624,7 +661,7 @@ pub fn new_partial_solo(config: &Configuration) -> Result Result( + sc_service::new_full_parts_record_import::( config, telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()), executor, + true, )?; let client = Arc::new(client); @@ -675,6 +711,20 @@ pub fn new_partial_solo(config: &Configuration) -> Result Result(I); - impl InstantFinalizeBlockImport { /// Create a new instance. pub fn new(inner: I) -> Self { Self(inner) } } - #[async_trait::async_trait] impl BlockImport for InstantFinalizeBlockImport where Block: BlockT, - I: BlockImport + Send, + I: BlockImport + Send + std::marker::Sync, { type Error = I::Error; async fn check_block( - &mut self, + &self, block: sc_consensus::BlockCheckParams, ) -> Result { self.0.check_block(block).await diff --git a/invarch/runtime/Cargo.toml b/invarch/runtime/Cargo.toml index fbcc7f72..6e8aa6b5 100644 --- a/invarch/runtime/Cargo.toml +++ b/invarch/runtime/Cargo.toml @@ -16,6 +16,7 @@ substrate-wasm-builder = { workspace = true } [dependencies] codec = { workspace = true } +docify = { workspace = true } hex-literal = { workspace = true } log = { workspace = true } scale-info = { workspace = true } @@ -66,10 +67,16 @@ sp-version = { workspace = true } pallet-tx-pause = { workspace = true } # ORML +orml-asset-registry = { workspace = true } +orml-currencies = { workspace = true } orml-xcm = { workspace = true } orml-vesting = { workspace = true } orml-traits = { workspace = true } +orml-traits2 = { workspace = true } orml-tokens = { workspace = true } +orml-tokens2 = { workspace = true } +orml-xtokens = { workspace = true } +orml-xcm-support = { workspace = true } # Polkadot pallet-xcm = { workspace = true } @@ -86,6 +93,7 @@ cumulus-pallet-parachain-system = { workspace = true } cumulus-pallet-session-benchmarking = { workspace = true } cumulus-pallet-xcm = { workspace = true } cumulus-pallet-xcmp-queue = { workspace = true } +cumulus-primitives-aura = { workspace = true } cumulus-primitives-core = { workspace = true } cumulus-primitives-timestamp = { workspace = true } cumulus-primitives-utility = { workspace = true } @@ -107,6 +115,7 @@ on-chain-release-build = ["metadata-hash"] std = [ "codec/std", "cumulus-pallet-aura-ext/std", + "cumulus-primitives-aura/std", "cumulus-pallet-dmp-queue/std", "cumulus-pallet-parachain-system/std", "cumulus-pallet-xcm/std", @@ -120,7 +129,6 @@ std = [ "frame-system-rpc-runtime-api/std", "frame-system/std", "log/std", - "orml-tokens/std", "pallet-aura/std", "pallet-authorship/std", "pallet-balances/std", @@ -149,8 +157,13 @@ std = [ "xcm-builder/std", "xcm-executor/std", "xcm/std", + "orml-asset-registry/std", + "orml-currencies/std", "orml-vesting/std", + "orml-tokens/std", + "orml-tokens2/std", "orml-xcm/std", + "orml-xtokens/std", "pallet-identity/std", "pallet-treasury/std", "pallet-tx-pause/std", @@ -176,6 +189,9 @@ runtime-benchmarks = [ "pallet-xcm/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", + "pallet-checked-inflation/runtime-benchmarks", + "pallet-dao-manager/runtime-benchmarks", + "pallet-dao-staking/runtime-benchmarks", ] try-runtime = [ diff --git a/invarch/runtime/src/assets.rs b/invarch/runtime/src/assets.rs index 50edc2ba..e901d504 100644 --- a/invarch/runtime/src/assets.rs +++ b/invarch/runtime/src/assets.rs @@ -1,8 +1,97 @@ -use crate::common_types::AssetId; -use frame_support::parameter_types; +use crate::{ + balances, + common_types::AssetId, + staking::MaxNameLength, + xcm_config::{ + AccountIdToMultiLocation, BaseXcmWeight, CurrencyIdConvert, MaxInstructions, + ParachainMinFee, SelfLocation, UniversalLocation, XcmConfig, + }, + AccountId, Amount, Balance, Balances, BlockNumber, Runtime, RuntimeCall, RuntimeEvent, Tokens, +}; +use codec::{Decode, Encode, MaxEncodedLen}; +use frame_support::{parameter_types, traits::Everything}; +use frame_system::EnsureRoot; +use orml_currencies::BasicCurrencyAdapter; +use orml_traits2::{location::AbsoluteReserveProvider, parameter_type_with_key}; +use scale_info::TypeInfo; + +use xcm_builder::FixedWeightBounds; pub const VARCH_ASSET_ID: AssetId = 0; parameter_types! { pub const NativeAssetId: AssetId = VARCH_ASSET_ID; } + +#[derive(TypeInfo, Encode, Decode, Clone, Eq, PartialEq, Debug, MaxEncodedLen)] +pub struct CustomMetadata { + pub fee_per_second: u128, +} + +impl orml_asset_registry::Config for Runtime { + type RuntimeEvent = RuntimeEvent; + type AuthorityOrigin = EnsureRoot; + type AssetId = AssetId; + type Balance = Balance; + type AssetProcessor = orml_asset_registry::SequentialId; + type StringLimit = MaxNameLength; + type CustomMetadata = CustomMetadata; + type WeightInfo = (); +} + +impl orml_currencies::Config for Runtime { + type MultiCurrency = Tokens; + type NativeCurrency = BasicCurrencyAdapter; + type GetNativeCurrencyId = NativeAssetId; + type WeightInfo = (); +} + +parameter_type_with_key! { + pub Eds: |currency_id: AssetId| -> Balance { + if let Some(metadata) = orml_asset_registry::Pallet::::metadata::(*currency_id) { + metadata.existential_deposit + } else { + // Asset does not exist - not supported + Balance::MAX + } + }; +} + +impl orml_tokens2::Config for Runtime { + type RuntimeEvent = RuntimeEvent; + type Balance = Balance; + type Amount = Amount; + type CurrencyId = AssetId; + // Ideally we would use AssetRegistry but having multiple instances of orml pallets is causing + // issues related to traits. + type ExistentialDeposits = Eds; + type MaxLocks = balances::MaxFreezes; + type DustRemovalWhitelist = (); + type MaxReserves = balances::MaxReserves; + type ReserveIdentifier = [u8; 8]; + type CurrencyHooks = (); + type WeightInfo = (); +} + +parameter_types! { + pub const MaxAssetsForTransfer: usize = 50; +} + +impl orml_xtokens::Config for Runtime { + type RuntimeEvent = RuntimeEvent; + type Balance = Balance; + type CurrencyId = AssetId; + type CurrencyIdConvert = CurrencyIdConvert; + type SelfLocation = SelfLocation; + type XcmExecutor = xcm_executor::XcmExecutor; + type Weigher = FixedWeightBounds; + type BaseXcmWeight = BaseXcmWeight; + type MaxAssetsForTransfer = MaxAssetsForTransfer; + type MinXcmFee = ParachainMinFee; + type ReserveProvider = AbsoluteReserveProvider; + type UniversalLocation = UniversalLocation; + type AccountIdToLocation = AccountIdToMultiLocation; + type LocationsFilter = Everything; + type RateLimiter = (); + type RateLimiterId = (); +} diff --git a/invarch/runtime/src/balances.rs b/invarch/runtime/src/balances.rs index b1c7e147..bffa19b0 100644 --- a/invarch/runtime/src/balances.rs +++ b/invarch/runtime/src/balances.rs @@ -7,6 +7,7 @@ use frame_support::{ pallet_prelude::ConstU32, parameter_types, traits::{ + fungible::{self, Balanced}, tokens::{PayFromAccount, UnityAssetBalanceConversion}, Currency, Imbalance, OnUnbalanced, SortedMembers, }, @@ -25,6 +26,8 @@ use sp_std::vec::Vec; parameter_types! { pub const ExistentialDeposit: Balance = EXISTENTIAL_DEPOSIT; + pub const MaxFreezes: u32 = 50; + pub const MaxReserves: u32 = 50; } impl pallet_balances::Config for Runtime { @@ -37,12 +40,10 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = pallet_balances::weights::SubstrateWeight; - type MaxReserves = ConstU32<50>; + type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; - - type MaxHolds = ConstU32<1>; - type FreezeIdentifier = (); - type MaxFreezes = (); + type FreezeIdentifier = [u8; 8]; + type MaxFreezes = MaxFreezes; type RuntimeFreezeReason = RuntimeFreezeReason; type RuntimeHoldReason = RuntimeHoldReason; } @@ -68,17 +69,17 @@ impl WeightToFeePolynomial for WeightToFee { } } -pub type NegativeImbalance = >::NegativeImbalance; +pub type NegativeImbalance = + fungible::Credit<::AccountId, Balances>; pub struct ToCollatorPot; impl OnUnbalanced for ToCollatorPot { fn on_nonzero_unbalanced(amount: NegativeImbalance) { let collator_pot = ::PotId::get().into_account_truncating(); - Balances::resolve_creating(&collator_pot, amount); + let _ = Balances::resolve(&collator_pot, amount); } } - pub struct DealWithFees; impl OnUnbalanced for DealWithFees { fn on_unbalanceds(mut fees_then_tips: impl Iterator) { @@ -90,14 +91,17 @@ impl OnUnbalanced for DealWithFees { let (to_treasury, to_collators) = fees.ration(50, 50); ToCollatorPot::on_unbalanced(to_collators); - Treasury::on_unbalanced(to_treasury) + // Treasury is still based on the old Currency trait. + Treasury::on_nonzero_unbalanced( + >::NegativeImbalance::new(to_treasury.peek()), + ); } } } impl pallet_transaction_payment::Config for Runtime { type RuntimeEvent = RuntimeEvent; - type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter; + type OnChargeTransaction = pallet_transaction_payment::FungibleAdapter; type WeightToFee = WeightToFee; type LengthToFee = ConstantMultiplier; type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; @@ -155,20 +159,22 @@ impl pallet_treasury::Config for Runtime { type BeneficiaryLookup = IdentityLookup; type PalletId = TreasuryPalletId; type Currency = Balances; - type ApproveOrigin = EnsureRoot; + // type ApproveOrigin = EnsureRoot; type RejectOrigin = EnsureRoot; type RuntimeEvent = RuntimeEvent; - type OnSlash = (); + // type OnSlash = (); type Paymaster = PayFromAccount; type PayoutPeriod = PayoutSpendPeriod; - type ProposalBond = ProposalBond; - type ProposalBondMinimum = ProposalBondMinimum; + // type ProposalBond = ProposalBond; + // type ProposalBondMinimum = ProposalBondMinimum; type SpendPeriod = SpendPeriod; type Burn = (); type BurnDestination = (); type SpendFunds = (); type WeightInfo = pallet_treasury::weights::SubstrateWeight; type MaxApprovals = MaxApprovals; - type ProposalBondMaximum = (); + // type ProposalBondMaximum = (); type SpendOrigin = frame_support::traits::NeverEnsureOrigin; + #[cfg(feature = "runtime-benchmarks")] + type BenchmarkHelper = (); } diff --git a/invarch/runtime/src/dao_manager.rs b/invarch/runtime/src/dao_manager.rs index e887ba11..a9ac0b35 100644 --- a/invarch/runtime/src/dao_manager.rs +++ b/invarch/runtime/src/dao_manager.rs @@ -1,13 +1,15 @@ use crate::{ balances::DealWithFees, common_types::CommonId, AccountId, Balance, Balances, CoreAssets, - ParachainInfo, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, TransactionByteFee, UNIT, + ParachainInfo, Runtime, RuntimeCall, RuntimeEvent, RuntimeHoldReason, RuntimeOrigin, + TransactionByteFee, UNIT, }; use codec::{Decode, Encode}; use frame_support::{ parameter_types, traits::{ - fungibles::{Balanced, Credit, Inspect, Unbalanced}, - Contains, Currency, OnUnbalanced, + fungible::Credit, + fungibles::{Balanced, Credit as Credits, Inspect, Unbalanced}, + Contains, OnUnbalanced, }, weights::ConstantMultiplier, }; @@ -44,13 +46,11 @@ impl pallet_dao_manager::Config for Runtime { type DaoCreationFee = DaoCreationFee; type FeeCharger = FeeCharger; type WeightInfo = pallet_dao_manager::weights::SubstrateWeight; - + type RuntimeHoldReason = RuntimeHoldReason; type Tokens = NoTokens; type RelayAssetId = NoId; type RelayDaoCreationFee = RelayDaoCreationFee; - type MaxCallSize = MaxCallSize; - type ParaId = ParaId; type LengthToFee = ConstantMultiplier; } @@ -183,8 +183,8 @@ impl MultisigFeeHandler for FeeCharger { fn handle_creation_fee( imbalance: FeeAssetNegativeImbalance< - >::NegativeImbalance, - Credit, + Credit, + Credits, >, ) { match imbalance { diff --git a/invarch/runtime/src/lib.rs b/invarch/runtime/src/lib.rs index 127c823a..60265131 100644 --- a/invarch/runtime/src/lib.rs +++ b/invarch/runtime/src/lib.rs @@ -8,6 +8,7 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; use frame_support::{ + derive_impl, dispatch::DispatchClass, parameter_types, traits::{ConstU32, ConstU64, Contains, Everything, InsideBoth}, @@ -38,7 +39,7 @@ use sp_version::RuntimeVersion; #[cfg(any(feature = "std", test))] pub use sp_runtime::BuildStorage; -mod assets; +pub mod assets; pub mod balances; mod common_types; mod dao_manager; @@ -60,6 +61,9 @@ pub type AccountId = <::Signer as IdentifyAccount>::Account /// Balance of an account. pub type Balance = u128; +/// The amount type, should be signed version of Balance. +pub type Amount = i128; + /// Nonce of a transaction in the chain. pub type Nonce = u32; @@ -113,8 +117,27 @@ pub type Executive = frame_executive::Executive< AllPalletsWithSystem, >; +/// Maximum number of blocks simultaneously accepted by the Runtime, not yet included into the +/// relay chain. +pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1; +/// How many parachain blocks are processed by the relay chain per parent. Limits the number of +/// blocks authored per slot. +pub const BLOCK_PROCESSING_VELOCITY: u32 = 1; +/// Relay chain slot duration, in milliseconds. +pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000; + +/// Aura consensus hook +type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook< + Runtime, + RELAY_CHAIN_SLOT_DURATION_MILLIS, + BLOCK_PROCESSING_VELOCITY, + UNINCLUDED_SEGMENT_CAPACITY, +>; + /// Opaque types. These are used by the CLI to instantiate machinery that don't need to know -/// the specifics of the runtime. They can then be made to be agnostic over specific formats +/// the specifics of the runtime. +/// +/// They can then be made to be agnostic over specific formats /// of data like extrinsics, allowing for them to continue syncing the network through upgrades /// to even the dao data structures. pub mod opaque { @@ -149,6 +172,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { }; /// This determines the average expected block time that we are targeting. +/// /// Blocks will be produced at a minimum duration defined by `SLOT_DURATION`. /// `SLOT_DURATION` is picked up by `pallet_timestamp` which is in turn picked /// up by `pallet_aura` to implement `fn slot_duration()`. @@ -237,6 +261,7 @@ parameter_types! { // Configure FRAME pallets to include in runtime. +#[derive_impl(frame_system::config_preludes::ParaChainDefaultConfig as frame_system::DefaultConfig)] impl frame_system::Config for Runtime { /// The identifier used to distinguish between accounts. type AccountId = AccountId; @@ -317,6 +342,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime { type ReservedXcmpWeight = ReservedXcmpWeight; type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases; type WeightInfo = cumulus_pallet_parachain_system::weights::SubstrateWeight; + type ConsensusHook = ConsensusHook; } impl parachain_info::Config for Runtime {} @@ -348,6 +374,7 @@ impl pallet_aura::Config for Runtime { type DisabledValidators = (); type MaxAuthorities = ConstU32<100_000>; type AllowMultipleBlocksPerSlot = AllowMultipleBlocksPerSlot; + type SlotDuration = ConstU64; } parameter_types! { @@ -474,6 +501,11 @@ construct_runtime_modified!( TransactionPayment: pallet_transaction_payment = 11, Treasury: pallet_treasury = 12, Vesting: orml_vesting = 13, + AssetRegistry: orml_asset_registry = 14, + Currencies: orml_currencies = 15, + Tokens: orml_tokens2 = 16, + XTokens: orml_xtokens = 17, + // Collator support. The order of these 4 are important and shall not change. Authorship: pallet_authorship = 20, @@ -486,7 +518,7 @@ construct_runtime_modified!( XcmpQueue: cumulus_pallet_xcmp_queue = 30, PolkadotXcm: pallet_xcm = 31, CumulusXcm: cumulus_pallet_xcm = 32, - DmpQueue: cumulus_pallet_dmp_queue = 33, + // DmpQueue: cumulus_pallet_dmp_queue = 33, OrmlXcm: orml_xcm = 34, MessageQueue: pallet_message_queue = 35, @@ -497,8 +529,7 @@ construct_runtime_modified!( OcifStaking: pallet_dao_staking = 51, INV4: pallet_dao_manager = 71, - CoreAssets: orml_tokens = 72, - // 73 reserved for pallet-rings + CoreAssets: orml_tokens = 72, // Asset used for DAO Management } ); @@ -516,6 +547,9 @@ mod benches { [pallet_timestamp, Timestamp] [pallet_collator_selection, CollatorSelection] [cumulus_pallet_xcmp_queue, XcmpQueue] + [pallet_dao_manager, INV4] + [pallet_dao_staking, OcifStaking] + [pallet_checked_inflation, CheckedInflation] ); } @@ -526,7 +560,16 @@ impl_runtime_apis! { } fn authorities() -> Vec { - Aura::authorities().into_inner() + pallet_aura::Authorities::::get().into_inner() + } + } + + impl cumulus_primitives_aura::AuraUnincludedSegmentApi for Runtime { + fn can_build_upon( + included_hash: ::Hash, + slot: cumulus_primitives_aura::Slot, + ) -> bool { + ConsensusHook::can_build_upon(included_hash, slot) } } @@ -539,7 +582,7 @@ impl_runtime_apis! { Executive::execute_block(block) } - fn initialize_block(header: &::Header) { + fn initialize_block(header: &::Header) -> sp_runtime::ExtrinsicInclusionMode{ Executive::initialize_block(header) } } @@ -705,7 +748,8 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result, sp_runtime::RuntimeString> { - use frame_benchmarking::{Benchmarking, BenchmarkBatch, TrackedStorageKey}; + use frame_benchmarking::{Benchmarking, BenchmarkBatch}; + use frame_support::traits::TrackedStorageKey; use frame_system_benchmarking::Pallet as SystemBench; impl frame_system_benchmarking::Config for Runtime {} @@ -730,46 +774,24 @@ impl_runtime_apis! { let params = (&config, &whitelist); add_benchmarks!(params, batches); - if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) } + // if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) } Ok(batches) } } impl sp_genesis_builder::GenesisBuilder for Runtime { - fn create_default_config() -> Vec { - frame_support::genesis_builder_helper::create_default_config::() + fn get_preset(id: &Option) -> Option> { + frame_support::genesis_builder_helper::get_preset::(id, |_| None) } - - fn build_config(config: Vec) -> sp_genesis_builder::Result { - frame_support::genesis_builder_helper::build_config::(config) + fn preset_names() -> Vec { + vec![] + } + fn build_state(config: Vec) -> sp_genesis_builder::Result { + frame_support::genesis_builder_helper::build_state::(config) } - } -} - -struct CheckInherents; - -impl cumulus_pallet_parachain_system::CheckInherents for CheckInherents { - fn check_inherents( - block: &Block, - relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof, - ) -> sp_inherents::CheckInherentsResult { - let relay_chain_slot = relay_state_proof - .read_slot() - .expect("Could not read the relay chain slot from the proof"); - - let inherent_data = - cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration( - relay_chain_slot, - sp_std::time::Duration::from_secs(6), - ) - .create_inherent_data() - .expect("Could not create the timestamp inherent data"); - - inherent_data.check_extrinsics(block) } } cumulus_pallet_parachain_system::register_validate_block! { Runtime = Runtime, BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::, - CheckInherents = CheckInherents, } diff --git a/invarch/runtime/src/staking.rs b/invarch/runtime/src/staking.rs index 1dd1f3e0..251c073a 100644 --- a/invarch/runtime/src/staking.rs +++ b/invarch/runtime/src/staking.rs @@ -1,6 +1,6 @@ use crate::{ - Balance, Balances, BlockNumber, ExistentialDeposit, MessageQueue, Runtime, RuntimeEvent, DAYS, - UNIT, + Balance, Balances, BlockNumber, ExistentialDeposit, MessageQueue, Runtime, RuntimeEvent, + RuntimeHoldReason, DAYS, UNIT, }; use cumulus_primitives_core::AggregateMessageOrigin; use frame_support::{parameter_types, PalletId}; @@ -24,6 +24,7 @@ parameter_types! { } impl pallet_dao_staking::Config for Runtime { + type OldCurrency = Balances; type Currency = Balances; type BlocksPerEra = BlocksPerEra; type RegisterDeposit = RegisterDeposit; @@ -44,4 +45,5 @@ impl pallet_dao_staking::Config for Runtime { type StakingMessage = frame_support::traits::EnqueueWithOrigin; type WeightToFee = crate::WeightToFee; type OnUnbalanced = crate::DealWithFees; + type RuntimeHoldReason = RuntimeHoldReason; } diff --git a/invarch/runtime/src/weights/mod.rs b/invarch/runtime/src/weights/mod.rs index ed0b4dbc..68584168 100644 --- a/invarch/runtime/src/weights/mod.rs +++ b/invarch/runtime/src/weights/mod.rs @@ -24,5 +24,6 @@ pub mod rocksdb_weights; pub use block_weights::constants::BlockExecutionWeight; pub use extrinsic_weights::constants::ExtrinsicBaseWeight; +#[allow(unused_imports)] pub use paritydb_weights::constants::ParityDbWeight; pub use rocksdb_weights::constants::RocksDbWeight; diff --git a/invarch/runtime/src/xcm_config.rs b/invarch/runtime/src/xcm_config.rs index d2c846d3..52bceed2 100644 --- a/invarch/runtime/src/xcm_config.rs +++ b/invarch/runtime/src/xcm_config.rs @@ -1,43 +1,62 @@ +use crate::{Balance, Currencies, DealWithFees, TreasuryAccount}; + use super::{ - AccountId, AllPalletsWithSystem, Balances, ConstU32, MessageQueue, ParachainInfo, - ParachainSystem, PolkadotXcm, Runtime, RuntimeBlockWeights, RuntimeCall, RuntimeEvent, - RuntimeOrigin, Weight, WeightToFee, XcmpQueue, + assets::VARCH_ASSET_ID, common_types::AssetId, AccountId, AllPalletsWithSystem, AssetRegistry, + Balances, ConstU32, MessageQueue, ParachainInfo, ParachainSystem, PolkadotXcm, Runtime, + RuntimeBlockWeights, RuntimeCall, RuntimeEvent, RuntimeOrigin, Weight, WeightToFee, XcmpQueue, }; +use codec::{Decode, Encode, MaxEncodedLen}; use cumulus_primitives_core::{AggregateMessageOrigin, ParaId}; use frame_support::{ - match_types, parameter_types, - traits::{EnqueueWithOrigin, Everything, Nothing, TransformOrigin}, + parameter_types, + traits::{Everything, Nothing, TransformOrigin}, }; use frame_system::EnsureRoot; +use orml_traits2::{ + location::AbsoluteReserveProvider, parameter_type_with_key, FixedConversionRateProvider, + MultiCurrency, +}; +use orml_xcm_support::{ + DepositToAlternative, IsNativeConcrete, MultiCurrencyAdapter, MultiNativeAsset, +}; use pallet_dao_staking::primitives::{ CustomAggregateMessageOrigin, CustomMessageProcessor, CustomNarrowOriginToSibling, CustomParaIdToSibling, }; use pallet_xcm::XcmPassthrough; use polkadot_parachain::primitives::Sibling; -use polkadot_runtime_common::{impls::ToAuthor, xcm_sender::NoPriceForMessageDelivery}; -use sp_runtime::Perbill; -use xcm::latest::prelude::*; +use polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery; +use scale_info::TypeInfo; +use sp_runtime::{ + traits::{Convert, MaybeEquivalence}, + Perbill, +}; +use sp_std::sync::Arc; +use xcm::{v3::MultiLocation, v4::prelude::*}; use xcm_builder::{ AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, - AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, EnsureXcmOrigin, FixedWeightBounds, - FungibleAdapter, IsConcrete, NativeAsset, ParentIsPreset, RelayChainAsNative, + AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, DescribeAllTerminal, DescribeFamily, + EnsureXcmOrigin, FixedWeightBounds, HashedDescription, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, - SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, + SignedToAccountId32, SovereignSignedViaLocation, TakeRevenue, TakeWeightCredit, + UsingComponents, WithComputedOrigin, }; use xcm_executor::XcmExecutor; parameter_types! { - pub const RelayLocation: MultiLocation = MultiLocation::parent(); + pub const RelayLocation: Location = Location::parent(); pub const RelayNetwork: NetworkId = NetworkId::Polkadot; pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into(); - pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into(); - pub UniversalLocation: InteriorMultiLocation = X2(GlobalConsensus(RelayNetwork::get()), Parachain(ParachainInfo::parachain_id().into())); + pub Ancestry: Location = Parachain(ParachainInfo::parachain_id().into()).into(); + pub UniversalLocation: InteriorLocation = [GlobalConsensus(RelayNetwork::get()), Parachain(ParachainInfo::parachain_id().into())].into(); pub const RelayAggregate: CustomAggregateMessageOrigin = CustomAggregateMessageOrigin::Aggregate(AggregateMessageOrigin::Parent); + pub SelfLocation: Location = Location::new(1, cumulus_primitives_core::Junctions::X1(Arc::new([Parachain(ParachainInfo::parachain_id().into());1]))); + pub LocalAssetLocation: Location = Location::new(0, Junctions::X1([Junction::GeneralIndex(VARCH_ASSET_ID.into())].into())); } -/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used -/// when determining ownership of accounts for asset transacting and when attempting to use XCM +/// Type for specifying how a `Location` can be converted into an `AccountId`. +/// +/// This is used when determining ownership of accounts for asset transacting and when attempting to use XCM /// `Transact` in order to determine the dispatch Origin. pub type LocationToAccountId = ( // The parent (Relay-chain) origin converts to the default `AccountId`. @@ -46,25 +65,26 @@ pub type LocationToAccountId = ( SiblingParachainConvertsVia, // Straight up local `AccountId32` origins just alias directly to `AccountId`. AccountId32Aliases, + // Generate remote accounts according to polkadot standards + HashedDescription>, ); -/// Means for transacting assets on this chain. -pub type LocalAssetTransactor = FungibleAdapter< - // Use this currency: - Balances, - // Use this currency when it is a fungible asset matching the given location or name: - IsConcrete, - // Do a simple punn to convert an AccountId32 MultiLocation into a native chain account ID: - LocationToAccountId, - // Our chain's account ID type (we can't get away without mentioning it explicitly): - AccountId, - // We don't track any teleports. +pub type NewLocalAssetTransactor = MultiCurrencyAdapter< + Currencies, (), + IsNativeConcrete, + AccountId, + LocationToAccountId, + AssetId, + CurrencyIdConvert, + DepositToAlternative, >; /// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance, +/// /// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can /// biases the kind of local `Origin` it will become. +/// pub type XcmOriginToTransactDispatchOrigin = ( // Sovereign account converter; this attempts to derive an `AccountId` from the origin location // using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for @@ -89,11 +109,11 @@ parameter_types! { pub const MaxAssetsIntoHolding: u32 = 8; } -match_types! { - pub type ParentOrParentsPlurality: impl Contains = { - MultiLocation { parents: 1, interior: Here } | - MultiLocation { parents: 1, interior: X1(Plurality { .. }) } - }; +pub struct ParentOrParentsPlurality; +impl frame_support::traits::Contains for ParentOrParentsPlurality { + fn contains(location: &Location) -> bool { + matches!(location.unpack(), (1, []) | (1, [Plurality { .. }])) + } } pub type Barrier = ( @@ -105,21 +125,66 @@ pub type Barrier = ( AllowKnownQueryResponses, // Subscriptions for version tracking are OK. AllowSubscriptionsFrom, + WithComputedOrigin< + ( + AllowTopLevelPaidExecutionFrom, + // Subscriptions for version tracking are OK. + AllowSubscriptionsFrom, + ), + UniversalLocation, + ConstU32<8>, + >, ); +pub struct ToTreasury; +impl TakeRevenue for ToTreasury { + fn take_revenue(revenue: Asset) { + if let Asset { + id: AssetId(location), + fun: Fungible(amount), + } = revenue + { + if let Some(currency_id) = CurrencyIdConvert::convert(location) { + let _ = crate::Currencies::deposit(currency_id, &TreasuryAccount::get(), amount); + } + } + } +} + +pub type AssetRegistryWeightTrader = orml_asset_registry::AssetRegistryTrader< + orml_asset_registry::FixedRateAssetRegistryTrader, + ToTreasury, +>; +pub struct MyFixedConversionRateProvider; +impl FixedConversionRateProvider for MyFixedConversionRateProvider { + fn get_fee_per_second(location: &Location) -> Option { + CurrencyIdConvert::convert(location.clone()).and_then(|id| { + if id == VARCH_ASSET_ID { + // for VARCH we use the `UsingComponents` `Trader` impl. + None + } else { + crate::AssetRegistry::metadata(id) + .map(|metadata| metadata.additional.fee_per_second) + } + }) + } +} + pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { type RuntimeCall = RuntimeCall; type XcmSender = XcmRouter; // How to withdraw and deposit an asset. - type AssetTransactor = LocalAssetTransactor; + type AssetTransactor = NewLocalAssetTransactor; type OriginConverter = XcmOriginToTransactDispatchOrigin; - type IsReserve = NativeAsset; + type IsReserve = MultiNativeAsset; type IsTeleporter = (); // Teleporting is disabled. type Barrier = Barrier; type Weigher = FixedWeightBounds; - type Trader = - UsingComponents>; + type Trader = ( + UsingComponents, + AssetRegistryWeightTrader, + ); type ResponseHandler = PolkadotXcm; type AssetTrap = PolkadotXcm; type AssetClaims = PolkadotXcm; @@ -133,8 +198,13 @@ impl xcm_executor::Config for XcmConfig { type MaxAssetsIntoHolding = MaxAssetsIntoHolding; type UniversalAliases = Nothing; type CallDispatcher = RuntimeCall; - type SafeCallFilter = (); - type Aliasers = (); + type SafeCallFilter = Everything; + type Aliasers = Nothing; + type TransactionalProcessor = xcm_builder::FrameTransactionalProcessor; + type HrmpNewChannelOpenRequestHandler = (); + type HrmpChannelAcceptedHandler = (); + type HrmpChannelClosingHandler = (); + type XcmRecorder = (); } /// No local origins on this chain are allowed to dispatch XCM sends/executions. @@ -151,7 +221,7 @@ pub type XcmRouter = ( #[cfg(feature = "runtime-benchmarks")] parameter_types! { - pub ReachableDest: Option = Some(MultiLocation::parent()); + pub ReachableDest: Option = Some(Location::parent()); } parameter_types! { @@ -160,35 +230,30 @@ parameter_types! { } impl pallet_xcm::Config for Runtime { - type RuntimeEvent = RuntimeEvent; - type SendXcmOrigin = EnsureXcmOrigin; - type XcmRouter = XcmRouter; - type ExecuteXcmOrigin = EnsureXcmOrigin; - type XcmExecuteFilter = Everything; - type XcmExecutor = XcmExecutor; - type XcmTeleportFilter = Everything; - type XcmReserveTransferFilter = Nothing; - type Weigher = FixedWeightBounds; - type RuntimeOrigin = RuntimeOrigin; - type RuntimeCall = RuntimeCall; - - const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; + type AdminOrigin = EnsureRoot; // ^ Override for AdvertisedXcmVersion default type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion; - - type UniversalLocation = UniversalLocation; type Currency = Balances; type CurrencyMatcher = (); - type TrustedLockers = (); - type SovereignAccountOf = (); + type ExecuteXcmOrigin = EnsureXcmOrigin; type MaxLockers = MaxLockers; - type WeightInfo = pallet_xcm::TestWeightInfo; - type AdminOrigin = EnsureRoot; type MaxRemoteLockConsumers = MaxRemoteLockConsumers; type RemoteLockConsumerIdentifier = (); - - #[cfg(feature = "runtime-benchmarks")] - type ReachableDest = ReachableDest; + type RuntimeCall = RuntimeCall; + type RuntimeEvent = RuntimeEvent; + type RuntimeOrigin = RuntimeOrigin; + type SendXcmOrigin = EnsureXcmOrigin; + type SovereignAccountOf = (); + type TrustedLockers = (); + type UniversalLocation = UniversalLocation; + const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; + type Weigher = FixedWeightBounds; + type WeightInfo = pallet_xcm::TestWeightInfo; + type XcmExecuteFilter = Everything; + type XcmExecutor = XcmExecutor; + type XcmReserveTransferFilter = Everything; + type XcmRouter = XcmRouter; + type XcmTeleportFilter = Nothing; } impl cumulus_pallet_xcm::Config for Runtime { @@ -204,7 +269,7 @@ impl orml_xcm::Config for Runtime { impl cumulus_pallet_xcmp_queue::Config for Runtime { type RuntimeEvent = RuntimeEvent; type ChannelInfo = ParachainSystem; - type VersionWrapper = (); + type VersionWrapper = PolkadotXcm; type ControllerOrigin = EnsureRoot; type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin; type PriceForSiblingDelivery = NoPriceForMessageDelivery; @@ -216,18 +281,22 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { CustomParaIdToSibling, >; type MaxInboundSuspended = ConstU32<1000>; + type MaxActiveOutboundChannels = sp_core::ConstU32<128>; + type MaxPageSize = sp_core::ConstU32<{ 103 * 1024 }>; } -impl cumulus_pallet_dmp_queue::Config for Runtime { - type RuntimeEvent = RuntimeEvent; - type DmpSink = EnqueueWithOrigin; - type WeightInfo = cumulus_pallet_dmp_queue::weights::SubstrateWeight; -} +// Deprecated +// impl cumulus_pallet_dmp_queue::Config for Runtime { +// type RuntimeEvent = RuntimeEvent; +// type DmpSink = EnqueueWithOrigin; +// type WeightInfo = cumulus_pallet_dmp_queue::weights::SubstrateWeight; +// } parameter_types! { pub MessageQueueServiceWeight: Weight = Perbill::from_percent(35) * RuntimeBlockWeights::get().max_block; pub const MessageQueueMaxStale: u32 = 8; pub const MessageQueueHeapSize: u32 = 128 * 1048; + pub IdleMaxServiceWeight: Weight = Perbill::from_percent(15) * RuntimeBlockWeights::get().max_block; } impl pallet_message_queue::Config for Runtime { @@ -255,4 +324,105 @@ impl pallet_message_queue::Config for Runtime { type HeapSize = MessageQueueHeapSize; type MaxStale = MessageQueueMaxStale; type ServiceWeight = MessageQueueServiceWeight; + type IdleMaxServiceWeight = IdleMaxServiceWeight; +} + +pub struct AccountIdToMultiLocation; +impl Convert for AccountIdToMultiLocation { + fn convert(account: AccountId) -> Location { + [AccountId32 { + network: None, + id: account.into(), + }] + .into() + } +} + +const ASSET_HUB_PARA_ID: u32 = 1000; + +parameter_type_with_key! { + pub ParachainMinFee: |location: Location| -> Option { + #[allow(clippy::match_ref_pats)] // false positive + match (location.parents, location.first_interior()) { + (1, Some(Parachain(ASSET_HUB_PARA_ID))) => Some(50_000_000), + _ => None, + } + }; +} + +#[derive(Debug, Default, Encode, Decode, Clone, PartialEq, Eq, TypeInfo, MaxEncodedLen)] +pub struct AssetLocation(pub xcm::v3::Location); + +impl From for Option { + fn from(location: AssetLocation) -> Option { + xcm_builder::WithLatestLocationConverter::::convert_back(&location.0) + } +} + +impl TryFrom for AssetLocation { + type Error = (); + + fn try_from(value: Location) -> Result { + let loc: MultiLocation = value.try_into()?; + Ok(AssetLocation(loc)) + } +} + +pub struct CurrencyIdConvert; + +impl Convert> for CurrencyIdConvert { + fn convert(id: AssetId) -> Option { + match id { + VARCH_ASSET_ID => Some(Location { + parents: 1, + interior: [ + Parachain(ParachainInfo::parachain_id().into()), + GeneralIndex(id.into()), + ] + .into(), + }), + _ => { + if let Ok(Some(location)) = AssetRegistry::location(&id) { + AssetLocation(location).into() + } else { + None + } + } + } + } +} + +impl Convert> for CurrencyIdConvert { + fn convert(location: Location) -> Option { + let Location { parents, interior } = location.clone(); + + match interior { + Junctions::X2(a) + if parents == 1 + && a.contains(&Parachain(ParachainInfo::parachain_id().into())) + && a.contains(&GeneralIndex(VARCH_ASSET_ID.into())) => + { + Some(VARCH_ASSET_ID) + } + Junctions::X1(a) + if parents == 0 && a.contains(&GeneralIndex(VARCH_ASSET_ID.into())) => + { + Some(VARCH_ASSET_ID) + } + _ => { + let location: Option = location.try_into().ok(); + if let Some(location) = location { + AssetRegistry::location_to_asset_id(location.0) + } else { + None + } + } + } + } +} + +impl Convert> for CurrencyIdConvert { + fn convert(asset: Asset) -> Option { + Self::convert(asset.id.0) + } } diff --git a/invarch/rust-toolchain.toml b/invarch/rust-toolchain.toml index 1fef7767..15eb34b7 100644 --- a/invarch/rust-toolchain.toml +++ b/invarch/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "nightly-2024-07-15" +channel = "nightly-2024-10-01" targets = ["wasm32-unknown-unknown"] components = [ "rustfmt", "rustc", "rust-std", "cargo", "clippy", "llvm-tools-preview", "rust-src"] \ No newline at end of file diff --git a/new-modified-construct-runtime/Cargo.lock b/new-modified-construct-runtime/Cargo.lock index c4b59bc5..951c1108 100644 --- a/new-modified-construct-runtime/Cargo.lock +++ b/new-modified-construct-runtime/Cargo.lock @@ -142,13 +142,13 @@ dependencies = [ [[package]] name = "derive-syn-parse" -version = "0.1.5" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79116f119dd1dba1abf1f3405f03b9b0e79a27a3883864bfebded8a3dc768cd" +checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] @@ -185,7 +185,7 @@ dependencies = [ "prettier-please", "proc-macro2", "quote", - "syn 2.0.48", + "syn", ] [[package]] @@ -196,7 +196,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.48", + "syn", ] [[package]] @@ -205,7 +205,7 @@ version = "3.0.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn", ] [[package]] @@ -256,9 +256,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" dependencies = [ "either", ] @@ -286,50 +286,50 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "macro_magic" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e03844fc635e92f3a0067e25fa4bf3e3dbf3f2927bf3aa01bb7bc8f1c428949d" +checksum = "cc33f9f0351468d26fbc53d9ce00a096c8522ecb42f19b50f34f2c422f76d21d" dependencies = [ "macro_magic_core", "macro_magic_macros", "quote", - "syn 2.0.48", + "syn", ] [[package]] name = "macro_magic_core" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "468155613a44cfd825f1fb0ffa532b018253920d404e6fca1e8d43155198a46d" +checksum = "1687dc887e42f352865a393acae7cf79d98fab6351cde1f58e9e057da89bf150" dependencies = [ "const-random", "derive-syn-parse", "macro_magic_core_macros", "proc-macro2", "quote", - "syn 2.0.48", + "syn", ] [[package]] name = "macro_magic_core_macros" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea73aa640dc01d62a590d48c0c3521ed739d53b27f919b25c3551e233481654" +checksum = "b02abfe41815b5bd98dbd4260173db2c116dda171dc0fe7838cb206333b83308" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn", ] [[package]] name = "macro_magic_macros" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef9d79ae96aaba821963320eb2b6e34d17df1e5a83d8a1985c29cc5be59577b3" +checksum = "73ea28ee64b88876bf45277ed9a5817c1817df061a74f2b988971a12570e5869" dependencies = [ "macro_magic_core", "quote", - "syn 2.0.48", + "syn", ] [[package]] @@ -353,8 +353,8 @@ dependencies = [ "proc-macro2", "quote", "regex", - "sp-core-hashing", - "syn 2.0.48", + "sp-crypto-hashing", + "syn", ] [[package]] @@ -376,16 +376,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22020dfcf177fcc7bf5deaf7440af371400c67c0de14c399938d8ed4fb4645d3" dependencies = [ "proc-macro2", - "syn 2.0.48", + "syn", ] [[package]] name = "proc-macro-crate" -version = "1.3.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "once_cell", "toml_edit", ] @@ -397,7 +396,7 @@ checksum = "834da187cfe638ae8abb0203f0b33e5ccdb02a28e7199f2f47b3e2754f50edca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn", ] [[package]] @@ -505,9 +504,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] -name = "sp-core-hashing" -version = "9.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=release-polkadot-v1.6.0#61801ce324f18eacb9c29e2f674f0d262a00bd4d" +name = "sp-crypto-hashing" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot-sdk.git?branch=stable2407#38945d04518b2cce5ad7f7a7f7e42197fe8fbe16" dependencies = [ "blake2b_simd", "byteorder", @@ -531,20 +530,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.48" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", "quote", @@ -562,15 +550,15 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", "toml_datetime", @@ -615,9 +603,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "winnow" -version = "0.5.40" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] diff --git a/new-modified-construct-runtime/Cargo.toml b/new-modified-construct-runtime/Cargo.toml index 02c86839..3bc0bf3c 100644 --- a/new-modified-construct-runtime/Cargo.toml +++ b/new-modified-construct-runtime/Cargo.toml @@ -15,26 +15,26 @@ targets = ["x86_64-unknown-linux-gnu"] proc-macro = true [dependencies] -derive-syn-parse = "0.1.5" +derive-syn-parse = "0.2.0" Inflector = "0.11.4" cfg-expr = "0.15.5" -itertools = "0.10.3" -proc-macro2 = "1.0.56" -quote = "1.0.28" -syn = { version = "2.0.48", features = ["full"] } +itertools = "0.11.0" +proc-macro2 = "1.0.64" +quote = "1.0.33" +syn = { version = "2.0.53", features = ["full", "parsing", "visit-mut"] } frame-support-procedural-tools = { path = "./tools" } -macro_magic = { version = "0.5.0", features = ["proc_support"] } +macro_magic = { version = "0.5.1", features = ["proc_support"] } proc-macro-warning = { version = "1.0.0", default-features = false } expander = "2.0.0" -sp-core-hashing = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0" } +sp-crypto-hashing = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407" } [dev-dependencies] -regex = "1" +regex = "1.10.2" [features] default = ["std"] -std = [] +std = ["sp-crypto-hashing/std"] no-metadata-docs = [] # Generate impl-trait for tuples with the given number of tuples. Will be needed as the number of # pallets in a runtime grows. Does increase the compile time! diff --git a/new-modified-construct-runtime/src/construct_runtime/expand/call.rs b/new-modified-construct-runtime/src/construct_runtime/expand/call.rs index a431222c..cc467c31 100644 --- a/new-modified-construct-runtime/src/construct_runtime/expand/call.rs +++ b/new-modified-construct-runtime/src/construct_runtime/expand/call.rs @@ -69,6 +69,7 @@ pub fn expand_outer_dispatch( quote! { #( #query_call_part_macros )* + /// The aggregated runtime call type. #[derive( Clone, PartialEq, Eq, #scrate::__private::codec::Encode, @@ -181,7 +182,7 @@ pub fn expand_outer_dispatch( type PostInfo = #scrate::dispatch::PostDispatchInfo; fn dispatch(self, origin: RuntimeOrigin) -> #scrate::dispatch::DispatchResultWithPostInfo { if !::filter_call(&origin, &self) { - return #scrate::__private::sp_std::result::Result::Err( + return ::core::result::Result::Err( #system_path::Error::<#runtime>::CallFiltered.into() ); } diff --git a/new-modified-construct-runtime/src/construct_runtime/expand/composite_helper.rs b/new-modified-construct-runtime/src/construct_runtime/expand/composite_helper.rs index 69e8dfcf..be6b2f08 100644 --- a/new-modified-construct-runtime/src/construct_runtime/expand/composite_helper.rs +++ b/new-modified-construct-runtime/src/construct_runtime/expand/composite_helper.rs @@ -68,3 +68,34 @@ pub(crate) fn expand_variant( } } } + +pub(crate) fn expand_variant_count( + composite_name: &str, + path: &PalletPath, + instance: Option<&Ident>, +) -> TokenStream { + let composite_name = quote::format_ident!("{}", composite_name); + + if let Some(inst) = instance { + quote! { + #path::#composite_name::<#path::#inst>::VARIANT_COUNT + } + } else { + // Wrapped `<`..`>` means: use default type parameter for enum. + // + // This is used for pallets without instance support or pallets with instance support when + // we don't specify instance: + // + // ``` + // pub struct Pallet{..} + // + // #[pallet::composite_enum] + // pub enum HoldReason {..} + // + // Pallet1: pallet_x, // <- default type parameter + // ``` + quote! { + <#path::#composite_name>::VARIANT_COUNT + } + } +} diff --git a/new-modified-construct-runtime/src/construct_runtime/expand/config.rs b/new-modified-construct-runtime/src/construct_runtime/expand/config.rs index 4ddb5700..ff715e58 100644 --- a/new-modified-construct-runtime/src/construct_runtime/expand/config.rs +++ b/new-modified-construct-runtime/src/construct_runtime/expand/config.rs @@ -86,10 +86,6 @@ pub fn expand_outer_config( #fields } - #[cfg(any(feature = "std", test))] - #[deprecated(note = "GenesisConfig is planned to be removed in December 2023. Use `RuntimeGenesisConfig` instead.")] - pub type GenesisConfig = RuntimeGenesisConfig; - #[cfg(any(feature = "std", test))] impl #scrate::sp_runtime::BuildStorage for RuntimeGenesisConfig { fn assimilate_storage( @@ -109,6 +105,17 @@ pub fn expand_outer_config( ::on_genesis(); } } + + /// Test the `Default` derive impl of the `RuntimeGenesisConfig`. + #[cfg(test)] + #[test] + fn test_genesis_config_builds() { + #scrate::__private::sp_io::TestExternalities::default().execute_with(|| { + ::build( + &RuntimeGenesisConfig::default() + ); + }); + } } } diff --git a/new-modified-construct-runtime/src/construct_runtime/expand/freeze_reason.rs b/new-modified-construct-runtime/src/construct_runtime/expand/freeze_reason.rs index 653cba28..131c919e 100644 --- a/new-modified-construct-runtime/src/construct_runtime/expand/freeze_reason.rs +++ b/new-modified-construct-runtime/src/construct_runtime/expand/freeze_reason.rs @@ -23,6 +23,7 @@ use quote::quote; pub fn expand_outer_freeze_reason(pallet_decls: &[Pallet], scrate: &TokenStream) -> TokenStream { let mut conversion_fns = Vec::new(); let mut freeze_reason_variants = Vec::new(); + let mut freeze_reason_variants_count = Vec::new(); for decl in pallet_decls { if let Some(_) = decl.find_part("FreezeReason") { let variant_name = &decl.name; @@ -44,9 +45,14 @@ pub fn expand_outer_freeze_reason(pallet_decls: &[Pallet], scrate: &TokenStream) instance, variant_name, )); + + freeze_reason_variants_count.push(composite_helper::expand_variant_count( + "FreezeReason", + path, + instance, + )); } } - let freeze_reason_variants_count = freeze_reason_variants.len() as u32; quote! { /// A reason for placing a freeze on funds. @@ -61,7 +67,7 @@ pub fn expand_outer_freeze_reason(pallet_decls: &[Pallet], scrate: &TokenStream) } impl #scrate::traits::VariantCount for RuntimeFreezeReason { - const VARIANT_COUNT: u32 = #freeze_reason_variants_count; + const VARIANT_COUNT: u32 = 0 #( + #freeze_reason_variants_count )*; } #( #conversion_fns )* diff --git a/new-modified-construct-runtime/src/construct_runtime/expand/hold_reason.rs b/new-modified-construct-runtime/src/construct_runtime/expand/hold_reason.rs index 3249870a..58870a32 100644 --- a/new-modified-construct-runtime/src/construct_runtime/expand/hold_reason.rs +++ b/new-modified-construct-runtime/src/construct_runtime/expand/hold_reason.rs @@ -23,6 +23,7 @@ use quote::quote; pub fn expand_outer_hold_reason(pallet_decls: &[Pallet], scrate: &TokenStream) -> TokenStream { let mut conversion_fns = Vec::new(); let mut hold_reason_variants = Vec::new(); + let mut hold_reason_variants_count = Vec::new(); for decl in pallet_decls { if let Some(_) = decl.find_part("HoldReason") { let variant_name = &decl.name; @@ -44,9 +45,14 @@ pub fn expand_outer_hold_reason(pallet_decls: &[Pallet], scrate: &TokenStream) - instance, variant_name, )); + + hold_reason_variants_count.push(composite_helper::expand_variant_count( + "HoldReason", + path, + instance, + )); } } - let hold_reason_variants_count = hold_reason_variants.len() as u32; quote! { /// A reason for placing a hold on funds. @@ -61,7 +67,7 @@ pub fn expand_outer_hold_reason(pallet_decls: &[Pallet], scrate: &TokenStream) - } impl #scrate::traits::VariantCount for RuntimeHoldReason { - const VARIANT_COUNT: u32 = #hold_reason_variants_count; + const VARIANT_COUNT: u32 = 0 #( + #hold_reason_variants_count )*; } #( #conversion_fns )* diff --git a/new-modified-construct-runtime/src/construct_runtime/expand/inherent.rs b/new-modified-construct-runtime/src/construct_runtime/expand/inherent.rs index 55854fcb..9705f970 100644 --- a/new-modified-construct-runtime/src/construct_runtime/expand/inherent.rs +++ b/new-modified-construct-runtime/src/construct_runtime/expand/inherent.rs @@ -61,17 +61,17 @@ pub fn expand_outer_inherent( trait InherentDataExt { fn create_extrinsics(&self) -> - #scrate::__private::sp_std::vec::Vec<<#block as #scrate::sp_runtime::traits::Block>::Extrinsic>; + #scrate::__private::Vec<<#block as #scrate::sp_runtime::traits::Block>::Extrinsic>; fn check_extrinsics(&self, block: &#block) -> #scrate::inherent::CheckInherentsResult; } impl InherentDataExt for #scrate::inherent::InherentData { fn create_extrinsics(&self) -> - #scrate::__private::sp_std::vec::Vec<<#block as #scrate::sp_runtime::traits::Block>::Extrinsic> + #scrate::__private::Vec<<#block as #scrate::sp_runtime::traits::Block>::Extrinsic> { use #scrate::inherent::ProvideInherent; - let mut inherents = #scrate::__private::sp_std::vec::Vec::new(); + let mut inherents = #scrate::__private::Vec::new(); #( #pallet_attrs @@ -207,47 +207,50 @@ pub fn expand_outer_inherent( } } + impl #scrate::traits::IsInherent<<#block as #scrate::sp_runtime::traits::Block>::Extrinsic> for #runtime { + fn is_inherent(ext: &<#block as #scrate::sp_runtime::traits::Block>::Extrinsic) -> bool { + use #scrate::inherent::ProvideInherent; + use #scrate::traits::{IsSubType, ExtrinsicCall}; + + if #scrate::sp_runtime::traits::Extrinsic::is_signed(ext).unwrap_or(false) { + // Signed extrinsics are never inherents. + return false + } + + #( + #pallet_attrs + { + let call = <#unchecked_extrinsic as ExtrinsicCall>::call(ext); + if let Some(call) = IsSubType::<_>::is_sub_type(call) { + if <#pallet_names as ProvideInherent>::is_inherent(&call) { + return true; + } + } + } + )* + false + } + } + impl #scrate::traits::EnsureInherentsAreFirst<#block> for #runtime { - fn ensure_inherents_are_first(block: &#block) -> Result<(), u32> { + fn ensure_inherents_are_first(block: &#block) -> Result { use #scrate::inherent::ProvideInherent; use #scrate::traits::{IsSubType, ExtrinsicCall}; use #scrate::sp_runtime::traits::Block as _; - let mut first_signed_observed = false; + let mut num_inherents = 0u32; for (i, xt) in block.extrinsics().iter().enumerate() { - let is_signed = #scrate::sp_runtime::traits::Extrinsic::is_signed(xt) - .unwrap_or(false); - - let is_inherent = if is_signed { - // Signed extrinsics are not inherents. - false - } else { - let mut is_inherent = false; - #( - #pallet_attrs - { - let call = <#unchecked_extrinsic as ExtrinsicCall>::call(xt); - if let Some(call) = IsSubType::<_>::is_sub_type(call) { - if #pallet_names::is_inherent(&call) { - is_inherent = true; - } - } - } - )* - is_inherent - }; - - if !is_inherent { - first_signed_observed = true; - } + if >::is_inherent(xt) { + if num_inherents != i as u32 { + return Err(i as u32); + } - if first_signed_observed && is_inherent { - return Err(i as u32) + num_inherents += 1; // Safe since we are in an `enumerate` loop. } } - Ok(()) + Ok(num_inherents) } } } diff --git a/new-modified-construct-runtime/src/construct_runtime/expand/metadata.rs b/new-modified-construct-runtime/src/construct_runtime/expand/metadata.rs index 4d496b9a..9f3d9cd4 100644 --- a/new-modified-construct-runtime/src/construct_runtime/expand/metadata.rs +++ b/new-modified-construct-runtime/src/construct_runtime/expand/metadata.rs @@ -84,16 +84,16 @@ pub fn expand_runtime_metadata( // Each runtime must expose the `runtime_metadata()` to fetch the runtime API metadata. // The function is implemented by calling `impl_runtime_apis!`. // - // However, the `construct_runtime_modified!` may be called without calling `impl_runtime_apis!`. + // However, the `construct_runtime!` may be called without calling `impl_runtime_apis!`. // Rely on the `Deref` trait to differentiate between a runtime that implements - // APIs (by macro impl_runtime_apis!) and a runtime that is simply created (by macro construct_runtime_modified!). + // APIs (by macro impl_runtime_apis!) and a runtime that is simply created (by macro construct_runtime!). // // Both `InternalConstructRuntime` and `InternalImplRuntimeApis` expose a `runtime_metadata()` function. - // `InternalConstructRuntime` is implemented by the `construct_runtime_modified!` for Runtime references (`& Runtime`), + // `InternalConstructRuntime` is implemented by the `construct_runtime!` for Runtime references (`& Runtime`), // while `InternalImplRuntimeApis` is implemented by the `impl_runtime_apis!` for Runtime (`Runtime`). // // Therefore, the `Deref` trait will resolve the `runtime_metadata` from `impl_runtime_apis!` - // when both macros are called; and will resolve an empty `runtime_metadata` when only the `construct_runtime_modified!` + // when both macros are called; and will resolve an empty `runtime_metadata` when only the `construct_runtime!` // is called. // // `Deref` needs a reference for resolving the function call. @@ -114,7 +114,7 @@ pub fn expand_runtime_metadata( >(); #scrate::__private::metadata_ir::MetadataIR { - pallets: #scrate::__private::sp_std::vec![ #(#pallets),* ], + pallets: #scrate::__private::vec![ #(#pallets),* ], extrinsic: #scrate::__private::metadata_ir::ExtrinsicMetadataIR { ty, version: <#extrinsic as #scrate::sp_runtime::traits::ExtrinsicMetadata>::VERSION, @@ -159,7 +159,7 @@ pub fn expand_runtime_metadata( }) } - pub fn metadata_versions() -> #scrate::__private::sp_std::vec::Vec { + pub fn metadata_versions() -> #scrate::__private::Vec { #scrate::__private::metadata_ir::supported_versions() } } diff --git a/new-modified-construct-runtime/src/construct_runtime/expand/origin.rs b/new-modified-construct-runtime/src/construct_runtime/expand/origin.rs index a82d052e..32bf0c8b 100644 --- a/new-modified-construct-runtime/src/construct_runtime/expand/origin.rs +++ b/new-modified-construct-runtime/src/construct_runtime/expand/origin.rs @@ -109,26 +109,26 @@ pub fn expand_outer_origin( #[doc = #doc_string] #[derive(Clone)] pub struct RuntimeOrigin { - caller: OriginCaller, - filter: #scrate::__private::sp_std::rc::Rc::RuntimeCall) -> bool>>, + pub caller: OriginCaller, + filter: #scrate::__private::Rc<#scrate::__private::Box::RuntimeCall) -> bool>>, } #[cfg(not(feature = "std"))] - impl #scrate::__private::sp_std::fmt::Debug for RuntimeOrigin { + impl core::fmt::Debug for RuntimeOrigin { fn fmt( &self, - fmt: &mut #scrate::__private::sp_std::fmt::Formatter, - ) -> #scrate::__private::sp_std::result::Result<(), #scrate::__private::sp_std::fmt::Error> { + fmt: &mut core::fmt::Formatter, + ) -> core::result::Result<(), core::fmt::Error> { fmt.write_str("") } } #[cfg(feature = "std")] - impl #scrate::__private::sp_std::fmt::Debug for RuntimeOrigin { + impl core::fmt::Debug for RuntimeOrigin { fn fmt( &self, - fmt: &mut #scrate::__private::sp_std::fmt::Formatter, - ) -> #scrate::__private::sp_std::result::Result<(), #scrate::__private::sp_std::fmt::Error> { + fmt: &mut core::fmt::Formatter, + ) -> core::result::Result<(), core::fmt::Error> { fmt.debug_struct("Origin") .field("caller", &self.caller) .field("filter", &"[function ptr]") @@ -144,7 +144,7 @@ pub fn expand_outer_origin( fn add_filter(&mut self, filter: impl Fn(&Self::Call) -> bool + 'static) { let f = self.filter.clone(); - self.filter = #scrate::__private::sp_std::rc::Rc::new(Box::new(move |call| { + self.filter = #scrate::__private::Rc::new(#scrate::__private::Box::new(move |call| { f(call) && filter(call) })); } @@ -155,7 +155,7 @@ pub fn expand_outer_origin( as #scrate::traits::Contains<<#runtime as #system_path::Config>::RuntimeCall> >::contains; - self.filter = #scrate::__private::sp_std::rc::Rc::new(Box::new(filter)); + self.filter = #scrate::__private::Rc::new(#scrate::__private::Box::new(filter)); } fn set_caller_from(&mut self, other: impl Into) { @@ -257,7 +257,7 @@ pub fn expand_outer_origin( impl TryFrom for #system_path::Origin<#runtime> { type Error = OriginCaller; fn try_from(x: OriginCaller) - -> #scrate::__private::sp_std::result::Result<#system_path::Origin<#runtime>, OriginCaller> + -> core::result::Result<#system_path::Origin<#runtime>, OriginCaller> { if let OriginCaller::system(l) = x { Ok(l) @@ -280,7 +280,7 @@ pub fn expand_outer_origin( fn from(x: OriginCaller) -> Self { let mut o = RuntimeOrigin { caller: x, - filter: #scrate::__private::sp_std::rc::Rc::new(Box::new(|_| true)), + filter: #scrate::__private::Rc::new(#scrate::__private::Box::new(|_| true)), }; #scrate::traits::OriginTrait::reset_filter(&mut o); @@ -289,15 +289,15 @@ pub fn expand_outer_origin( } } - // impl From for #scrate::__private::sp_std::result::Result<#system_path::Origin<#runtime>, RuntimeOrigin> { - // /// NOTE: converting to pallet origin loses the origin filter information. - // fn from(val: RuntimeOrigin) -> Self { - // if let OriginCaller::system(l) = val.caller { - // Ok(l) - // } else { - // Err(val) - // } - // } + // impl From for core::result::Result<#system_path::Origin<#runtime>, RuntimeOrigin> { + // /// NOTE: converting to pallet origin loses the origin filter information. + // fn from(val: RuntimeOrigin) -> Self { + // if let OriginCaller::system(l) = val.caller { + // Ok(l) + // } else { + // Err(val) + // } + // } // } impl From::AccountId>> for RuntimeOrigin { #[doc = #doc_string_runtime_origin_with_caller] @@ -357,7 +357,7 @@ fn expand_origin_caller_variant( } fn expand_origin_pallet_conversions( - scrate: &TokenStream, + _scrate: &TokenStream, runtime: &Ident, pallet: &Pallet, instance: Option<&Ident>, @@ -405,7 +405,7 @@ fn expand_origin_pallet_conversions( } #attr - impl From for #scrate::__private::sp_std::result::Result<#pallet_origin, RuntimeOrigin> { + impl From for core::result::Result<#pallet_origin, RuntimeOrigin> { /// NOTE: converting to pallet origin loses the origin filter information. fn from(val: RuntimeOrigin) -> Self { if let OriginCaller::#variant_name(l) = val.caller { @@ -421,7 +421,7 @@ fn expand_origin_pallet_conversions( type Error = OriginCaller; fn try_from( x: OriginCaller, - ) -> #scrate::__private::sp_std::result::Result<#pallet_origin, OriginCaller> { + ) -> core::result::Result<#pallet_origin, OriginCaller> { if let OriginCaller::#variant_name(l) = x { Ok(l) } else { @@ -435,7 +435,7 @@ fn expand_origin_pallet_conversions( type Error = (); fn try_from( x: &'a OriginCaller, - ) -> #scrate::__private::sp_std::result::Result<&'a #pallet_origin, ()> { + ) -> core::result::Result<&'a #pallet_origin, ()> { if let OriginCaller::#variant_name(l) = x { Ok(&l) } else { @@ -449,7 +449,7 @@ fn expand_origin_pallet_conversions( type Error = (); fn try_from( x: &'a RuntimeOrigin, - ) -> #scrate::__private::sp_std::result::Result<&'a #pallet_origin, ()> { + ) -> core::result::Result<&'a #pallet_origin, ()> { if let OriginCaller::#variant_name(l) = &x.caller { Ok(&l) } else { diff --git a/new-modified-construct-runtime/src/construct_runtime/expand/outer_enums.rs b/new-modified-construct-runtime/src/construct_runtime/expand/outer_enums.rs index 0bcc7265..28e39c7a 100644 --- a/new-modified-construct-runtime/src/construct_runtime/expand/outer_enums.rs +++ b/new-modified-construct-runtime/src/construct_runtime/expand/outer_enums.rs @@ -136,7 +136,6 @@ pub fn expand_outer_enum( enum_ty, )); enum_conversions.extend(expand_enum_conversion( - scrate, pallet_decl, &pallet_enum, &enum_name_ident, @@ -228,7 +227,6 @@ fn expand_enum_variant( } fn expand_enum_conversion( - scrate: &TokenStream, pallet: &Pallet, pallet_enum: &TokenStream, enum_name_ident: &Ident, @@ -258,7 +256,7 @@ fn expand_enum_conversion( impl TryInto<#pallet_enum> for #enum_name_ident { type Error = (); - fn try_into(self) -> #scrate::__private::sp_std::result::Result<#pallet_enum, Self::Error> { + fn try_into(self) -> ::core::result::Result<#pallet_enum, Self::Error> { match self { Self::#variant_name(evt) => Ok(evt), _ => Err(()), diff --git a/new-modified-construct-runtime/src/construct_runtime/mod.rs b/new-modified-construct-runtime/src/construct_runtime/mod.rs index 4dc2ee71..20f69b9a 100644 --- a/new-modified-construct-runtime/src/construct_runtime/mod.rs +++ b/new-modified-construct-runtime/src/construct_runtime/mod.rs @@ -21,10 +21,10 @@ //! order to get all the pallet parts for each pallet. //! //! Pallets can define their parts: -//! - Implicitely: `System: frame_system` +//! - Implicitly: `System: frame_system` //! - Explicitly: `System: frame_system::{Pallet, Call}` //! -//! The `construct_runtime_modified` transitions from the implicit definition to the explict one. +//! The `construct_runtime_modified` transitions from the implicit definition to the explicit one. //! From the explicit state, Substrate expands the pallets with additional information //! that is to be included in the runtime metadata. This expansion makes visible some extra //! parts of the pallets, mainly the `Error` if defined. The expanded state looks like @@ -55,7 +55,7 @@ //! +----------+ +------------------+ //! ``` //! -//! When all pallet parts are implcit, then the `construct_runtime_modified!` macro expands to its final +//! When all pallet parts are implicit, then the `construct_runtime_modified!` macro expands to its final //! state, the `ExplicitExpanded`. Otherwise, all implicit parts are converted to an explicit //! expanded part allow the `construct_runtime_modified!` to expand any remaining explicit parts to an //! explicit expanded part. @@ -172,7 +172,7 @@ //! //! This call has no implicit pallet parts, thus it will expand to the runtime construction: //! ```ignore -//! pub struct Runtime { ... } +//! pub enum Runtime { ... } //! pub struct Call { ... } //! impl Call ... //! pub enum Origin { ... } @@ -202,14 +202,16 @@ //! Similarly to the previous transition, the macro expansion transforms `System: //! frame_system::{Pallet, Call}` into `System: frame_system expanded::{Error} ::{Pallet, Call}`. //! The `expanded` section adds extra parts that the Substrate would like to expose for each pallet -//! by default. This is done to expose the approprite types for metadata construction. +//! by default. This is done to expose the appropriate types for metadata construction. //! //! This time, instead of calling `tt_default_parts` we are using the `tt_extra_parts` macro. //! This macro returns the ` :: expanded { Error }` list of additional parts we would like to //! expose. -mod expand; -mod parse; +#[allow(unused)] +pub(crate) mod expand; +#[allow(unused)] +pub(crate) mod parse; use cfg_expr::Predicate; use frame_support_procedural_tools::{ @@ -232,27 +234,38 @@ pub fn construct_runtime_modified(input: TokenStream) -> TokenStream { let input_copy = input.clone(); let definition = syn::parse_macro_input!(input as RuntimeDeclaration); - let res = match definition { - RuntimeDeclaration::Implicit(implicit_def) => { - check_pallet_number(input_copy.clone().into(), implicit_def.pallets.len()).and_then( - |_| construct_runtime_implicit_to_explicit(input_copy.into(), implicit_def), - ) - } - RuntimeDeclaration::Explicit(explicit_decl) => check_pallet_number( - input_copy.clone().into(), - explicit_decl.pallets.len(), - ) - .and_then(|_| { - construct_runtime_explicit_to_explicit_expanded(input_copy.into(), explicit_decl) - }), - RuntimeDeclaration::ExplicitExpanded(explicit_decl) => { - check_pallet_number(input_copy.into(), explicit_decl.pallets.len()) - .and_then(|_| construct_runtime_final_expansion(explicit_decl)) - } + let (check_pallet_number_res, res) = match definition { + RuntimeDeclaration::Implicit(implicit_def) => ( + check_pallet_number(input_copy.clone().into(), implicit_def.pallets.len()), + construct_runtime_implicit_to_explicit(input_copy.into(), implicit_def), + ), + RuntimeDeclaration::Explicit(explicit_decl) => ( + check_pallet_number(input_copy.clone().into(), explicit_decl.pallets.len()), + construct_runtime_explicit_to_explicit_expanded(input_copy.into(), explicit_decl), + ), + RuntimeDeclaration::ExplicitExpanded(explicit_decl) => ( + check_pallet_number(input_copy.into(), explicit_decl.pallets.len()), + construct_runtime_final_expansion(explicit_decl), + ), }; let res = res.unwrap_or_else(|e| e.to_compile_error()); + // We want to provide better error messages to the user and thus, handle the error here + // separately. If there is an error, we print the error and still generate all of the code to + // get in overall less errors for the user. + let res = if let Err(error) = check_pallet_number_res { + let error = error.to_compile_error(); + + quote! { + #error + + #res + } + } else { + res + }; + let res = expander::Expander::new("construct_runtime_modified") .dry(std::env::var("EXPAND_MACROS").is_err()) .verbose(true) @@ -362,7 +375,7 @@ fn construct_runtime_final_expansion( syn::Error::new( pallets_token.span.join(), "`System` pallet declaration is missing. \ - Please add this line: `System: frame_system::{Pallet, Call, Storage, Config, Event},`", + Please add this line: `System: frame_system,`", ) })?; if !system_pallet.cfg_pattern.is_empty() { @@ -477,7 +490,7 @@ fn construct_runtime_final_expansion( #[doc(hidden)] trait InternalConstructRuntime { #[inline(always)] - fn runtime_metadata(&self) -> #scrate::__private::sp_std::vec::Vec<#scrate::__private::metadata_ir::RuntimeApiMetadataIR> { + fn runtime_metadata(&self) -> #scrate::__private::Vec<#scrate::__private::metadata_ir::RuntimeApiMetadataIR> { Default::default() } } @@ -522,7 +535,7 @@ fn construct_runtime_final_expansion( Ok(res) } -fn decl_all_pallets<'a>( +pub(crate) fn decl_all_pallets<'a>( runtime: &'a Ident, pallet_declarations: impl Iterator, features: &HashSet<&str>, @@ -540,6 +553,7 @@ fn decl_all_pallets<'a>( for pallet_declaration in pallet_declarations { let type_name = &pallet_declaration.name; let pallet = &pallet_declaration.path; + let docs = &pallet_declaration.docs; let mut generics = vec![quote!(#runtime)]; generics.extend( pallet_declaration @@ -553,6 +567,7 @@ fn decl_all_pallets<'a>( attrs.extend(TokenStream2::from_str(&feat).expect("was parsed successfully; qed")); } let type_decl = quote!( + #( #[doc = #docs] )* #(#attrs)* pub type #type_name = #pallet::Pallet <#(#generics),*>; ); @@ -636,7 +651,8 @@ fn decl_all_pallets<'a>( #( #all_pallets_without_system )* ) } -fn decl_pallet_runtime_setup( + +pub(crate) fn decl_pallet_runtime_setup( runtime: &Ident, pallet_declarations: &[Pallet], scrate: &TokenStream2, @@ -688,10 +704,10 @@ fn decl_pallet_runtime_setup( impl #scrate::traits::PalletInfo for PalletInfo { fn index() -> Option { - let type_id = #scrate::__private::sp_std::any::TypeId::of::

(); + let type_id = core::any::TypeId::of::

(); #( #pallet_attrs - if type_id == #scrate::__private::sp_std::any::TypeId::of::<#names>() { + if type_id == core::any::TypeId::of::<#names>() { return Some(#indices) } )* @@ -700,10 +716,10 @@ fn decl_pallet_runtime_setup( } fn name() -> Option<&'static str> { - let type_id = #scrate::__private::sp_std::any::TypeId::of::

(); + let type_id = core::any::TypeId::of::

(); #( #pallet_attrs - if type_id == #scrate::__private::sp_std::any::TypeId::of::<#names>() { + if type_id == core::any::TypeId::of::<#names>() { return Some(#name_strings) } )* @@ -712,10 +728,10 @@ fn decl_pallet_runtime_setup( } fn name_hash() -> Option<[u8; 16]> { - let type_id = #scrate::__private::sp_std::any::TypeId::of::

(); + let type_id = core::any::TypeId::of::

(); #( #pallet_attrs - if type_id == #scrate::__private::sp_std::any::TypeId::of::<#names>() { + if type_id == core::any::TypeId::of::<#names>() { return Some(#name_hashes) } )* @@ -724,10 +740,10 @@ fn decl_pallet_runtime_setup( } fn module_name() -> Option<&'static str> { - let type_id = #scrate::__private::sp_std::any::TypeId::of::

(); + let type_id = core::any::TypeId::of::

(); #( #pallet_attrs - if type_id == #scrate::__private::sp_std::any::TypeId::of::<#names>() { + if type_id == core::any::TypeId::of::<#names>() { return Some(#module_names) } )* @@ -736,10 +752,10 @@ fn decl_pallet_runtime_setup( } fn crate_version() -> Option<#scrate::traits::CrateVersion> { - let type_id = #scrate::__private::sp_std::any::TypeId::of::

(); + let type_id = core::any::TypeId::of::

(); #( #pallet_attrs - if type_id == #scrate::__private::sp_std::any::TypeId::of::<#names>() { + if type_id == core::any::TypeId::of::<#names>() { return Some( <#pallet_structs as #scrate::traits::PalletInfoAccess>::crate_version() ) @@ -752,7 +768,7 @@ fn decl_pallet_runtime_setup( ) } -fn decl_integrity_test(scrate: &TokenStream2) -> TokenStream2 { +pub(crate) fn decl_integrity_test(scrate: &TokenStream2) -> TokenStream2 { quote!( #[cfg(test)] mod __construct_runtime_integrity_test { @@ -767,7 +783,7 @@ fn decl_integrity_test(scrate: &TokenStream2) -> TokenStream2 { ) } -fn decl_static_assertions( +pub(crate) fn decl_static_assertions( runtime: &Ident, pallet_decls: &[Pallet], scrate: &TokenStream2, @@ -798,7 +814,7 @@ fn decl_static_assertions( } } -fn check_pallet_number(input: TokenStream2, pallet_num: usize) -> Result<()> { +pub(crate) fn check_pallet_number(input: TokenStream2, pallet_num: usize) -> Result<()> { let max_pallet_num = { if cfg!(feature = "tuples-96") { 96 @@ -830,7 +846,7 @@ fn check_pallet_number(input: TokenStream2, pallet_num: usize) -> Result<()> { } pub(crate) fn two128_str(s: &str) -> TokenStream2 { - bytes_to_array(sp_core_hashing::twox_128(s.as_bytes()).into_iter()) + bytes_to_array(sp_crypto_hashing::twox_128(s.as_bytes()).into_iter()) } pub(crate) fn bytes_to_array(bytes: impl IntoIterator) -> TokenStream2 { diff --git a/new-modified-construct-runtime/src/construct_runtime/parse.rs b/new-modified-construct-runtime/src/construct_runtime/parse.rs index 4e7458be..7161deb7 100644 --- a/new-modified-construct-runtime/src/construct_runtime/parse.rs +++ b/new-modified-construct-runtime/src/construct_runtime/parse.rs @@ -65,8 +65,6 @@ pub enum RuntimeDeclaration { /// Declaration of a runtime with some pallet with implicit declaration of parts. #[derive(Debug)] pub struct ImplicitRuntimeDeclaration { - pub name: Ident, - pub where_section: Option, pub pallets: Vec, } @@ -103,8 +101,6 @@ impl Parse for RuntimeDeclaration { match convert_pallets(pallets.content.inner.into_iter().collect())? { PalletsConversion::Implicit(pallets) => { Ok(RuntimeDeclaration::Implicit(ImplicitRuntimeDeclaration { - name, - where_section, pallets, })) } @@ -131,9 +127,6 @@ impl Parse for RuntimeDeclaration { #[derive(Debug)] pub struct WhereSection { pub span: Span, - pub block: syn::TypePath, - pub node_block: syn::TypePath, - pub unchecked_extrinsic: syn::TypePath, } impl Parse for WhereSection { @@ -152,10 +145,9 @@ impl Parse for WhereSection { } input.parse::()?; } - let block = remove_kind(input, WhereKind::Block, &mut definitions)?.value; - let node_block = remove_kind(input, WhereKind::NodeBlock, &mut definitions)?.value; - let unchecked_extrinsic = - remove_kind(input, WhereKind::UncheckedExtrinsic, &mut definitions)?.value; + remove_kind(input, WhereKind::Block, &mut definitions)?; + remove_kind(input, WhereKind::NodeBlock, &mut definitions)?; + remove_kind(input, WhereKind::UncheckedExtrinsic, &mut definitions)?; if let Some(WhereDefinition { ref kind_span, ref kind, @@ -168,12 +160,7 @@ impl Parse for WhereSection { ); return Err(Error::new(*kind_span, msg)); } - Ok(Self { - span: input.span(), - block, - node_block, - unchecked_extrinsic, - }) + Ok(Self { span: input.span() }) } } @@ -188,7 +175,6 @@ pub enum WhereKind { pub struct WhereDefinition { pub kind_span: Span, pub kind: WhereKind, - pub value: syn::TypePath, } impl Parse for WhereDefinition { @@ -210,14 +196,10 @@ impl Parse for WhereDefinition { return Err(lookahead.error()); }; - Ok(Self { - kind_span, - kind, - value: { - let _: Token![=] = input.parse()?; - input.parse()? - }, - }) + let _: Token![=] = input.parse()?; + let _: syn::TypePath = input.parse()?; + + Ok(Self { kind_span, kind }) } } @@ -354,7 +336,7 @@ impl Parse for PalletDeclaration { /// A struct representing a path to a pallet. `PalletPath` is almost identical to the standard /// Rust path with a few restrictions: /// - No leading colons allowed -/// - Path segments can only consist of identifers separated by colons +/// - Path segments can only consist of identifiers separated by colons #[derive(Debug, Clone)] pub struct PalletPath { pub inner: Path, @@ -636,7 +618,7 @@ pub struct Pallet { pub is_expanded: bool, /// The name of the pallet, e.g.`System` in `System: frame_system`. pub name: Ident, - /// Either automatically infered, or defined (e.g. `MyPallet ... = 3,`). + /// Either automatically inferred, or defined (e.g. `MyPallet ... = 3,`). pub index: u8, /// The path of the pallet, e.g. `frame_system` in `System: frame_system`. pub path: PalletPath, @@ -646,6 +628,8 @@ pub struct Pallet { pub pallet_parts: Vec, /// Expressions specified inside of a #[cfg] attribute. pub cfg_pattern: Vec, + /// The doc literals + pub docs: Vec, } impl Pallet { @@ -675,7 +659,7 @@ impl Pallet { /// +----------+ +----------+ +------------------+ /// ``` enum PalletsConversion { - /// Pallets implicitely declare parts. + /// Pallets implicitly declare parts. /// /// `System: frame_system`. Implicit(Vec), @@ -689,7 +673,7 @@ enum PalletsConversion { /// Pallets explicitly declare parts that are fully expanded. /// /// This is the end state that contains extra parts included by - /// default by Subtrate. + /// default by Substrate. /// /// `System: frame_system expanded::{Error} ::{Pallet, Call}` /// @@ -701,7 +685,7 @@ enum PalletsConversion { /// /// Check if all pallet have explicit declaration of their parts, if so then assign index to each /// pallet using same rules as rust for fieldless enum. I.e. implicit are assigned number -/// incrementedly from last explicit or 0. +/// incrementally from last explicit or 0. fn convert_pallets(pallets: Vec) -> syn::Result { if pallets.iter().any(|pallet| pallet.pallet_parts.is_none()) { return Ok(PalletsConversion::Implicit(pallets)); @@ -827,6 +811,7 @@ fn convert_pallets(pallets: Vec) -> syn::Result>>()?; diff --git a/new-modified-construct-runtime/tools/Cargo.toml b/new-modified-construct-runtime/tools/Cargo.toml index 4eeedbdd..e46bfc5e 100644 --- a/new-modified-construct-runtime/tools/Cargo.toml +++ b/new-modified-construct-runtime/tools/Cargo.toml @@ -12,8 +12,8 @@ description = "Proc macro helpers for procedural macros" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -proc-macro-crate = "1.1.3" -proc-macro2 = "1.0.56" -quote = "1.0.26" -syn = { version = "2.0.16", features = ["full", "visit", "extra-traits"] } +proc-macro-crate = "3.0.0" +proc-macro2 = "1.0.64" +quote = "1.0.33" +syn = { version = "2.0.53", features = ["full", "visit", "extra-traits"] } frame-support-procedural-tools-derive = { version = "3.0.0", path = "./derive" } diff --git a/new-modified-construct-runtime/tools/derive/Cargo.toml b/new-modified-construct-runtime/tools/derive/Cargo.toml index 70fb0a9b..4a839431 100644 --- a/new-modified-construct-runtime/tools/derive/Cargo.toml +++ b/new-modified-construct-runtime/tools/derive/Cargo.toml @@ -15,6 +15,6 @@ targets = ["x86_64-unknown-linux-gnu"] proc-macro = true [dependencies] -proc-macro2 = "1.0.56" -quote = { version = "1.0.28", features = ["proc-macro"] } -syn = { version = "2.0.48", features = ["extra-traits", "full", "parsing", "proc-macro"] } +proc-macro2 = "1.0.64" +quote = { version = "1.0.33", features = ["proc-macro"] } +syn = { version = "2.0.53", features = ["extra-traits", "full", "parsing", "proc-macro"] } diff --git a/new-modified-construct-runtime/tools/derive/src/lib.rs b/new-modified-construct-runtime/tools/derive/src/lib.rs index 93c03ca3..66298637 100644 --- a/new-modified-construct-runtime/tools/derive/src/lib.rs +++ b/new-modified-construct-runtime/tools/derive/src/lib.rs @@ -19,8 +19,6 @@ //! Use to derive parsing for parsing struct. // end::description[] -#![recursion_limit = "128"] - use proc_macro::TokenStream; use proc_macro2::Span; use quote::quote; diff --git a/pallets/Cargo.toml b/pallets/Cargo.toml index 400d82f2..14a1edcb 100644 --- a/pallets/Cargo.toml +++ b/pallets/Cargo.toml @@ -4,7 +4,8 @@ members = [ "pallet-dao-manager", "pallet-dao-staking", "pallet-checked-inflation", - "pallet-rings", + # "pallet-rings", + "primitives", ] [workspace.package] @@ -21,12 +22,11 @@ version = '0.1.0-dev' pallet-dao-manager = { path = "./pallet-dao-manager", default-features = false } pallet-dao-staking = { path = "./pallet-dao-staking", default-features = false } pallet-checked-inflation = { path = "./pallet-checked-inflation", default-features = false } -pallet-rings = { path = "./pallet-rings", default-features = false } primitives = { path = "./primitives", package = "invarch-primitives", default-features = false } # crates.io dependencies -codec = { package = "parity-scale-codec", version = "3.6.5", features = [ +codec = { package = "parity-scale-codec", version = "3.6.12", features = [ "derive", ], default-features = false } log = { version = "0.4.20", default-features = false } @@ -38,36 +38,36 @@ serde = { version = "1.0.189", features = ["derive"] } smallvec = { version = "1.6.1" } # polkadot-sdk dependencies -frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", default-features = false, branch = "release-polkadot-v1.6.0" } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk.git", default-features = false, branch = "release-polkadot-v1.6.0" } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk.git", default-features = false, branch = "release-polkadot-v1.6.0" } -pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk.git", default-features = false, branch = "release-polkadot-v1.6.0" } -pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk.git", default-features = false, branch = "release-polkadot-v1.6.0" } -pallet-session = { git = "https://github.com/paritytech/polkadot-sdk.git", default-features = false, branch = "release-polkadot-v1.6.0" } -pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", default-features = false, branch = "release-polkadot-v1.6.0" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk.git", default-features = false, branch = "release-polkadot-v1.6.0" } -sp-api = { git = "https://github.com/paritytech/polkadot-sdk.git", default-features = false, branch = "release-polkadot-v1.6.0" } -sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk.git", default-features = false, branch = "release-polkadot-v1.6.0" } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", default-features = false, branch = "release-polkadot-v1.6.0" } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk.git", default-features = false, branch = "release-polkadot-v1.6.0" } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", default-features = false, branch = "release-polkadot-v1.6.0" } -sp-staking = { git = "https://github.com/paritytech/polkadot-sdk.git", default-features = false, branch = "release-polkadot-v1.6.0" } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk.git", default-features = false, branch = "release-polkadot-v1.6.0" } -xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk.git", default-features = false, branch = "release-polkadot-v1.6.0" } -xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk.git", default-features = false, branch = "release-polkadot-v1.6.0" } -xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk.git", default-features = false, branch = "release-polkadot-v1.6.0" } +frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +pallet-session = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +sp-staking = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk.git", default-features = false, branch = "stable2407" } +xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk.git", default-features = false, branch = "stable2407" } +xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk.git", default-features = false, branch = "stable2407" } # dev dependencies -cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2407", default-features = false } -orml-asset-registry = { git = "https://github.com/Abstracted-Labs/open-runtime-module-library.git", default-features = false, branch = "polkadot-v1.6.0" } -orml-tokens2 = { package = "orml-tokens", git = "https://github.com/arrudagates/open-runtime-module-library.git", default-features = false, rev = "bc6b41e8a9539971a2da5d62cf8f550cde985f00" } -orml-traits2 = { package = "orml-traits", git = "https://github.com/arrudagates/open-runtime-module-library.git", default-features = false, rev = "bc6b41e8a9539971a2da5d62cf8f550cde985f00" } +orml-asset-registry = { git = "https://github.com/Abstracted-Labs/open-runtime-module-library.git", default-features = false, branch = "stable2407" } +orml-tokens2 = { package = "orml-tokens", git = "https://github.com/Anny0nn/open-runtime-module-library.git", default-features = false, branch = "stable2407" } +orml-traits2 = { package = "orml-traits", git = "https://github.com/Anny0nn/open-runtime-module-library.git", default-features = false, branch = "stable2407" } -orml-tokens = { package = "orml-tokens", git = "https://github.com/Abstracted-Labs/open-runtime-module-library.git", default-features = false, branch = "polkadot-v1.6.0" } -orml-traits = { package = "orml-traits", git = "https://github.com/Abstracted-Labs/open-runtime-module-library.git", default-features = false, branch = "polkadot-v1.6.0" } +orml-tokens = { package = "orml-tokens", git = "https://github.com/Abstracted-Labs/open-runtime-module-library.git", default-features = false, branch = "stable2407" } +orml-traits = { package = "orml-traits", git = "https://github.com/Abstracted-Labs/open-runtime-module-library.git", default-features = false, branch = "stable2407" } # orml-asset-registry = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, rev = "7ecebeab7e3dbc2226ed58d32ee159271a8176ae" } # orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, rev = "7ecebeab7e3dbc2226ed58d32ee159271a8176ae" } diff --git a/pallets/pallet-checked-inflation/src/lib.rs b/pallets/pallet-checked-inflation/src/lib.rs index 7cbec736..8a4e300c 100644 --- a/pallets/pallet-checked-inflation/src/lib.rs +++ b/pallets/pallet-checked-inflation/src/lib.rs @@ -37,7 +37,6 @@ pub use inflation::*; pub use pallet::*; pub mod weights; - pub use weights::WeightInfo; #[frame_support::pallet] @@ -45,7 +44,10 @@ pub mod pallet { use super::*; use frame_support::{ pallet_prelude::*, - traits::{Currency, LockableCurrency, OnUnbalanced, ReservableCurrency}, + traits::{ + fungible::{Balanced, Credit, Inspect}, + OnUnbalanced, + }, }; use frame_system::{ ensure_root, @@ -55,12 +57,11 @@ pub mod pallet { /// The balance type of this pallet. pub(crate) type BalanceOf = - <::Currency as Currency<::AccountId>>::Balance; + <::Currency as Inspect<::AccountId>>::Balance; /// The opaque token type for an imbalance. This is returned by unbalanced operations and must be dealt with. - type NegativeImbalanceOf = <::Currency as Currency< - ::AccountId, - >>::NegativeImbalance; + type NegativeImbalanceOf = + Credit<::AccountId, ::Currency>; #[pallet::pallet] pub struct Pallet(_); @@ -70,10 +71,7 @@ pub mod pallet { /// The overarching event type. type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// The currency (token) used in this pallet. - type Currency: LockableCurrency> - + ReservableCurrency - + Currency; - + type Currency: Balanced; /// Number of blocks per era. #[pallet::constant] type BlocksPerEra: Get>; @@ -180,8 +178,9 @@ pub mod pallet { NextEraStartingBlock::::put(now + blocks_per_era); - let current_issuance = - <::Currency as Currency>::total_issuance(); + let current_issuance = <::Currency as Inspect< + ::AccountId, + >>::total_issuance(); YearStartIssuance::::put(current_issuance); @@ -228,8 +227,9 @@ pub mod pallet { let start_issuance = Self::year_start_issuance(); // Get actual current total token issuance - let current_issuance = - <::Currency as Currency>::total_issuance(); + let current_issuance = <::Currency as Inspect< + ::AccountId, + >>::total_issuance(); // Calculate the expected current total token issuance let expected_current_issuance = @@ -298,9 +298,9 @@ pub mod pallet { pub fn set_first_year_supply(root: OriginFor) -> DispatchResult { ensure_root(root)?; - YearStartIssuance::::put( - <::Currency as Currency>::total_issuance(), - ); + YearStartIssuance::::put(<::Currency as Inspect< + ::AccountId, + >>::total_issuance()); Ok(()) } diff --git a/pallets/pallet-checked-inflation/src/mock.rs b/pallets/pallet-checked-inflation/src/mock.rs index f0322edc..fa64884d 100644 --- a/pallets/pallet-checked-inflation/src/mock.rs +++ b/pallets/pallet-checked-inflation/src/mock.rs @@ -3,7 +3,7 @@ use crate::inflation::InflationMethod; use core::convert::TryFrom; use frame_support::{ derive_impl, parameter_types, - traits::{ConstU128, ConstU32, ConstU64, Currency, Hooks, OnUnbalanced}, + traits::{fungible, ConstU128, ConstU32, ConstU64, Hooks, OnUnbalanced}, }; use pallet_balances::AccountData; use sp_core::H256; @@ -13,7 +13,8 @@ type Block = frame_system::mocking::MockBlock; type Balance = u128; type AccountId = u32; -type NegativeImbalance = >::NegativeImbalance; +pub type NegativeImbalance = + frame_support::traits::fungible::Credit<::AccountId, Balances>; pub const EXISTENTIAL_DEPOSIT: Balance = 1_000_000_000; @@ -64,7 +65,8 @@ parameter_types! { pub struct DealWithInflation; impl OnUnbalanced for DealWithInflation { fn on_unbalanced(amount: NegativeImbalance) { - Balances::resolve_creating(&INFLATION_RECEIVER, amount) + >::resolve(&INFLATION_RECEIVER, amount) + .expect("should work"); } } diff --git a/pallets/pallet-checked-inflation/src/weights.rs b/pallets/pallet-checked-inflation/src/weights.rs index f8dcdb43..3eb8865c 100644 --- a/pallets/pallet-checked-inflation/src/weights.rs +++ b/pallets/pallet-checked-inflation/src/weights.rs @@ -1,25 +1,26 @@ //! Autogenerated weights for `pallet_checked_inflation` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2024-05-24, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 42.0.0 +//! DATE: 2024-10-10, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `anny.local`, CPU: `` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `franciscos-mbp.lan`, CPU: `` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// ./target/release/tinkernet-collator +// ./target/release/invarch-collator // benchmark // pallet -// --chain=dev +// --runtime +// ./target/release/wbuild/invarch-runtime/invarch_runtime.compact.compressed.wasm // --wasm-execution=compiled -// --pallet=pallet-checked-inflation -// --extrinsic=* +// --pallet=pallet_checked_inflation +// --extrinsic= // --steps // 50 // --repeat // 20 -// --output=../../InvArch-Frames/pallet-checked-inflation/src/weights.rs +// --output=../pallets/pallet-checked-inflation/src/weights.rs // --template=../weights-template.hbs #![cfg_attr(rustfmt, rustfmt_skip)] @@ -45,18 +46,18 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_000_000 picoseconds. - Weight::from_parts(3_000_000, 0) + // Minimum execution time: 1_000_000 picoseconds. + Weight::from_parts(2_000_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: `CheckedInflation::Halted` (r:1 w:1) /// Proof: `CheckedInflation::Halted` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`) fn halt_unhalt_pallet() -> Weight { // Proof Size summary in bytes: - // Measured: `42` + // Measured: `0` // Estimated: `1486` - // Minimum execution time: 5_000_000 picoseconds. - Weight::from_parts(6_000_000, 1486) + // Minimum execution time: 3_000_000 picoseconds. + Weight::from_parts(4_000_000, 1486) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -70,18 +71,18 @@ impl WeightInfo for () { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_000_000 picoseconds. - Weight::from_parts(3_000_000, 0) + // Minimum execution time: 1_000_000 picoseconds. + Weight::from_parts(2_000_000, 0) .saturating_add(RocksDbWeight::get().writes(1_u64)) } /// Storage: `CheckedInflation::Halted` (r:1 w:1) /// Proof: `CheckedInflation::Halted` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`) fn halt_unhalt_pallet() -> Weight { // Proof Size summary in bytes: - // Measured: `42` + // Measured: `0` // Estimated: `1486` - // Minimum execution time: 5_000_000 picoseconds. - Weight::from_parts(6_000_000, 1486) + // Minimum execution time: 3_000_000 picoseconds. + Weight::from_parts(4_000_000, 1486) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } diff --git a/pallets/pallet-dao-manager/Cargo.toml b/pallets/pallet-dao-manager/Cargo.toml index 349e9df5..119406e7 100644 --- a/pallets/pallet-dao-manager/Cargo.toml +++ b/pallets/pallet-dao-manager/Cargo.toml @@ -11,7 +11,7 @@ version.workspace = true [dependencies] serde = { workspace = true, optional = true } -codec = { package = "parity-scale-codec", version = "3.6.5", default-features = false, features = [ +codec = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = [ "derive", "max-encoded-len", ] } @@ -68,10 +68,15 @@ std = [ "orml-tokens2/std", "orml-traits/std", "orml-traits2/std", + "primitives/std", + "sp-api/std", + "sp-core/std", + "sp-arithmetic/std", ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", "sp-runtime/runtime-benchmarks", "frame-system/runtime-benchmarks", + "frame-support/runtime-benchmarks", ] -try-runtime = ["frame-support/try-runtime"] +try-runtime = ["frame-support/try-runtime", "sp-runtime/try-runtime"] diff --git a/pallets/pallet-dao-manager/src/account_derivation.rs b/pallets/pallet-dao-manager/src/account_derivation.rs index eefdc03d..42399bea 100644 --- a/pallets/pallet-dao-manager/src/account_derivation.rs +++ b/pallets/pallet-dao-manager/src/account_derivation.rs @@ -14,7 +14,7 @@ use crate::{Config, Pallet}; use codec::{Compact, Encode}; use frame_support::traits::Get; use sp_io::hashing::blake2_256; -use xcm::v3::{BodyId, BodyPart, Junction, Junctions}; +use xcm::v4::{BodyId, BodyPart, Junction, Junctions}; /// Trait providing the XCM location and the derived account of a dao. pub trait DaoAccountDerivation { /// Derives the dao's AccountId. @@ -44,11 +44,14 @@ where /// DAO location is defined as a plurality within the parachain. fn dao_location(dao_id: T::DaoId) -> Junctions { Junctions::X2( - Junction::Parachain(T::ParaId::get()), - Junction::Plurality { - id: BodyId::Index(dao_id.into()), - part: BodyPart::Voice, - }, + [ + Junction::Parachain(T::ParaId::get()), + Junction::Plurality { + id: BodyId::Index(dao_id.into()), + part: BodyPart::Voice, + }, + ] + .into(), ) } } diff --git a/pallets/pallet-dao-manager/src/benchmarking.rs b/pallets/pallet-dao-manager/src/benchmarking.rs index 7236e98c..713ba458 100644 --- a/pallets/pallet-dao-manager/src/benchmarking.rs +++ b/pallets/pallet-dao-manager/src/benchmarking.rs @@ -13,7 +13,10 @@ use frame_benchmarking::{account, benchmarks, whitelisted_caller}; use frame_support::{ dispatch::PostDispatchInfo, pallet_prelude::DispatchResultWithPostInfo, - traits::{Currency, Get}, + traits::{ + fungible::{Inspect, Mutate}, + Get, + }, BoundedBTreeMap, BoundedVec, }; use frame_system::RawOrigin as SystemOrigin; @@ -49,11 +52,10 @@ fn mock_dao() -> DispatchResultWithPostInfo where Result, ::RuntimeOrigin>: From<::RuntimeOrigin>, - <::Currency as Currency<::AccountId>>::Balance: - Sum, + <::Currency as Inspect<::AccountId>>::Balance: Sum, T::AccountId: From<[u8; 32]>, { - T::Currency::make_free_balance_be( + <::Currency as Mutate<::AccountId>>::set_balance( &whitelisted_caller(), T::DaoCreationFee::get() + T::DaoCreationFee::get(), ); @@ -71,8 +73,7 @@ fn mock_mint() -> Result<(), DispatchError> where Result, ::RuntimeOrigin>: From<::RuntimeOrigin>, - <::Currency as Currency<::AccountId>>::Balance: - Sum, + <::Currency as Inspect<::AccountId>>::Balance: Sum, ::RuntimeOrigin: From>, T::AccountId: From<[u8; 32]>, { @@ -87,8 +88,7 @@ fn mock_mint_2() -> Result<(), DispatchError> where Result, ::RuntimeOrigin>: From<::RuntimeOrigin>, - <::Currency as Currency<::AccountId>>::Balance: - Sum, + <::Currency as Inspect<::AccountId>>::Balance: Sum, ::RuntimeOrigin: From>, T::AccountId: From<[u8; 32]>, { @@ -103,8 +103,7 @@ fn mock_call() -> Result, ::RuntimeOrigin>: From<::RuntimeOrigin>, - <::Currency as Currency<::AccountId>>::Balance: - Sum, + <::Currency as Inspect<::AccountId>>::Balance: Sum, ::RuntimeOrigin: From>, T::AccountId: From<[u8; 32]>, { @@ -121,8 +120,7 @@ fn mock_vote() -> Result, ::RuntimeOrigin>: From<::RuntimeOrigin>, - <::Currency as Currency<::AccountId>>::Balance: - Sum, + <::Currency as Inspect<::AccountId>>::Balance: Sum, ::RuntimeOrigin: From>, T::AccountId: From<[u8; 32]>, { @@ -146,7 +144,7 @@ benchmarks! { DaoOrigin, ::RuntimeOrigin, >: From<::RuntimeOrigin>, - <::Currency as Currency<::AccountId>>::Balance: Sum, + <::Currency as Inspect<::AccountId>>::Balance: Sum, ::RuntimeOrigin: From>, T::AccountId: From<[u8; 32]>, } @@ -160,7 +158,7 @@ benchmarks! { let required_approval = perbill_one(); let creation_fee_asset = FeeAsset::Native; - T::Currency::make_free_balance_be(&caller, T::DaoCreationFee::get() + T::DaoCreationFee::get()); + <::Currency as Mutate<::AccountId>>::set_balance(&caller, T::DaoCreationFee::get() + T::DaoCreationFee::get()); }: _(SystemOrigin::Signed(caller.clone()), metadata.clone(), minimum_support, required_approval, creation_fee_asset) verify { assert_last_event::(Event::DaoCreated { diff --git a/pallets/pallet-dao-manager/src/dao_manager_core.rs b/pallets/pallet-dao-manager/src/dao_manager_core.rs index 0455cd51..09eed9db 100644 --- a/pallets/pallet-dao-manager/src/dao_manager_core.rs +++ b/pallets/pallet-dao-manager/src/dao_manager_core.rs @@ -17,9 +17,9 @@ use crate::{ use frame_support::{ pallet_prelude::*, traits::{ - fungibles::{Balanced, Mutate}, + fungible::Balanced, + fungibles::{Balanced as Balanceds, Mutate as Mutates}, tokens::{Fortitude, Precision, Preservation}, - Currency, ExistenceRequirement, WithdrawReasons, }, }; use frame_system::{ensure_signed, pallet_prelude::*}; @@ -74,16 +74,21 @@ where // Charge creation fee from the caller T::FeeCharger::handle_creation_fee(match creation_fee_asset { FeeAsset::Native => { - FeeAssetNegativeImbalance::Native(::Currency::withdraw( + FeeAssetNegativeImbalance::Native(<::Currency as Balanced< + T::AccountId, + >>::withdraw( &creator, T::DaoCreationFee::get(), - WithdrawReasons::TRANSACTION_PAYMENT, - ExistenceRequirement::KeepAlive, + Precision::Exact, + Preservation::Preserve, + Fortitude::Polite, )?) } FeeAsset::Relay => { - FeeAssetNegativeImbalance::Relay(::Tokens::withdraw( + FeeAssetNegativeImbalance::Relay(<::Tokens as Balanceds< + T::AccountId, + >>::withdraw( T::RelayAssetId::get(), &creator, T::RelayDaoCreationFee::get(), diff --git a/pallets/pallet-dao-manager/src/fee_handling.rs b/pallets/pallet-dao-manager/src/fee_handling.rs index dfffe82f..cf86eaeb 100644 --- a/pallets/pallet-dao-manager/src/fee_handling.rs +++ b/pallets/pallet-dao-manager/src/fee_handling.rs @@ -8,7 +8,7 @@ use crate::Config; use codec::{Decode, Encode, MaxEncodedLen}; use frame_support::{ - traits::{fungibles::Credit, Currency}, + traits::{fungible::Credit, fungibles::Credit as Credits}, unsigned::TransactionValidityError, }; use scale_info::TypeInfo; @@ -70,8 +70,8 @@ pub trait MultisigFeeHandler { /// Charges the fee for creating the dao (multisig). fn handle_creation_fee( imbalance: FeeAssetNegativeImbalance< - >::NegativeImbalance, - Credit, + Credit, + Credits, >, ); } diff --git a/pallets/pallet-dao-manager/src/lib.rs b/pallets/pallet-dao-manager/src/lib.rs index a3f0c521..dd308d0d 100644 --- a/pallets/pallet-dao-manager/src/lib.rs +++ b/pallets/pallet-dao-manager/src/lib.rs @@ -67,9 +67,9 @@ pub mod pallet { dispatch::{GetDispatchInfo, Pays, PostDispatchInfo}, pallet_prelude::*, traits::{ - fungibles, - fungibles::{Balanced, Inspect}, - Currency, Get, GetCallMetadata, ReservableCurrency, + fungible::{Balanced, Inspect, InspectHold, Mutate, MutateHold}, + fungibles::{self, Balanced as Balanceds, Inspect as Inspects}, + Get, GetCallMetadata, }, transactional, weights::WeightToFee, @@ -89,7 +89,7 @@ pub mod pallet { use crate::origin::DaoOrigin; pub type BalanceOf = - <::Currency as Currency<::AccountId>>::Balance; + <::Currency as Inspect<::AccountId>>::Balance; pub type DaoInfoOf = DaoInfo<::AccountId, dao_manager_core::DaoMetadataOf>; @@ -112,7 +112,13 @@ pub mod pallet { + Into; /// Currency type - type Currency: Currency + ReservableCurrency; + type Currency: Balanced + + Mutate + + MutateHold::RuntimeHoldReason> + + InspectHold; + + /// Overarching hold reason. + type RuntimeHoldReason: From; /// The overarching call type type RuntimeCall: Parameter @@ -149,19 +155,19 @@ pub mod pallet { /// Fee for creating a dao in the relay token #[pallet::constant] type RelayDaoCreationFee: Get< - <::Tokens as Inspect<::AccountId>>::Balance, + <::Tokens as Inspects<::AccountId>>::Balance, >; /// Relay token asset id in the runtime #[pallet::constant] - type RelayAssetId: Get<<::Tokens as Inspect<::AccountId>>::AssetId>; + type RelayAssetId: Get<<::Tokens as Inspects<::AccountId>>::AssetId>; /// Provider of assets functionality for the voting tokens type AssetsProvider: fungibles::Inspect, AssetId = Self::DaoId> + fungibles::Mutate; /// Provider of balance tokens in the runtime - type Tokens: Balanced + Inspect; + type Tokens: Balanceds + Inspects; /// Implementation of the fee handler for both dao creation fee and multisig call fees type FeeCharger: MultisigFeeHandler; @@ -339,16 +345,20 @@ pub mod pallet { MaxCallLengthExceeded, } + /// A reason for the pallet contracts placing a hold on funds. + #[pallet::composite_enum] + pub enum HoldReason { + DaoManager, + } + /// Dispatch functions #[pallet::call] impl Pallet where - Result< - DaoOrigin, - ::RuntimeOrigin, - >: From<::RuntimeOrigin>, - <::Currency as Currency<::AccountId>>::Balance: Sum, - ::AccountId: From<[u8; 32]>, + Result, ::RuntimeOrigin>: + From<::RuntimeOrigin>, + <::Currency as Inspect<::AccountId>>::Balance: Sum, + ::AccountId: From<[u8; 32]>, { /// Create a new DAO /// - `metadata`: Arbitrary byte vec to be attached to the dao info @@ -484,7 +494,13 @@ pub mod pallet { required_approval: Option, frozen_tokens: Option, ) -> DispatchResult { - Pallet::::inner_set_parameters(origin, metadata, minimum_support, required_approval, frozen_tokens) + Pallet::::inner_set_parameters( + origin, + metadata, + minimum_support, + required_approval, + frozen_tokens, + ) } } } diff --git a/pallets/pallet-dao-manager/src/multisig.rs b/pallets/pallet-dao-manager/src/multisig.rs index 44be845b..c370cf9b 100644 --- a/pallets/pallet-dao-manager/src/multisig.rs +++ b/pallets/pallet-dao-manager/src/multisig.rs @@ -25,9 +25,10 @@ use core::{ use frame_support::{ pallet_prelude::*, traits::{ - fungibles::{Inspect, Mutate}, - tokens::{Fortitude, Precision}, - Currency, ExistenceRequirement, VoteTally, WithdrawReasons, + fungible::{Balanced, Inspect}, + fungibles::{Inspect as Inspects, Mutate as Mutates}, + tokens::{Fortitude, Precision, Preservation}, + VoteTally, }, weights::WeightToFee, BoundedBTreeMap, @@ -65,7 +66,7 @@ impl Pallet where Result, ::RuntimeOrigin>: From<::RuntimeOrigin>, - <::Currency as Currency<::AccountId>>::Balance: Sum, + <::Currency as Inspect<::AccountId>>::Balance: Sum, ::AccountId: From<[u8; 32]>, { /// Inner function for the token_mint call. @@ -101,7 +102,14 @@ where let dao_id = dao_origin.id; // Burn the dao's voting token from the target. - T::AssetsProvider::burn_from(dao_id, &target, amount, Precision::Exact, Fortitude::Polite)?; + T::AssetsProvider::burn_from( + dao_id, + &target, + amount, + Preservation::Expendable, + Precision::Exact, + Fortitude::Polite, + )?; Self::deposit_event(Event::Burned { dao_id, @@ -171,11 +179,12 @@ where T::LengthToFee::weight_to_fee(&Weight::from_parts(total_lenght as u64, 0)); T::FeeCharger::handle_creation_fee(FeeAssetNegativeImbalance::Native( - ::Currency::withdraw( + <::Currency as Balanced>::withdraw( &owner, storage_cost, - WithdrawReasons::TRANSACTION_PAYMENT, - ExistenceRequirement::KeepAlive, + Precision::Exact, + Preservation::Preserve, + Fortitude::Polite, )?, )); diff --git a/pallets/pallet-dao-manager/src/tests/mock.rs b/pallets/pallet-dao-manager/src/tests/mock.rs index e5c73bda..86558f5e 100644 --- a/pallets/pallet-dao-manager/src/tests/mock.rs +++ b/pallets/pallet-dao-manager/src/tests/mock.rs @@ -4,8 +4,8 @@ use core::convert::TryFrom; use frame_support::{ derive_impl, parameter_types, traits::{ - fungibles::Credit, ConstU128, ConstU32, ConstU64, Contains, Currency, EnsureOrigin, - EnsureOriginWithArg, + fungible::Credit, fungibles::Credit as Credits, ConstU128, ConstU32, ConstU64, Contains, + Currency, EnsureOrigin, EnsureOriginWithArg, }, weights::ConstantMultiplier, }; @@ -35,7 +35,7 @@ frame_support::construct_runtime!( System: frame_system, Balances: pallet_balances, Tokens: orml_tokens, - AssetRegistry: orml_asset_registry, + AssetRegistry: orml_asset_registry::module, CoreAssets: orml_tokens2, INV4: pallet, } @@ -72,6 +72,7 @@ impl frame_system::Config for Test { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type RuntimeTask = (); type MaxConsumers = ConstU32<16>; } @@ -84,7 +85,12 @@ impl pallet_balances::Config for Test { type AccountStore = System; type MaxReserves = ConstU32<50>; type ReserveIdentifier = [u8; 8]; - type MaxFreezes = ConstU32<1>; + type RuntimeHoldReason = RuntimeHoldReason; + type RuntimeFreezeReason = (); + type MaxFreezes = ConstU32<50>; + type WeightInfo = (); + type DustRemoval = (); + type FreezeIdentifier = [u8; 8]; } const UNIT: u128 = 1000000000000; @@ -238,7 +244,7 @@ impl EnsureOriginWithArg> for AssetAuthority { } } -impl orml_asset_registry::Config for Test { +impl orml_asset_registry::module::Config for Test { type RuntimeEvent = RuntimeEvent; type AuthorityOrigin = AssetAuthority; type AssetId = AssetId; @@ -249,12 +255,12 @@ impl orml_asset_registry::Config for Test { type StringLimit = StringLimit; } -pub struct DustRemovalWhitelist; -impl Contains for DustRemovalWhitelist { - fn contains(_: &AccountId) -> bool { - true - } -} +// pub struct DustRemovalWhitelist; +// impl Contains for DustRemovalWhitelist { +// fn contains(_: &AccountId) -> bool { +// true +// } +// } pub type Amount = i128; @@ -328,8 +334,8 @@ impl MultisigFeeHandler for FeeCharger { fn handle_creation_fee( _imbalance: FeeAssetNegativeImbalance< - >::NegativeImbalance, - Credit, + Credit, + Credits, >, ) { } @@ -357,6 +363,7 @@ impl pallet::Config for Test { type ParaId = ConstU32<2125>; type LengthToFee = ConstantMultiplier; + type RuntimeHoldReason = RuntimeHoldReason; } pub struct ExtBuilder; @@ -386,7 +393,7 @@ impl ExtBuilder { .assimilate_storage(&mut t) .unwrap(); - orml_asset_registry::GenesisConfig:: { + orml_asset_registry::module::GenesisConfig:: { assets: vec![ ( 0u32, diff --git a/pallets/pallet-dao-manager/src/tests/mod.rs b/pallets/pallet-dao-manager/src/tests/mod.rs index 9fa53184..f63efe87 100644 --- a/pallets/pallet-dao-manager/src/tests/mod.rs +++ b/pallets/pallet-dao-manager/src/tests/mod.rs @@ -112,7 +112,7 @@ fn create_dao_fails() { Perbill::from_percent(1), FeeAsset::Native ), - pallet_balances::Error::::InsufficientBalance + TokenError::FundsUnavailable ); assert_eq!(INV4::next_dao_id(), 0u32); diff --git a/pallets/pallet-dao-manager/src/weights.rs b/pallets/pallet-dao-manager/src/weights.rs index 1767467d..d2b5b4f7 100644 --- a/pallets/pallet-dao-manager/src/weights.rs +++ b/pallets/pallet-dao-manager/src/weights.rs @@ -1,25 +1,26 @@ //! Autogenerated weights for `pallet_dao_manager` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2024-05-24, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 42.0.0 +//! DATE: 2024-10-10, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `anny.local`, CPU: `` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `franciscos-mbp.lan`, CPU: `` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// ./target/release/tinkernet-collator +// ./target/release/invarch-collator // benchmark // pallet -// --chain=dev +// --runtime +// ./target/release/wbuild/invarch-runtime/invarch_runtime.compact.compressed.wasm // --wasm-execution=compiled // --pallet=pallet_dao_manager -// --extrinsic=* +// --extrinsic= // --steps // 50 // --repeat // 20 -// --output=../../InvArch-Frames/INV4/pallet-dao-manager/src/weights.rs +// --output=../pallets/pallet-dao-manager/src/weights.rs // --template=../weights-template.hbs #![cfg_attr(rustfmt, rustfmt_skip)] @@ -53,8 +54,6 @@ impl WeightInfo for SubstrateWeight { /// Proof: `CoreAssets::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) /// Storage: `CoreAssets::TotalIssuance` (r:1 w:1) /// Proof: `CoreAssets::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:2 w:2) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) /// Storage: `INV4::CoreByAccount` (r:0 w:1) /// Proof: `INV4::CoreByAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) /// Storage: `INV4::CoreStorage` (r:0 w:1) @@ -64,26 +63,26 @@ impl WeightInfo for SubstrateWeight { /// The range of component `m` is `[0, 10000]`. fn create_dao(m: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `304` - // Estimated: `6196` - // Minimum execution time: 61_000_000 picoseconds. - Weight::from_parts(61_957_455, 6196) - // Standard Error: 17 - .saturating_add(Weight::from_parts(769, 0).saturating_mul(m.into())) - .saturating_add(T::DbWeight::get().reads(6_u64)) - .saturating_add(T::DbWeight::get().writes(8_u64)) + // Measured: `0` + // Estimated: `3573` + // Minimum execution time: 34_000_000 picoseconds. + Weight::from_parts(35_121_001, 3573) + // Standard Error: 8 + .saturating_add(Weight::from_parts(741, 0).saturating_mul(m.into())) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(6_u64)) } /// Storage: `INV4::CoreStorage` (r:1 w:1) /// Proof: `INV4::CoreStorage` (`max_values`: None, `max_size`: Some(10063), added: 12538, mode: `MaxEncodedLen`) /// The range of component `m` is `[0, 10000]`. fn set_parameters(m: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `234` + // Measured: `162` // Estimated: `13528` - // Minimum execution time: 8_000_000 picoseconds. - Weight::from_parts(8_995_089, 13528) + // Minimum execution time: 7_000_000 picoseconds. + Weight::from_parts(8_028_975, 13528) // Standard Error: 5 - .saturating_add(Weight::from_parts(684, 0).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(656, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -97,10 +96,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `INV4::CoreMembers` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`) fn token_mint() -> Weight { // Proof Size summary in bytes: - // Measured: `246` + // Measured: `148` // Estimated: `3593` - // Minimum execution time: 25_000_000 picoseconds. - Weight::from_parts(26_000_000, 3593) + // Minimum execution time: 21_000_000 picoseconds. + Weight::from_parts(21_000_000, 3593) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -114,10 +113,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `INV4::CoreMembers` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`) fn token_burn() -> Weight { // Proof Size summary in bytes: - // Measured: `438` + // Measured: `308` // Estimated: `3593` - // Minimum execution time: 27_000_000 picoseconds. - Weight::from_parts(28_000_000, 3593) + // Minimum execution time: 24_000_000 picoseconds. + Weight::from_parts(24_000_000, 3593) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -135,14 +134,14 @@ impl WeightInfo for SubstrateWeight { /// The range of component `z` is `[0, 51190]`. fn operate_multisig(m: u32, z: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `529` + // Measured: `368` // Estimated: `554807` - // Minimum execution time: 25_000_000 picoseconds. - Weight::from_parts(21_624_412, 554807) - // Standard Error: 15 - .saturating_add(Weight::from_parts(397, 0).saturating_mul(m.into())) + // Minimum execution time: 35_000_000 picoseconds. + Weight::from_parts(30_847_895, 554807) + // Standard Error: 16 + .saturating_add(Weight::from_parts(459, 0).saturating_mul(m.into())) // Standard Error: 3 - .saturating_add(Weight::from_parts(1_514, 0).saturating_mul(z.into())) + .saturating_add(Weight::from_parts(1_511, 0).saturating_mul(z.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -158,10 +157,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) fn vote_multisig() -> Weight { // Proof Size summary in bytes: - // Measured: `780` + // Measured: `619` // Estimated: `554807` - // Minimum execution time: 25_000_000 picoseconds. - Weight::from_parts(26_000_000, 554807) + // Minimum execution time: 23_000_000 picoseconds. + Weight::from_parts(24_000_000, 554807) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -171,10 +170,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) fn withdraw_vote_multisig() -> Weight { // Proof Size summary in bytes: - // Measured: `514` + // Measured: `428` // Estimated: `554807` - // Minimum execution time: 13_000_000 picoseconds. - Weight::from_parts(14_000_000, 554807) + // Minimum execution time: 11_000_000 picoseconds. + Weight::from_parts(11_000_000, 554807) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -184,8 +183,8 @@ impl WeightInfo for SubstrateWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 6_000_000 picoseconds. - Weight::from_parts(7_000_000, 0) + // Minimum execution time: 5_000_000 picoseconds. + Weight::from_parts(6_000_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } } @@ -200,8 +199,6 @@ impl WeightInfo for () { /// Proof: `CoreAssets::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) /// Storage: `CoreAssets::TotalIssuance` (r:1 w:1) /// Proof: `CoreAssets::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:2 w:2) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) /// Storage: `INV4::CoreByAccount` (r:0 w:1) /// Proof: `INV4::CoreByAccount` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) /// Storage: `INV4::CoreStorage` (r:0 w:1) @@ -211,26 +208,26 @@ impl WeightInfo for () { /// The range of component `m` is `[0, 10000]`. fn create_dao(m: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `304` - // Estimated: `6196` - // Minimum execution time: 61_000_000 picoseconds. - Weight::from_parts(61_957_455, 6196) - // Standard Error: 17 - .saturating_add(Weight::from_parts(769, 0).saturating_mul(m.into())) - .saturating_add(RocksDbWeight::get().reads(6_u64)) - .saturating_add(RocksDbWeight::get().writes(8_u64)) + // Measured: `0` + // Estimated: `3573` + // Minimum execution time: 34_000_000 picoseconds. + Weight::from_parts(35_121_001, 3573) + // Standard Error: 8 + .saturating_add(Weight::from_parts(741, 0).saturating_mul(m.into())) + .saturating_add(RocksDbWeight::get().reads(4_u64)) + .saturating_add(RocksDbWeight::get().writes(6_u64)) } /// Storage: `INV4::CoreStorage` (r:1 w:1) /// Proof: `INV4::CoreStorage` (`max_values`: None, `max_size`: Some(10063), added: 12538, mode: `MaxEncodedLen`) /// The range of component `m` is `[0, 10000]`. fn set_parameters(m: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `234` + // Measured: `162` // Estimated: `13528` - // Minimum execution time: 8_000_000 picoseconds. - Weight::from_parts(8_995_089, 13528) + // Minimum execution time: 7_000_000 picoseconds. + Weight::from_parts(8_028_975, 13528) // Standard Error: 5 - .saturating_add(Weight::from_parts(684, 0).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(656, 0).saturating_mul(m.into())) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -244,10 +241,10 @@ impl WeightInfo for () { /// Proof: `INV4::CoreMembers` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`) fn token_mint() -> Weight { // Proof Size summary in bytes: - // Measured: `246` + // Measured: `148` // Estimated: `3593` - // Minimum execution time: 25_000_000 picoseconds. - Weight::from_parts(26_000_000, 3593) + // Minimum execution time: 21_000_000 picoseconds. + Weight::from_parts(21_000_000, 3593) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) } @@ -261,10 +258,10 @@ impl WeightInfo for () { /// Proof: `INV4::CoreMembers` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`) fn token_burn() -> Weight { // Proof Size summary in bytes: - // Measured: `438` + // Measured: `308` // Estimated: `3593` - // Minimum execution time: 27_000_000 picoseconds. - Weight::from_parts(28_000_000, 3593) + // Minimum execution time: 24_000_000 picoseconds. + Weight::from_parts(24_000_000, 3593) .saturating_add(RocksDbWeight::get().reads(3_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) } @@ -282,14 +279,14 @@ impl WeightInfo for () { /// The range of component `z` is `[0, 51190]`. fn operate_multisig(m: u32, z: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `529` + // Measured: `368` // Estimated: `554807` - // Minimum execution time: 25_000_000 picoseconds. - Weight::from_parts(21_624_412, 554807) - // Standard Error: 15 - .saturating_add(Weight::from_parts(397, 0).saturating_mul(m.into())) + // Minimum execution time: 35_000_000 picoseconds. + Weight::from_parts(30_847_895, 554807) + // Standard Error: 16 + .saturating_add(Weight::from_parts(459, 0).saturating_mul(m.into())) // Standard Error: 3 - .saturating_add(Weight::from_parts(1_514, 0).saturating_mul(z.into())) + .saturating_add(Weight::from_parts(1_511, 0).saturating_mul(z.into())) .saturating_add(RocksDbWeight::get().reads(5_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -305,10 +302,10 @@ impl WeightInfo for () { /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) fn vote_multisig() -> Weight { // Proof Size summary in bytes: - // Measured: `780` + // Measured: `619` // Estimated: `554807` - // Minimum execution time: 25_000_000 picoseconds. - Weight::from_parts(26_000_000, 554807) + // Minimum execution time: 23_000_000 picoseconds. + Weight::from_parts(24_000_000, 554807) .saturating_add(RocksDbWeight::get().reads(5_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -318,10 +315,10 @@ impl WeightInfo for () { /// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) fn withdraw_vote_multisig() -> Weight { // Proof Size summary in bytes: - // Measured: `514` + // Measured: `428` // Estimated: `554807` - // Minimum execution time: 13_000_000 picoseconds. - Weight::from_parts(14_000_000, 554807) + // Minimum execution time: 11_000_000 picoseconds. + Weight::from_parts(11_000_000, 554807) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -331,8 +328,8 @@ impl WeightInfo for () { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 6_000_000 picoseconds. - Weight::from_parts(7_000_000, 0) + // Minimum execution time: 5_000_000 picoseconds. + Weight::from_parts(6_000_000, 0) .saturating_add(RocksDbWeight::get().writes(1_u64)) } } diff --git a/pallets/pallet-dao-staking/src/benchmarking.rs b/pallets/pallet-dao-staking/src/benchmarking.rs index ddd7256c..9ceb0bac 100644 --- a/pallets/pallet-dao-staking/src/benchmarking.rs +++ b/pallets/pallet-dao-staking/src/benchmarking.rs @@ -5,7 +5,8 @@ use crate::Pallet as OcifStaking; use core::ops::Add; use frame_benchmarking::{benchmarks, whitelisted_caller}; use frame_support::{ - traits::{Get, OnFinalize, OnInitialize}, + assert_ok, + traits::{fungible::Mutate, Get, OnFinalize, OnInitialize}, BoundedVec, }; use frame_system::{Pallet as System, RawOrigin}; @@ -13,7 +14,7 @@ use pallet_dao_manager::{ account_derivation::DaoAccountDerivation, origin::{DaoOrigin, MultisigInternalOrigin}, }; -use sp_runtime::traits::{Bounded, One}; +use sp_runtime::traits::One; use sp_std::vec; fn assert_last_event(generic_event: ::RuntimeEvent) { @@ -45,7 +46,7 @@ where ::RuntimeOrigin: From>, T::AccountId: From<[u8; 32]>, { - ::Currency::make_free_balance_be( + <::Currency as Mutate>::set_balance( &derive_account::(0u32.into()), T::RegisterDeposit::get() + T::RegisterDeposit::get(), ); @@ -65,7 +66,7 @@ where ::RuntimeOrigin: From>, T::AccountId: From<[u8; 32]>, { - ::Currency::make_free_balance_be( + <::Currency as Mutate>::set_balance( &derive_account::(1u32.into()), T::RegisterDeposit::get() + T::RegisterDeposit::get(), ); @@ -85,9 +86,11 @@ where ::RuntimeOrigin: From>, T::AccountId: From<[u8; 32]>, { - ::Currency::make_free_balance_be( + <::Currency as Mutate>::set_balance( &whitelisted_caller(), - pallet::BalanceOf::::max_value(), + T::StakeThresholdForActiveDao::get() + + T::StakeThresholdForActiveDao::get() + + T::StakeThresholdForActiveDao::get(), ); OcifStaking::::stake( @@ -132,7 +135,7 @@ benchmarks! { let description: BoundedVec = vec![u8::MAX; d as usize].try_into().unwrap(); let image: BoundedVec = vec![u8::MAX; i as usize].try_into().unwrap(); - ::Currency::make_free_balance_be(&derive_account::(0u32.into()), T::RegisterDeposit::get() + T::RegisterDeposit::get()); + <::Currency as Mutate>::set_balance(&derive_account::(0u32.into()), T::RegisterDeposit::get() + T::RegisterDeposit::get()); }: _(DaoOrigin::Multisig(MultisigInternalOrigin::new(0u32.into())), name, description, image) verify { assert_last_event::(Event::::DaoRegistered { @@ -184,7 +187,9 @@ benchmarks! { let staker = whitelisted_caller(); let amount = T::StakeThresholdForActiveDao::get() + T::StakeThresholdForActiveDao::get(); - ::Currency::make_free_balance_be(&staker, pallet::BalanceOf::::max_value()); + <::Currency as Mutate>::set_balance(&staker, T::StakeThresholdForActiveDao::get() + + T::StakeThresholdForActiveDao::get() + + T::StakeThresholdForActiveDao::get()); }: _(RawOrigin::Signed(staker.clone()), 0u32.into(), amount) verify { assert_last_event::(Event::::Staked { diff --git a/pallets/pallet-dao-staking/src/lib.rs b/pallets/pallet-dao-staking/src/lib.rs index c61cb7ba..269a84d5 100644 --- a/pallets/pallet-dao-staking/src/lib.rs +++ b/pallets/pallet-dao-staking/src/lib.rs @@ -55,9 +55,12 @@ use frame_support::{ ensure, pallet_prelude::*, traits::{ - Currency, ExistenceRequirement, Get, HandleMessage, Imbalance, LockIdentifier, - LockableCurrency, OnUnbalanced, ProcessMessage, QueuePausedQuery, ReservableCurrency, - WithdrawReasons, + fungible::{ + Balanced, Credit, Inspect, InspectFreeze, InspectHold, Mutate, MutateFreeze, MutateHold, + }, + tokens::{Fortitude, Precision, Preservation}, + Get, HandleMessage, Imbalance, InspectLockableCurrency, LockIdentifier, LockableCurrency, + OnUnbalanced, ProcessMessage, QueuePausedQuery, ReservableCurrency, }, weights::{Weight, WeightToFee}, BoundedSlice, PalletId, @@ -90,6 +93,7 @@ pub use pallet::*; #[frame_support::pallet] pub mod pallet { + use pallet_dao_manager::{ origin::{ensure_multisig, DaoOrigin}, DaoAccountDerivation, @@ -100,17 +104,16 @@ pub mod pallet { use super::*; /// The balance type of this pallet. - pub type BalanceOf = - <::Currency as Currency<::AccountId>>::Balance; + pub(crate) type BalanceOf = + <::Currency as Inspect<::AccountId>>::Balance; + + /// The opaque token type for an imbalance. This is returned by unbalanced operations and must be dealt with. + type NegativeImbalanceOf = + Credit<::AccountId, ::Currency>; #[pallet::pallet] pub struct Pallet(PhantomData); - /// The opaque token type for an imbalance. This is returned by unbalanced operations and must be dealt with. - type NegativeImbalanceOf = <::Currency as Currency< - ::AccountId, - >>::NegativeImbalance; - /// The dao metadata type of this pallet. pub type DaoMetadataOf = DaoMetadata< BoundedVec::MaxNameLength>, @@ -131,9 +134,23 @@ pub mod pallet { /// The overarching event type. type RuntimeEvent: From> + IsType<::RuntimeEvent>; + /// The old trait for staking balance. Deprecated and only used for migrating old ledgers. + type OldCurrency: InspectLockableCurrency< + Self::AccountId, + Moment = BlockNumberFor, + Balance = BalanceOf, + > + ReservableCurrency; + /// The currency used in staking. - type Currency: LockableCurrency> - + ReservableCurrency; + type Currency: Balanced + + Mutate + + MutateHold::RuntimeHoldReason> + + InspectHold + + MutateFreeze + + InspectFreeze; + + /// Overarching hold reason. + type RuntimeHoldReason: From; // type DaoId: Parameter // + Member @@ -377,6 +394,11 @@ pub mod pallet { }, /// Sharded execution of the dao unregistration process finished. DaoUnregistrationQueueFinished { dao: T::DaoId }, + /// Bookeeping in case something unpredictable happens to a user mid unregistration. + ErroredOnMessageQueue { + err: scale_info::prelude::string::String, + account: Option, + }, } #[pallet::error] @@ -431,6 +453,12 @@ pub mod pallet { MoveStakeToSameDao, } + /// A reason for the pallet contracts placing a hold on funds. + #[pallet::composite_enum] + pub enum HoldReason { + DaoStaking, + } + #[pallet::hooks] impl Hooks> for Pallet { fn on_initialize(now: BlockNumberFor) -> Weight { @@ -510,7 +538,11 @@ pub mod pallet { image, }; - ::Currency::reserve(&dao_account, T::RegisterDeposit::get())?; + ::Currency::hold( + &HoldReason::DaoStaking.into(), + &dao_account, + T::RegisterDeposit::get(), + )?; RegisteredCore::::insert( dao_id, @@ -576,13 +608,27 @@ pub mod pallet { CoreEraStake::::insert(dao_id, current_era, dao_stake_info.clone()); let reserve_deposit = T::RegisterDeposit::get(); - ::Currency::unreserve(&dao_account, reserve_deposit); + + let amnt = { + if let Ok(a) = ::Currency::release( + &HoldReason::DaoStaking.into(), + &dao_account, + reserve_deposit, + Precision::Exact, + ) { + a + } else { + ::OldCurrency::unreserve(&dao_account, reserve_deposit); + reserve_deposit + } + }; T::OnUnbalanced::on_unbalanced(::Currency::withdraw( &dao_account, - reserve_deposit.min(all_fee), - WithdrawReasons::TRANSACTION_PAYMENT, - ExistenceRequirement::KeepAlive, + amnt.min(all_fee), + Precision::Exact, + Preservation::Expendable, + Fortitude::Force, )?); RegisteredCore::::remove(dao_id); @@ -712,7 +758,7 @@ pub mod pallet { } }); - Self::update_ledger(&staker, ledger); + Self::update_ledger(&staker, ledger)?; Self::update_staker_info(&staker, dao_id, staker_info); CoreEraStake::::insert(dao_id, current_era, staking_info); @@ -766,7 +812,7 @@ pub mod pallet { Error::::TooManyUnlockingChunks ); - Self::update_ledger(&staker, ledger); + Self::update_ledger(&staker, ledger)?; GeneralEraInfo::::mutate(current_era, |value| { if let Some(x) = value { @@ -809,7 +855,7 @@ pub mod pallet { ledger.locked = ledger.locked.saturating_sub(withdraw_amount); ledger.unbonding_info = future_chunks; - Self::update_ledger(&staker, ledger); + Self::update_ledger(&staker, ledger)?; GeneralEraInfo::::mutate(current_era, |value| { if let Some(x) = value { x.locked = x.locked.saturating_sub(withdraw_amount) @@ -864,11 +910,13 @@ pub mod pallet { let reward_imbalance = ::Currency::withdraw( &Self::account_id(), staker_reward, - WithdrawReasons::TRANSFER, - ExistenceRequirement::AllowDeath, + Precision::Exact, + Preservation::Expendable, + Fortitude::Force, )?; - ::Currency::resolve_creating(&staker, reward_imbalance); + ::Currency::resolve(&staker, reward_imbalance) + .map_err(|_| Error::::NothingToWithdraw)?; Self::update_staker_info(&staker, dao_id, staker_info); } @@ -920,8 +968,9 @@ pub mod pallet { let reward_imbalance = ::Currency::withdraw( &Self::account_id(), reward, - WithdrawReasons::TRANSFER, - ExistenceRequirement::AllowDeath, + Precision::Exact, + Preservation::Expendable, + Fortitude::Force, )?; let dao_account = @@ -929,7 +978,8 @@ pub mod pallet { dao_id, ); - ::Currency::resolve_creating(&dao_account, reward_imbalance); + ::Currency::resolve(&dao_account, reward_imbalance) + .map_err(|_| Error::::NothingToWithdraw)?; Self::deposit_event(Event::::DaoClaimed { dao: dao_id, destination_account: dao_account, @@ -1107,19 +1157,19 @@ pub mod pallet { /// Update the ledger for a staker. This will also update the stash lock. /// This lock will lock the entire funds except paying for further transactions. - fn update_ledger(staker: &T::AccountId, ledger: AccountLedger>) { + fn update_ledger( + staker: &T::AccountId, + ledger: AccountLedger>, + ) -> DispatchResult { if ledger.is_empty() { Ledger::::remove(staker); - ::Currency::remove_lock(LOCK_ID, staker); + ::OldCurrency::remove_lock(LOCK_ID, staker); + let _ = ::Currency::thaw(&LOCK_ID, staker); } else { - ::Currency::set_lock( - LOCK_ID, - staker, - ledger.locked, - WithdrawReasons::all(), - ); + ::Currency::extend_freeze(&LOCK_ID, staker, ledger.locked)?; Ledger::::insert(staker, ledger); } + Ok(()) } /// The block rewards are accumulated on the pallet's account during an era. @@ -1164,10 +1214,8 @@ pub mod pallet { accumulated_reward.stakers.saturating_add(stakers.peek()); }); - ::Currency::resolve_creating( - &Self::account_id(), - stakers.merge(dao), - ); + let _ = + ::Currency::resolve(&Self::account_id(), stakers.merge(dao)); } /// Updates staker info for a dao. @@ -1188,8 +1236,11 @@ pub mod pallet { staker: &T::AccountId, ledger: &AccountLedger>, ) -> BalanceOf { - let free_balance = ::Currency::free_balance(staker) - .saturating_sub(::ExistentialDeposit::get()); + let free_balance = ::Currency::reducible_balance( + staker, + Preservation::Preserve, + Fortitude::Force, + ); free_balance.saturating_sub(ledger.locked) } @@ -1280,7 +1331,7 @@ pub mod pallet { dao_id: T::DaoId, start_era: Era, chunk_size: u64, - ) -> DispatchResultWithPostInfo { + ) -> PostDispatchInfo { let mut staker_info_prefix = Self::dao_unregistering_staker_list(dao_id).unwrap_or_default(); @@ -1308,12 +1359,20 @@ pub mod pallet { unlock_era: start_era + T::UnbondingPeriod::get(), }); - ensure!( - ledger.unbonding_info.len() <= T::MaxUnlocking::get(), - Error::::TooManyUnlockingChunks - ); - - Self::update_ledger(&staker, ledger); + // this is a forced unstake so we can't have it to fail. + // ensure!( + // ledger.unbonding_info.len() <= T::MaxUnlocking::get(), + // Error::::TooManyUnlockingChunks + // ); + + // here in case a user has reached pallet-balances::MaxFreezes there's no way to + // go around this so it will error and will require manual intervention. + if let Err(e) = Self::update_ledger(&staker, ledger) { + Self::deposit_event(Event::::ErroredOnMessageQueue { + err: sp_runtime::format!("Error: {:?}", e), + account: Some(staker.clone()), + }); + }; Self::update_staker_info(&staker, dao_id, staker_info); @@ -1351,7 +1410,7 @@ pub mod pallet { UnregisteredCoreStakeInfo::::insert(dao_id, dao_stake_info.clone()); UnregisteredCoreStakers::::insert(dao_id, staker_info_prefix); - return Ok(Some(corrected_staker_length_fee).into()); + return Some(corrected_staker_length_fee).into(); } } @@ -1359,7 +1418,7 @@ pub mod pallet { UnregisteredCoreStakers::::remove(dao_id); UnregisteredCoreStakeInfo::::remove(dao_id); - Ok(Some(corrected_staker_length_fee).into()) + Some(corrected_staker_length_fee).into() } } } diff --git a/pallets/pallet-dao-staking/src/primitives.rs b/pallets/pallet-dao-staking/src/primitives.rs index f9c1f211..6296307c 100644 --- a/pallets/pallet-dao-staking/src/primitives.rs +++ b/pallets/pallet-dao-staking/src/primitives.rs @@ -20,7 +20,7 @@ //! - `AccountLedger` - A struct that holds information about an account's locked balance and unbonding information. use codec::{Decode, Encode, FullCodec, HasCompact, MaxEncodedLen}; -use cumulus_primitives_core::{AggregateMessageOrigin, MultiLocation, ParaId}; +use cumulus_primitives_core::{AggregateMessageOrigin, Location, ParaId}; use frame_support::{ pallet_prelude::Weight, traits::{Currency, ProcessMessage, QueueFootprint, QueuePausedQuery}, @@ -389,7 +389,7 @@ where + TypeInfo + Debug, XcmOrigin: - Into + FullCodec + MaxEncodedLen + Clone + Eq + PartialEq + TypeInfo + Debug, + Into + FullCodec + MaxEncodedLen + Clone + Eq + PartialEq + TypeInfo + Debug, XcmProcessor: ProcessMessage, T: Config, { @@ -445,29 +445,16 @@ where call.era, max_calls, ); - - match chunk_result { - Ok(weight) => { - if let Some(actual_weight) = weight.actual_weight { - meter.try_consume(actual_weight).map_err(|_| { - frame_support::traits::ProcessMessageError::Overweight( - actual_weight, - ) - })?; - } else { - meter.try_consume(max_weight).map_err(|_| { - frame_support::traits::ProcessMessageError::Overweight(max_weight) - })?; - } - Ok(true) - } - Err(_) => { - meter.try_consume(max_weight).map_err(|_| { - frame_support::traits::ProcessMessageError::Overweight(max_weight) - })?; - Ok(false) - } + if let Some(actual_weight) = chunk_result.actual_weight { + meter.try_consume(actual_weight).map_err(|_| { + frame_support::traits::ProcessMessageError::Overweight(actual_weight) + })?; + } else { + meter.try_consume(max_weight).map_err(|_| { + frame_support::traits::ProcessMessageError::Overweight(max_weight) + })?; } + Ok(true) } } } diff --git a/pallets/pallet-dao-staking/src/testing/mock.rs b/pallets/pallet-dao-staking/src/testing/mock.rs index 17f0b69f..8682ffac 100644 --- a/pallets/pallet-dao-staking/src/testing/mock.rs +++ b/pallets/pallet-dao-staking/src/testing/mock.rs @@ -7,7 +7,8 @@ use frame_support::{ dispatch::DispatchClass, parameter_types, traits::{ - fungibles::Credit, ConstU128, ConstU32, Contains, Currency, OnFinalize, OnInitialize, + fungible::Credit, fungibles::Credit as Credits, ConstU128, ConstU32, Contains, Currency, + OnFinalize, OnInitialize, }, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, WEIGHT_REF_TIME_PER_SECOND}, @@ -103,7 +104,9 @@ impl pallet_balances::Config for Test { type AccountStore = System; type WeightInfo = (); type FreezeIdentifier = [u8; 8]; - type MaxFreezes = (); + type MaxFreezes = ConstU32<50>; + type RuntimeHoldReason = RuntimeHoldReason; + type RuntimeFreezeReason = (); } parameter_types! { @@ -192,8 +195,8 @@ impl pallet_dao_manager::fee_handling::MultisigFeeHandler for FeeCharger { fn handle_creation_fee( _imbalance: pallet_dao_manager::fee_handling::FeeAssetNegativeImbalance< - >::NegativeImbalance, - Credit, + Credit, + Credits, >, ) { } @@ -241,7 +244,7 @@ impl pallet_dao_manager::Config for Test { type DaoCreationFee = DaoCreationFee; type FeeCharger = FeeCharger; type WeightInfo = pallet_dao_manager::weights::SubstrateWeight; - + type RuntimeHoldReason = RuntimeHoldReason; type Tokens = CoreAssets; type RelayAssetId = RelayAssetId; type RelayDaoCreationFee = DaoCreationFee; @@ -253,7 +256,9 @@ impl pallet_dao_manager::Config for Test { impl pallet_dao_staking::Config for Test { type RuntimeEvent = RuntimeEvent; + type OldCurrency = Balances; type Currency = Balances; + type RuntimeHoldReason = RuntimeHoldReason; type BlocksPerEra = BlockPerEra; type RegisterDeposit = RegisterDeposit; type MaxStakersPerDao = MaxStakersPerDao; @@ -335,6 +340,7 @@ impl pallet_message_queue::Config for Test { type HeapSize = MessageQueueHeapSize; type MaxStale = MessageQueueMaxStale; type ServiceWeight = MessageQueueServiceWeight; + type IdleMaxServiceWeight = (); } pub struct ExternalityBuilder; @@ -397,7 +403,9 @@ pub fn run_to_block(n: u64) { OcifStaking::on_finalize(System::block_number()); System::set_block_number(System::block_number() + 1); - OcifStaking::rewards(Balances::issue(ISSUE_PER_BLOCK)); + OcifStaking::rewards(::AccountId, + >>::issue(ISSUE_PER_BLOCK)); OcifStaking::on_initialize(System::block_number()); MessageQueue::on_initialize(System::block_number()); @@ -414,7 +422,9 @@ pub fn run_to_block_no_rewards(n: u64) { } pub fn issue_rewards(amount: Balance) { - OcifStaking::rewards(Balances::issue(amount)); + OcifStaking::rewards(::AccountId, + >>::issue(amount)); } pub fn run_for_blocks(n: u64) { diff --git a/pallets/pallet-dao-staking/src/testing/mod.rs b/pallets/pallet-dao-staking/src/testing/mod.rs index 173d4fc4..ee5fa30a 100644 --- a/pallets/pallet-dao-staking/src/testing/mod.rs +++ b/pallets/pallet-dao-staking/src/testing/mod.rs @@ -238,6 +238,7 @@ pub(crate) fn assert_withdraw_unbonded(staker: AccountId) { } pub(crate) fn assert_unregister(dao: DaoId) { + // use frame_support::traits::EnqueueMessage; let init_reserved_balance = ::Currency::reserved_balance(&account(dao)); assert_ok!(OcifStaking::unregister_dao( @@ -250,13 +251,13 @@ pub(crate) fn assert_unregister(dao: DaoId) { dao, })); + run_for_blocks(1); // println!("storage info{:#?}", MessageQueue::storage_info()); // println!("get queue info{:#?}", MessageQueue::debug_info()); // println!( // "footprint: {:#?}", - // MessageQueue::footprint(UnregisterMessageOrigin) + // MessageQueue::footprint(crate::CustomAggregateMessageOrigin::UnregisterMessageOrigin) // ); - run_for_blocks(1); // println!("get queue info{:#?}", MessageQueue::debug_info()); let final_reserved_balance = ::Currency::reserved_balance(&account(dao)); diff --git a/pallets/pallet-dao-staking/src/testing/test.rs b/pallets/pallet-dao-staking/src/testing/test.rs index 618a73ed..8c9d448e 100644 --- a/pallets/pallet-dao-staking/src/testing/test.rs +++ b/pallets/pallet-dao-staking/src/testing/test.rs @@ -3,7 +3,7 @@ use crate::{ testing::*, *, }; -use frame_support::{assert_noop, assert_ok, traits::Currency}; +use frame_support::{assert_noop, assert_ok}; use mock::Balances; use sp_runtime::{traits::Zero, Perbill}; @@ -2306,7 +2306,7 @@ fn move_stake_max_number_of_stakers_exceeded_err() { for temp_staker in (4u32)..(MAX_NUMBER_OF_STAKERS as u32 + 3u32) { let staker = account(temp_staker); - Balances::resolve_creating(&staker, Balances::issue(100)); + assert!(Balances::resolve(&staker, Balances::issue(100)).is_ok()); assert_stake(staker, &dao_id_b, 13); } @@ -2336,7 +2336,7 @@ fn claim_stake_after_unregistering_dao_mid_era_changes_is_ok() { for temp_staker in 0..4 { let staker = account(temp_staker + 100); stakers.push(staker.clone()); - Balances::resolve_creating(&staker, Balances::issue(1000)); + assert!(Balances::resolve(&staker, Balances::issue(1000)).is_ok()); short_stake(staker, &dao_id_b, 20); } diff --git a/pallets/pallet-dao-staking/src/weights.rs b/pallets/pallet-dao-staking/src/weights.rs index b907e2b0..ab47128e 100644 --- a/pallets/pallet-dao-staking/src/weights.rs +++ b/pallets/pallet-dao-staking/src/weights.rs @@ -1,25 +1,26 @@ //! Autogenerated weights for `pallet_dao_staking` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2024-06-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 42.0.0 +//! DATE: 2024-10-10, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `anny.local`, CPU: `` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `franciscos-mbp.lan`, CPU: `` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// ./target/release/tinkernet-collator +// ./target/release/invarch-collator // benchmark // pallet -// --chain=dev +// --runtime +// ./target/release/wbuild/invarch-runtime/invarch_runtime.compact.compressed.wasm // --wasm-execution=compiled -// --pallet=pallet-dao-staking -// --extrinsic=* +// --pallet=pallet_dao_staking +// --extrinsic= // --steps // 50 // --repeat // 20 -// --output=../../InvArch-Frames/OCIF/staking/src/weights.rs +// --output=../pallets/pallet-dao-staking/src/weights.rs // --template=../weights-template.hbs #![cfg_attr(rustfmt, rustfmt_skip)] @@ -55,17 +56,21 @@ impl WeightInfo for SubstrateWeight { /// Proof: `OcifStaking::RegisteredCore` (`max_values`: None, `max_size`: Some(477), added: 2952, mode: `MaxEncodedLen`) /// Storage: `System::Account` (r:1 w:1) /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// Storage: `Balances::Holds` (r:1 w:1) + /// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`) /// The range of component `n` is `[0, 20]`. /// The range of component `d` is `[0, 300]`. /// The range of component `i` is `[0, 100]`. - fn register_dao(_n: u32, _d: u32, _i: u32, ) -> Weight { + fn register_dao(_n: u32, d: u32, _i: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `213` + // Measured: `52` // Estimated: `3942` - // Minimum execution time: 22_000_000 picoseconds. - Weight::from_parts(24_293_021, 3942) - .saturating_add(T::DbWeight::get().reads(4_u64)) - .saturating_add(T::DbWeight::get().writes(2_u64)) + // Minimum execution time: 35_000_000 picoseconds. + Weight::from_parts(36_286_192, 3942) + // Standard Error: 187 + .saturating_add(Weight::from_parts(150, 0).saturating_mul(d.into())) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } /// Storage: `OcifStaking::Halted` (r:1 w:0) /// Proof: `OcifStaking::Halted` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`) @@ -74,18 +79,16 @@ impl WeightInfo for SubstrateWeight { /// The range of component `n` is `[0, 20]`. /// The range of component `d` is `[0, 300]`. /// The range of component `i` is `[0, 100]`. - fn change_dao_metadata(n: u32, d: u32, i: u32, ) -> Weight { + fn change_dao_metadata(_n: u32, d: u32, i: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `86` + // Measured: `5` // Estimated: `3942` - // Minimum execution time: 9_000_000 picoseconds. - Weight::from_parts(9_593_278, 3942) - // Standard Error: 890 - .saturating_add(Weight::from_parts(4_471, 0).saturating_mul(n.into())) - // Standard Error: 61 - .saturating_add(Weight::from_parts(856, 0).saturating_mul(d.into())) - // Standard Error: 182 - .saturating_add(Weight::from_parts(1_028, 0).saturating_mul(i.into())) + // Minimum execution time: 6_000_000 picoseconds. + Weight::from_parts(6_956_441, 3942) + // Standard Error: 135 + .saturating_add(Weight::from_parts(790, 0).saturating_mul(d.into())) + // Standard Error: 406 + .saturating_add(Weight::from_parts(1_341, 0).saturating_mul(i.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -105,6 +108,8 @@ impl WeightInfo for SubstrateWeight { /// Proof: `OcifStaking::GeneralEraInfo` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`) /// Storage: `System::Account` (r:1 w:1) /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// Storage: `Balances::Holds` (r:1 w:1) + /// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`) /// Storage: `MessageQueue::BookStateFor` (r:1 w:1) /// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(55), added: 2530, mode: `MaxEncodedLen`) /// Storage: `MessageQueue::ServiceHead` (r:1 w:1) @@ -117,12 +122,12 @@ impl WeightInfo for SubstrateWeight { /// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(134194), added: 136669, mode: `MaxEncodedLen`) fn unregister_dao() -> Weight { // Proof Size summary in bytes: - // Measured: `343` + // Measured: `113` // Estimated: `3942` - // Minimum execution time: 44_000_000 picoseconds. - Weight::from_parts(45_000_000, 3942) - .saturating_add(T::DbWeight::get().reads(10_u64)) - .saturating_add(T::DbWeight::get().writes(9_u64)) + // Minimum execution time: 60_000_000 picoseconds. + Weight::from_parts(61_000_000, 3942) + .saturating_add(T::DbWeight::get().reads(11_u64)) + .saturating_add(T::DbWeight::get().writes(10_u64)) } /// Storage: `OcifStaking::Halted` (r:1 w:0) /// Proof: `OcifStaking::Halted` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`) @@ -138,16 +143,16 @@ impl WeightInfo for SubstrateWeight { /// Proof: `OcifStaking::GeneralStakerInfo` (`max_values`: None, `max_size`: Some(269), added: 2744, mode: `MaxEncodedLen`) /// Storage: `OcifStaking::GeneralEraInfo` (r:1 w:1) /// Proof: `OcifStaking::GeneralEraInfo` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`) - /// Storage: `Balances::Locks` (r:1 w:1) + /// Storage: `Balances::Freezes` (r:1 w:1) + /// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(1249), added: 3724, mode: `MaxEncodedLen`) + /// Storage: `Balances::Locks` (r:1 w:0) /// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`) - /// Storage: `Balances::Freezes` (r:1 w:0) - /// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`) fn stake() -> Weight { // Proof Size summary in bytes: - // Measured: `86` + // Measured: `5` // Estimated: `4764` - // Minimum execution time: 34_000_000 picoseconds. - Weight::from_parts(35_000_000, 4764) + // Minimum execution time: 31_000_000 picoseconds. + Weight::from_parts(32_000_000, 4764) .saturating_add(T::DbWeight::get().reads(9_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -163,18 +168,18 @@ impl WeightInfo for SubstrateWeight { /// Proof: `OcifStaking::CoreEraStake` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`) /// Storage: `OcifStaking::Ledger` (r:1 w:1) /// Proof: `OcifStaking::Ledger` (`max_values`: None, `max_size`: Some(265), added: 2740, mode: `MaxEncodedLen`) - /// Storage: `Balances::Locks` (r:1 w:1) + /// Storage: `Balances::Freezes` (r:1 w:1) + /// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(1249), added: 3724, mode: `MaxEncodedLen`) + /// Storage: `Balances::Locks` (r:1 w:0) /// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`) - /// Storage: `Balances::Freezes` (r:1 w:0) - /// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`) /// Storage: `OcifStaking::GeneralEraInfo` (r:1 w:1) /// Proof: `OcifStaking::GeneralEraInfo` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`) fn unstake() -> Weight { // Proof Size summary in bytes: - // Measured: `397` + // Measured: `288` // Estimated: `4764` - // Minimum execution time: 36_000_000 picoseconds. - Weight::from_parts(37_000_000, 4764) + // Minimum execution time: 33_000_000 picoseconds. + Weight::from_parts(34_000_000, 4764) .saturating_add(T::DbWeight::get().reads(9_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -186,18 +191,18 @@ impl WeightInfo for SubstrateWeight { /// Proof: `OcifStaking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) /// Storage: `Balances::Locks` (r:1 w:1) /// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`) - /// Storage: `Balances::Freezes` (r:1 w:0) - /// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`) + /// Storage: `Balances::Freezes` (r:1 w:1) + /// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(1249), added: 3724, mode: `MaxEncodedLen`) /// Storage: `OcifStaking::GeneralEraInfo` (r:1 w:1) /// Proof: `OcifStaking::GeneralEraInfo` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`) fn withdraw_unstaked() -> Weight { // Proof Size summary in bytes: - // Measured: `449` + // Measured: `546` // Estimated: `4764` - // Minimum execution time: 31_000_000 picoseconds. - Weight::from_parts(32_000_000, 4764) + // Minimum execution time: 40_000_000 picoseconds. + Weight::from_parts(45_000_000, 4764) .saturating_add(T::DbWeight::get().reads(6_u64)) - .saturating_add(T::DbWeight::get().writes(3_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } /// Storage: `OcifStaking::Halted` (r:1 w:0) /// Proof: `OcifStaking::Halted` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`) @@ -209,14 +214,16 @@ impl WeightInfo for SubstrateWeight { /// Proof: `OcifStaking::CoreEraStake` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`) /// Storage: `OcifStaking::GeneralEraInfo` (r:1 w:0) /// Proof: `OcifStaking::GeneralEraInfo` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`) + /// Storage: `System::Account` (r:1 w:1) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn staker_claim_rewards() -> Weight { // Proof Size summary in bytes: - // Measured: `374` + // Measured: `213` // Estimated: `3734` - // Minimum execution time: 18_000_000 picoseconds. - Weight::from_parts(19_000_000, 3734) - .saturating_add(T::DbWeight::get().reads(5_u64)) - .saturating_add(T::DbWeight::get().writes(1_u64)) + // Minimum execution time: 32_000_000 picoseconds. + Weight::from_parts(33_000_000, 3734) + .saturating_add(T::DbWeight::get().reads(6_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } /// Storage: `OcifStaking::Halted` (r:1 w:0) /// Proof: `OcifStaking::Halted` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`) @@ -228,23 +235,25 @@ impl WeightInfo for SubstrateWeight { /// Proof: `OcifStaking::CoreEraStake` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`) /// Storage: `OcifStaking::GeneralEraInfo` (r:1 w:0) /// Proof: `OcifStaking::GeneralEraInfo` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`) + /// Storage: `System::Account` (r:2 w:1) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn dao_claim_rewards() -> Weight { // Proof Size summary in bytes: - // Measured: `377` - // Estimated: `3557` - // Minimum execution time: 18_000_000 picoseconds. - Weight::from_parts(19_000_000, 3557) - .saturating_add(T::DbWeight::get().reads(5_u64)) - .saturating_add(T::DbWeight::get().writes(1_u64)) + // Measured: `249` + // Estimated: `6196` + // Minimum execution time: 31_000_000 picoseconds. + Weight::from_parts(32_000_000, 6196) + .saturating_add(T::DbWeight::get().reads(7_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } /// Storage: `OcifStaking::Halted` (r:1 w:1) /// Proof: `OcifStaking::Halted` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`) fn halt_unhalt_pallet() -> Weight { // Proof Size summary in bytes: - // Measured: `4` + // Measured: `0` // Estimated: `1486` - // Minimum execution time: 5_000_000 picoseconds. - Weight::from_parts(5_000_000, 1486) + // Minimum execution time: 4_000_000 picoseconds. + Weight::from_parts(4_000_000, 1486) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -260,10 +269,10 @@ impl WeightInfo for SubstrateWeight { /// Proof: `OcifStaking::CoreEraStake` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`) fn move_stake() -> Weight { // Proof Size summary in bytes: - // Measured: `302` + // Measured: `217` // Estimated: `6478` - // Minimum execution time: 24_000_000 picoseconds. - Weight::from_parts(25_000_000, 6478) + // Minimum execution time: 22_000_000 picoseconds. + Weight::from_parts(23_000_000, 6478) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -279,17 +288,21 @@ impl WeightInfo for () { /// Proof: `OcifStaking::RegisteredCore` (`max_values`: None, `max_size`: Some(477), added: 2952, mode: `MaxEncodedLen`) /// Storage: `System::Account` (r:1 w:1) /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// Storage: `Balances::Holds` (r:1 w:1) + /// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`) /// The range of component `n` is `[0, 20]`. /// The range of component `d` is `[0, 300]`. /// The range of component `i` is `[0, 100]`. - fn register_dao(_n: u32, _d: u32, _i: u32, ) -> Weight { + fn register_dao(_n: u32, d: u32, _i: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `213` + // Measured: `52` // Estimated: `3942` - // Minimum execution time: 22_000_000 picoseconds. - Weight::from_parts(24_293_021, 3942) - .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(RocksDbWeight::get().writes(2_u64)) + // Minimum execution time: 35_000_000 picoseconds. + Weight::from_parts(36_286_192, 3942) + // Standard Error: 187 + .saturating_add(Weight::from_parts(150, 0).saturating_mul(d.into())) + .saturating_add(RocksDbWeight::get().reads(5_u64)) + .saturating_add(RocksDbWeight::get().writes(3_u64)) } /// Storage: `OcifStaking::Halted` (r:1 w:0) /// Proof: `OcifStaking::Halted` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`) @@ -298,18 +311,16 @@ impl WeightInfo for () { /// The range of component `n` is `[0, 20]`. /// The range of component `d` is `[0, 300]`. /// The range of component `i` is `[0, 100]`. - fn change_dao_metadata(n: u32, d: u32, i: u32, ) -> Weight { + fn change_dao_metadata(_n: u32, d: u32, i: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `86` + // Measured: `5` // Estimated: `3942` - // Minimum execution time: 9_000_000 picoseconds. - Weight::from_parts(9_593_278, 3942) - // Standard Error: 890 - .saturating_add(Weight::from_parts(4_471, 0).saturating_mul(n.into())) - // Standard Error: 61 - .saturating_add(Weight::from_parts(856, 0).saturating_mul(d.into())) - // Standard Error: 182 - .saturating_add(Weight::from_parts(1_028, 0).saturating_mul(i.into())) + // Minimum execution time: 6_000_000 picoseconds. + Weight::from_parts(6_956_441, 3942) + // Standard Error: 135 + .saturating_add(Weight::from_parts(790, 0).saturating_mul(d.into())) + // Standard Error: 406 + .saturating_add(Weight::from_parts(1_341, 0).saturating_mul(i.into())) .saturating_add(RocksDbWeight::get().reads(2_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -329,6 +340,8 @@ impl WeightInfo for () { /// Proof: `OcifStaking::GeneralEraInfo` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`) /// Storage: `System::Account` (r:1 w:1) /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// Storage: `Balances::Holds` (r:1 w:1) + /// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`) /// Storage: `MessageQueue::BookStateFor` (r:1 w:1) /// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(55), added: 2530, mode: `MaxEncodedLen`) /// Storage: `MessageQueue::ServiceHead` (r:1 w:1) @@ -341,12 +354,12 @@ impl WeightInfo for () { /// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(134194), added: 136669, mode: `MaxEncodedLen`) fn unregister_dao() -> Weight { // Proof Size summary in bytes: - // Measured: `343` + // Measured: `113` // Estimated: `3942` - // Minimum execution time: 44_000_000 picoseconds. - Weight::from_parts(45_000_000, 3942) - .saturating_add(RocksDbWeight::get().reads(10_u64)) - .saturating_add(RocksDbWeight::get().writes(9_u64)) + // Minimum execution time: 60_000_000 picoseconds. + Weight::from_parts(61_000_000, 3942) + .saturating_add(RocksDbWeight::get().reads(11_u64)) + .saturating_add(RocksDbWeight::get().writes(10_u64)) } /// Storage: `OcifStaking::Halted` (r:1 w:0) /// Proof: `OcifStaking::Halted` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`) @@ -362,16 +375,16 @@ impl WeightInfo for () { /// Proof: `OcifStaking::GeneralStakerInfo` (`max_values`: None, `max_size`: Some(269), added: 2744, mode: `MaxEncodedLen`) /// Storage: `OcifStaking::GeneralEraInfo` (r:1 w:1) /// Proof: `OcifStaking::GeneralEraInfo` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`) - /// Storage: `Balances::Locks` (r:1 w:1) + /// Storage: `Balances::Freezes` (r:1 w:1) + /// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(1249), added: 3724, mode: `MaxEncodedLen`) + /// Storage: `Balances::Locks` (r:1 w:0) /// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`) - /// Storage: `Balances::Freezes` (r:1 w:0) - /// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`) fn stake() -> Weight { // Proof Size summary in bytes: - // Measured: `86` + // Measured: `5` // Estimated: `4764` - // Minimum execution time: 34_000_000 picoseconds. - Weight::from_parts(35_000_000, 4764) + // Minimum execution time: 31_000_000 picoseconds. + Weight::from_parts(32_000_000, 4764) .saturating_add(RocksDbWeight::get().reads(9_u64)) .saturating_add(RocksDbWeight::get().writes(5_u64)) } @@ -387,18 +400,18 @@ impl WeightInfo for () { /// Proof: `OcifStaking::CoreEraStake` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`) /// Storage: `OcifStaking::Ledger` (r:1 w:1) /// Proof: `OcifStaking::Ledger` (`max_values`: None, `max_size`: Some(265), added: 2740, mode: `MaxEncodedLen`) - /// Storage: `Balances::Locks` (r:1 w:1) + /// Storage: `Balances::Freezes` (r:1 w:1) + /// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(1249), added: 3724, mode: `MaxEncodedLen`) + /// Storage: `Balances::Locks` (r:1 w:0) /// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`) - /// Storage: `Balances::Freezes` (r:1 w:0) - /// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`) /// Storage: `OcifStaking::GeneralEraInfo` (r:1 w:1) /// Proof: `OcifStaking::GeneralEraInfo` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`) fn unstake() -> Weight { // Proof Size summary in bytes: - // Measured: `397` + // Measured: `288` // Estimated: `4764` - // Minimum execution time: 36_000_000 picoseconds. - Weight::from_parts(37_000_000, 4764) + // Minimum execution time: 33_000_000 picoseconds. + Weight::from_parts(34_000_000, 4764) .saturating_add(RocksDbWeight::get().reads(9_u64)) .saturating_add(RocksDbWeight::get().writes(5_u64)) } @@ -410,18 +423,18 @@ impl WeightInfo for () { /// Proof: `OcifStaking::CurrentEra` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) /// Storage: `Balances::Locks` (r:1 w:1) /// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`) - /// Storage: `Balances::Freezes` (r:1 w:0) - /// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`) + /// Storage: `Balances::Freezes` (r:1 w:1) + /// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(1249), added: 3724, mode: `MaxEncodedLen`) /// Storage: `OcifStaking::GeneralEraInfo` (r:1 w:1) /// Proof: `OcifStaking::GeneralEraInfo` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`) fn withdraw_unstaked() -> Weight { // Proof Size summary in bytes: - // Measured: `449` + // Measured: `546` // Estimated: `4764` - // Minimum execution time: 31_000_000 picoseconds. - Weight::from_parts(32_000_000, 4764) + // Minimum execution time: 40_000_000 picoseconds. + Weight::from_parts(45_000_000, 4764) .saturating_add(RocksDbWeight::get().reads(6_u64)) - .saturating_add(RocksDbWeight::get().writes(3_u64)) + .saturating_add(RocksDbWeight::get().writes(4_u64)) } /// Storage: `OcifStaking::Halted` (r:1 w:0) /// Proof: `OcifStaking::Halted` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`) @@ -433,14 +446,16 @@ impl WeightInfo for () { /// Proof: `OcifStaking::CoreEraStake` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`) /// Storage: `OcifStaking::GeneralEraInfo` (r:1 w:0) /// Proof: `OcifStaking::GeneralEraInfo` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`) + /// Storage: `System::Account` (r:1 w:1) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn staker_claim_rewards() -> Weight { // Proof Size summary in bytes: - // Measured: `374` + // Measured: `213` // Estimated: `3734` - // Minimum execution time: 18_000_000 picoseconds. - Weight::from_parts(19_000_000, 3734) - .saturating_add(RocksDbWeight::get().reads(5_u64)) - .saturating_add(RocksDbWeight::get().writes(1_u64)) + // Minimum execution time: 32_000_000 picoseconds. + Weight::from_parts(33_000_000, 3734) + .saturating_add(RocksDbWeight::get().reads(6_u64)) + .saturating_add(RocksDbWeight::get().writes(2_u64)) } /// Storage: `OcifStaking::Halted` (r:1 w:0) /// Proof: `OcifStaking::Halted` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`) @@ -452,23 +467,25 @@ impl WeightInfo for () { /// Proof: `OcifStaking::CoreEraStake` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`) /// Storage: `OcifStaking::GeneralEraInfo` (r:1 w:0) /// Proof: `OcifStaking::GeneralEraInfo` (`max_values`: None, `max_size`: Some(92), added: 2567, mode: `MaxEncodedLen`) + /// Storage: `System::Account` (r:2 w:1) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn dao_claim_rewards() -> Weight { // Proof Size summary in bytes: - // Measured: `377` - // Estimated: `3557` - // Minimum execution time: 18_000_000 picoseconds. - Weight::from_parts(19_000_000, 3557) - .saturating_add(RocksDbWeight::get().reads(5_u64)) - .saturating_add(RocksDbWeight::get().writes(1_u64)) + // Measured: `249` + // Estimated: `6196` + // Minimum execution time: 31_000_000 picoseconds. + Weight::from_parts(32_000_000, 6196) + .saturating_add(RocksDbWeight::get().reads(7_u64)) + .saturating_add(RocksDbWeight::get().writes(2_u64)) } /// Storage: `OcifStaking::Halted` (r:1 w:1) /// Proof: `OcifStaking::Halted` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`) fn halt_unhalt_pallet() -> Weight { // Proof Size summary in bytes: - // Measured: `4` + // Measured: `0` // Estimated: `1486` - // Minimum execution time: 5_000_000 picoseconds. - Weight::from_parts(5_000_000, 1486) + // Minimum execution time: 4_000_000 picoseconds. + Weight::from_parts(4_000_000, 1486) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(1_u64)) } @@ -484,10 +501,10 @@ impl WeightInfo for () { /// Proof: `OcifStaking::CoreEraStake` (`max_values`: None, `max_size`: Some(54), added: 2529, mode: `MaxEncodedLen`) fn move_stake() -> Weight { // Proof Size summary in bytes: - // Measured: `302` + // Measured: `217` // Estimated: `6478` - // Minimum execution time: 24_000_000 picoseconds. - Weight::from_parts(25_000_000, 6478) + // Minimum execution time: 22_000_000 picoseconds. + Weight::from_parts(23_000_000, 6478) .saturating_add(RocksDbWeight::get().reads(7_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) } diff --git a/pallets/pallet-rings/src/lib.rs b/pallets/pallet-rings/src/lib.rs index 127bad41..ff2c57fc 100644 --- a/pallets/pallet-rings/src/lib.rs +++ b/pallets/pallet-rings/src/lib.rs @@ -44,7 +44,7 @@ pub mod pallet { use pallet_dao_manager::origin::{ensure_multisig, DaoOrigin}; use sp_std::{vec, vec::Vec}; use xcm::{ - v3::{prelude::*, MultiAsset, Weight, WildMultiAsset}, + v4::{prelude::*, MultiAsset, Weight, WildMultiAsset}, DoubleEncoded, }; diff --git a/pallets/pallet-rings/src/traits.rs b/pallets/pallet-rings/src/traits.rs index 1868a9ce..22af0991 100644 --- a/pallets/pallet-rings/src/traits.rs +++ b/pallets/pallet-rings/src/traits.rs @@ -14,7 +14,7 @@ use codec::MaxEncodedLen; use frame_support::Parameter; -use xcm::opaque::v3::MultiLocation; +use xcm::opaque::v4::Location; /// A chain [`MultiLocation`] abstraction trait. /// diff --git a/pallets/primitives/src/lib.rs b/pallets/primitives/src/lib.rs index be5d6c94..1144f1fe 100644 --- a/pallets/primitives/src/lib.rs +++ b/pallets/primitives/src/lib.rs @@ -79,3 +79,5 @@ pub struct CallInfo { pub pallet: Data, pub function: Data, } + +pub type Balance = u128; diff --git a/tinkernet/Cargo.lock b/tinkernet/Cargo.lock index dde5f2c3..7519575e 100644 --- a/tinkernet/Cargo.lock +++ b/tinkernet/Cargo.lock @@ -3426,8 +3426,9 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" +source = "git+https://github.com/Abstracted-Labs/InvArch.git?branch=francisco-refactor_nomenclature_and_links#37350f3306d9a541e920ac98bc37826489b3f6ff" dependencies = [ - "frame-support-procedural-tools-derive 3.0.0", + "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/Abstracted-Labs/InvArch.git?branch=francisco-refactor_nomenclature_and_links)", "proc-macro-crate 1.1.3", "proc-macro2", "quote", @@ -3449,6 +3450,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" +source = "git+https://github.com/Abstracted-Labs/InvArch.git?branch=francisco-refactor_nomenclature_and_links#37350f3306d9a541e920ac98bc37826489b3f6ff" dependencies = [ "proc-macro2", "quote", @@ -4302,6 +4304,7 @@ dependencies = [ [[package]] name = "invarch-primitives" version = "0.1.0-dev" +source = "git+https://github.com/Abstracted-Labs/InvArch.git?branch=francisco-refactor_nomenclature_and_links#37350f3306d9a541e920ac98bc37826489b3f6ff" dependencies = [ "frame-system", "parity-scale-codec", @@ -5821,12 +5824,13 @@ dependencies = [ [[package]] name = "new-modified-construct-runtime" version = "4.0.0-dev" +source = "git+https://github.com/Abstracted-Labs/InvArch.git?branch=francisco-refactor_nomenclature_and_links#37350f3306d9a541e920ac98bc37826489b3f6ff" dependencies = [ "Inflector", "cfg-expr", "derive-syn-parse 0.1.5", "expander 2.2.1", - "frame-support-procedural-tools 4.0.0-dev", + "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/Abstracted-Labs/InvArch.git?branch=francisco-refactor_nomenclature_and_links)", "itertools 0.10.5", "macro_magic", "proc-macro-warning", @@ -6542,6 +6546,7 @@ dependencies = [ [[package]] name = "pallet-checked-inflation" version = "0.1.0-dev" +source = "git+https://github.com/Abstracted-Labs/InvArch.git?branch=francisco-refactor_nomenclature_and_links#37350f3306d9a541e920ac98bc37826489b3f6ff" dependencies = [ "frame-benchmarking", "frame-support", @@ -6634,6 +6639,7 @@ dependencies = [ [[package]] name = "pallet-dao-manager" version = "0.1.0-dev" +source = "git+https://github.com/Abstracted-Labs/InvArch.git?branch=francisco-refactor_nomenclature_and_links#37350f3306d9a541e920ac98bc37826489b3f6ff" dependencies = [ "frame-benchmarking", "frame-support", @@ -6658,6 +6664,7 @@ dependencies = [ [[package]] name = "pallet-dao-staking" version = "0.1.0-dev" +source = "git+https://github.com/Abstracted-Labs/InvArch.git?branch=francisco-refactor_nomenclature_and_links#37350f3306d9a541e920ac98bc37826489b3f6ff" dependencies = [ "cumulus-primitives-core", "frame-benchmarking", @@ -7131,6 +7138,7 @@ dependencies = [ [[package]] name = "pallet-rings" version = "0.1.0-dev" +source = "git+https://github.com/Abstracted-Labs/InvArch.git?branch=francisco-refactor_nomenclature_and_links#37350f3306d9a541e920ac98bc37826489b3f6ff" dependencies = [ "frame-benchmarking", "frame-support", diff --git a/tinkernet/Cargo.toml b/tinkernet/Cargo.toml index 3b55e71f..9b7caccf 100644 --- a/tinkernet/Cargo.toml +++ b/tinkernet/Cargo.toml @@ -43,11 +43,11 @@ derive_more = "0.99.2" ## InvArch Pallets -pallet-dao-manager = { path = "../pallets/pallet-dao-manager", default-features = false } -pallet-dao-staking = { path = "../pallets/pallet-dao-staking", default-features = false } -pallet-checked-inflation = { path = "../pallets/pallet-checked-inflation", default-features = false } -pallet-rings = { path = "../pallets/pallet-rings", default-features = false } -new-modified-construct-runtime = { path = "../new-modified-construct-runtime", default-features = false } +pallet-dao-manager = { git = "https://github.com/Abstracted-Labs/InvArch.git", branch = "francisco-refactor_nomenclature_and_links", default-features = false } +pallet-dao-staking = { git = "https://github.com/Abstracted-Labs/InvArch.git", branch = "francisco-refactor_nomenclature_and_links", default-features = false } +pallet-checked-inflation = { git = "https://github.com/Abstracted-Labs/InvArch.git", branch = "francisco-refactor_nomenclature_and_links", default-features = false } +pallet-rings = { git = "https://github.com/Abstracted-Labs/InvArch.git", branch = "francisco-refactor_nomenclature_and_links", default-features = false } +new-modified-construct-runtime = { git = "https://github.com/Abstracted-Labs/InvArch.git", branch = "francisco-refactor_nomenclature_and_links", default-features = false } pallet-maintenance-mode = { git = "https://github.com/Moonsong-Labs/moonkit", default-features = false, features = [ "xcm-support", @@ -102,6 +102,7 @@ pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk.git", branc # Substrate Primitive Dependencies sp-api = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } +sp-application-crypto ={ git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.6.0", default-features = false } diff --git a/tinkernet/node/Cargo.toml b/tinkernet/node/Cargo.toml index 56f83ef9..f9aebe48 100644 --- a/tinkernet/node/Cargo.toml +++ b/tinkernet/node/Cargo.toml @@ -22,7 +22,7 @@ derive_more = { workspace = true } hex-literal = { workspace = true } log = { workspace = true } scale-info = { workspace = true } -serde = { workspace = true } +serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } # RPC related Dependencies diff --git a/tinkernet/runtime/Cargo.toml b/tinkernet/runtime/Cargo.toml index db3eb1fc..bf24c29c 100644 --- a/tinkernet/runtime/Cargo.toml +++ b/tinkernet/runtime/Cargo.toml @@ -19,7 +19,7 @@ codec = { workspace = true } hex-literal = { workspace = true } log = { workspace = true } scale-info = { workspace = true } -serde = { workspace = true, optional = true } +serde = { workspace = true, optional = true, features = ["derive"]} smallvec = { workspace = true } getrandom = { workspace = true } @@ -215,6 +215,7 @@ std = [ "pallet-rings/std", "pallet-asset-tx-payment/std", "new-modified-construct-runtime/std", + "pallet-message-queue/std" ] runtime-benchmarks = [