diff --git a/.gitignore b/.gitignore index f29dde7634..6a2f4c8a18 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,7 @@ js/**/*/lib # Unknown local-test + +# Ignore config ide +.vscode +.idea diff --git a/Cargo.lock b/Cargo.lock index 1bdb359e2c..38729d415d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,22 +12,13 @@ dependencies = [ "regex", ] -[[package]] -name = "addr2line" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd" -dependencies = [ - "gimli 0.25.0", -] - [[package]] name = "addr2line" version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" dependencies = [ - "gimli 0.26.1", + "gimli", ] [[package]] @@ -42,7 +33,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", ] [[package]] @@ -53,7 +44,7 @@ checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if 1.0.0", "cipher", - "cpufeatures 0.2.1", + "cpufeatures", "opaque-debug 0.3.0", ] @@ -77,7 +68,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.3", + "getrandom 0.2.7", "once_cell", "version_check", ] @@ -103,20 +94,20 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] name = "anyhow" -version = "1.0.51" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203" +checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704" [[package]] name = "approx" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "072df7202e63b127ab55acfe16ce97013d5b97bf160489336d3f1840fd78e99e" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" dependencies = [ "num-traits", ] @@ -197,14 +188,14 @@ dependencies = [ [[package]] name = "async-global-executor" -version = "2.0.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9586ec52317f36de58453159d48351bc244bc24ced3effc1fce22f3d48664af6" +checksum = "5262ed948da60dd8956c6c5aca4d4163593dddb7b32d73267c93dab7b2e98940" dependencies = [ "async-channel", "async-executor", "async-io", - "async-mutex", + "async-lock", "blocking", "futures-lite", "num_cpus", @@ -213,9 +204,9 @@ dependencies = [ [[package]] name = "async-io" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b" +checksum = "e5e18f61464ae81cde0a23e713ae8fd299580c54d697a35820cfd0625b8b0e07" dependencies = [ "concurrent-queue", "futures-lite", @@ -225,34 +216,25 @@ dependencies = [ "parking", "polling", "slab", - "socket2 0.4.2", + "socket2", "waker-fn", - "winapi 0.3.9", + "winapi", ] [[package]] name = "async-lock" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-mutex" -version = "1.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" +checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6" dependencies = [ "event-listener", ] [[package]] name = "async-process" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83137067e3a2a6a06d67168e49e68a0957d215410473a740cea95a2425c0b7c6" +checksum = "cf2c06e30a24e8c78a3987d07f0930edf76ef35e027e7bdb063fccafdad1f60c" dependencies = [ "async-io", "blocking", @@ -262,14 +244,14 @@ dependencies = [ "libc", "once_cell", "signal-hook", - "winapi 0.3.9", + "winapi", ] [[package]] name = "async-std" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8056f1455169ab86dd47b47391e4ab0cbd25410a70e9fe675544f49bafaf952" +checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ "async-attributes", "async-channel", @@ -286,9 +268,8 @@ dependencies = [ "kv-log-macro", "log", "memchr", - "num_cpus", "once_cell", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.9", "pin-utils", "slab", "wasm-bindgen-futures", @@ -296,68 +277,47 @@ dependencies = [ [[package]] name = "async-std-resolver" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed4e2c3da14d8ad45acb1e3191db7a918e9505b6f155b218e70a7c9a1a48c638" +checksum = "0f2f8a4a203be3325981310ab243a28e6e4ea55b6519bffce05d41ab60e09ad8" dependencies = [ "async-std", "async-trait", "futures-io", "futures-util", "pin-utils", + "socket2", "trust-dns-resolver", ] [[package]] name = "async-task" -version = "4.0.3" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" +checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" [[package]] name = "async-trait" -version = "0.1.52" +version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" +checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716" dependencies = [ "proc-macro2", "quote", "syn", ] -[[package]] -name = "asynchronous-codec" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4401f0a3622dad2e0763fa79e0eb328bc70fb7dccfdd645341f00d671247d6" -dependencies = [ - "bytes 1.1.0", - "futures-sink", - "futures-util", - "memchr", - "pin-project-lite 0.2.7", -] - [[package]] name = "asynchronous-codec" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0de5164e5edbf51c45fb8c2d9664ae1c095cce1b265ecf7569093c0d66ef690" dependencies = [ - "bytes 1.1.0", + "bytes", "futures-sink", "futures-util", "memchr", - "pin-project-lite 0.2.7", -] - -[[package]] -name = "atomic" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c" -dependencies = [ - "autocfg", + "pin-project-lite 0.2.9", ] [[package]] @@ -374,35 +334,55 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backoff" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" +dependencies = [ + "futures-core", + "getrandom 0.2.7", + "instant", + "pin-project-lite 0.2.9", + "rand 0.8.5", + "tokio", +] [[package]] name = "backtrace" -version = "0.3.63" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6" +checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" dependencies = [ - "addr2line 0.17.0", + "addr2line", "cc", "cfg-if 1.0.0", "libc", "miniz_oxide", - "object", + "object 0.29.0", "rustc-demangle", ] [[package]] name = "base-x" -version = "0.2.8" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" + +[[package]] +name = "base16ct" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" +checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" [[package]] name = "base58" @@ -418,9 +398,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "beef" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bed554bd50246729a1ec158d08aa3235d1b69d94ad120ebe187e28894787e736" +checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" dependencies = [ "serde", ] @@ -428,25 +408,31 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "beefy-primitives", "fnv", - "futures 0.3.18", + "futures 0.3.21", + "futures-timer", + "hex", "log", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.1", + "sc-chain-spec", "sc-client-api", + "sc-finality-grandpa", "sc-keystore", "sc-network", "sc-network-gossip", - "sc-utils 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13)", + "sc-utils 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26)", "sp-api", "sp-application-crypto", "sp-arithmetic", "sp-blockchain", + "sp-consensus", "sp-core", "sp-keystore", + "sp-mmr-primitives", "sp-runtime", "substrate-prometheus-endpoint", "thiserror", @@ -456,32 +442,36 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "beefy-gadget", "beefy-primitives", - "futures 0.3.18", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "jsonrpc-pubsub", + "futures 0.3.21", + "jsonrpsee 0.14.0", "log", "parity-scale-codec", + "parking_lot 0.12.1", "sc-rpc", + "sc-utils 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26)", "serde", "sp-core", "sp-runtime", + "thiserror", ] [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" +dependencies = [ + "beefy-primitives", + "sp-api", +] [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "scale-info", @@ -494,9 +484,9 @@ dependencies = [ [[package]] name = "bimap" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50ae17cabbc8a38a1e3e4c1a6a664e9a09672dc14d0896fa8d865d3a5a446b07" +checksum = "bc0455254eb5c6964c4545d8bac815e1a1be4f3afe0ae695ea539c12d728d44b" [[package]] name = "bincode" @@ -534,9 +524,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitvec" -version = "0.20.4" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ "funty", "radium", @@ -546,13 +536,11 @@ dependencies = [ [[package]] name = "blake2" -version = "0.9.2" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" +checksum = "b9cf849ee05b2ee5fba5e36f97ff8ec2533916700fc0758d40d92136a42f3388" dependencies = [ - "crypto-mac 0.8.0", - "digest 0.9.0", - "opaque-debug 0.3.0", + "digest 0.10.3", ] [[package]] @@ -567,39 +555,38 @@ dependencies = [ [[package]] name = "blake2b_simd" -version = "0.5.11" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" +checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec 0.7.2", "constant_time_eq", ] [[package]] name = "blake2s_simd" -version = "0.5.11" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2" +checksum = "db539cc2b5f6003621f1cd9ef92d7ded8ea5232c7de0f9faa2de251cd98730d4" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec 0.7.2", "constant_time_eq", ] [[package]] name = "blake3" -version = "0.3.8" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64485778c4f16a6a5a9d335e80d449ac6c70cdd6a06d2af18a6f6f775a125b3" +checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec 0.7.2", "cc", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "constant_time_eq", - "crypto-mac 0.8.0", - "digest 0.9.0", + "digest 0.10.3", ] [[package]] @@ -621,7 +608,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ "block-padding 0.2.1", - "generic-array 0.14.4", + "generic-array 0.14.5", +] + +[[package]] +name = "block-buffer" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" +dependencies = [ + "generic-array 0.14.5", ] [[package]] @@ -641,9 +637,9 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "blocking" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046e47d4b2d391b1f6f8b407b1deb8dee56c1852ccd868becf2710f601b5f427" +checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" dependencies = [ "async-channel", "async-task", @@ -655,178 +651,13 @@ dependencies = [ [[package]] name = "bounded-vec" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afdd1dffefe5fc66262a524b91087c43b16e478b2e3dc49eb11b0e2fd6b6ec90" +checksum = "3372be4090bf9d4da36bd8ba7ce6ca1669503d0cf6e667236c6df7f053153eb6" dependencies = [ "thiserror", ] -[[package]] -name = "bp-header-chain" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" -dependencies = [ - "finality-grandpa", - "frame-support", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-finality-grandpa", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "bp-message-dispatch" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" -dependencies = [ - "bp-runtime", - "frame-support", - "parity-scale-codec", - "scale-info", - "sp-std", -] - -[[package]] -name = "bp-messages" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" -dependencies = [ - "bitvec", - "bp-runtime", - "frame-support", - "frame-system", - "impl-trait-for-tuples", - "parity-scale-codec", - "scale-info", - "serde", - "sp-std", -] - -[[package]] -name = "bp-polkadot-core" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" -dependencies = [ - "bp-messages", - "bp-runtime", - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-api", - "sp-core", - "sp-runtime", - "sp-std", - "sp-version", -] - -[[package]] -name = "bp-rialto" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" -dependencies = [ - "bp-messages", - "bp-runtime", - "frame-support", - "frame-system", - "sp-api", - "sp-core", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "bp-rococo" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" -dependencies = [ - "bp-messages", - "bp-polkadot-core", - "bp-runtime", - "frame-support", - "parity-scale-codec", - "smallvec", - "sp-api", - "sp-runtime", - "sp-std", - "sp-version", -] - -[[package]] -name = "bp-runtime" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" -dependencies = [ - "frame-support", - "hash-db", - "num-traits", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", -] - -[[package]] -name = "bp-test-utils" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" -dependencies = [ - "bp-header-chain", - "ed25519-dalek", - "finality-grandpa", - "parity-scale-codec", - "sp-application-crypto", - "sp-finality-grandpa", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "bp-wococo" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" -dependencies = [ - "bp-messages", - "bp-polkadot-core", - "bp-rococo", - "bp-runtime", - "parity-scale-codec", - "sp-api", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "bridge-runtime-common" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" -dependencies = [ - "bp-message-dispatch", - "bp-messages", - "bp-runtime", - "frame-support", - "hash-db", - "pallet-bridge-dispatch", - "pallet-bridge-grandpa", - "pallet-bridge-messages", - "pallet-transaction-payment", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", -] - [[package]] name = "bs58" version = "0.4.0" @@ -853,15 +684,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.8.0" +version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c" +checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" [[package]] name = "byte-slice-cast" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d30c751592b77c499e7bce34d99d67c2c11bdc0574e9a488ddade14150a4698" +checksum = "87c5fdd0166095e1d463fc6cc01aa8ce547ad77a4e84d42eb6762b084e28067e" [[package]] name = "byte-tools" @@ -877,31 +708,32 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "0.4.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -dependencies = [ - "byteorder", - "iovec", -] +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" [[package]] -name = "bytes" -version = "1.1.0" +name = "bzip2-sys" +version = "0.1.11+1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] [[package]] name = "cache-padded" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" +checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" [[package]] name = "camino" -version = "1.0.5" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52d74260d9bf6944e2208aa46841b4b8f0d7ffc0849a06837b2f510337f86b2b" +checksum = "869119e97797867fd90f5e22af7d0bd274bd4635ebb9eb68c04f3f513ae6c412" dependencies = [ "serde", ] @@ -917,22 +749,22 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba2ae6de944143141f6155a473a6b02f66c7c3f9f47316f802f80204ebfe6e12" +checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ "camino", "cargo-platform", - "semver 1.0.4", + "semver 1.0.12", "serde", "serde_json", ] [[package]] name = "cc" -version = "1.0.72" +version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" dependencies = [ "jobserver", ] @@ -966,21 +798,21 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chacha20" -version = "0.7.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee7ad89dc1128635074c268ee661f90c3f7e83d9fd12910608c36b47d6c3412" +checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" dependencies = [ "cfg-if 1.0.0", "cipher", - "cpufeatures 0.1.5", + "cpufeatures", "zeroize", ] [[package]] name = "chacha20poly1305" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1580317203210c517b6d44794abfbe600698276db18127e37ad3e69bf5e848e5" +checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" dependencies = [ "aead", "chacha20", @@ -999,18 +831,20 @@ dependencies = [ "num-integer", "num-traits", "time", - "winapi 0.3.9", + "winapi", ] [[package]] name = "cid" -version = "0.6.1" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff0e3bc0b6446b3f9663c1a6aba6ef06c5aeaa1bc92bd18077be337198ab9768" +checksum = "fc949bff6704880faf064c42a4854032ab07bfcf3a4fcb82a57470acededb69c" dependencies = [ + "core2", "multibase", - "multihash 0.13.2", - "unsigned-varint 0.5.1", + "multihash", + "serde", + "unsigned-varint", ] [[package]] @@ -1019,7 +853,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", ] [[package]] @@ -1033,13 +867,13 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.3.0" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa66045b9cb23c2e9c1520732030608b02ee07e5cfaa5a521ec15ded7fa24c90" +checksum = "5a050e2153c5be08febd6734e29298e844fdb0fa21aeddd63b4eb7baa106c69b" dependencies = [ "glob", "libc", - "libloading 0.7.2", + "libloading 0.7.3", ] [[package]] @@ -1051,19 +885,81 @@ dependencies = [ "ansi_term", "atty", "bitflags", - "strsim", - "textwrap", + "strsim 0.8.0", + "textwrap 0.11.0", "unicode-width", "vec_map", ] [[package]] -name = "cloudabi" -version = "0.0.3" +name = "clap" +version = "3.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +checksum = "d646c7ade5eb07c4aa20e907a922750df0c448892513714fd3e4acbc7130829f" dependencies = [ + "atty", "bitflags", + "clap_derive", + "clap_lex", + "indexmap", + "once_cell", + "strsim 0.10.0", + "termcolor", + "textwrap 0.15.0", +] + +[[package]] +name = "clap_derive" +version = "3.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759bf187376e1afa7b85b959e6a664a3e7a95203415dba952ad19139e798f902" +dependencies = [ + "heck 0.4.0", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "cmake" +version = "0.1.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" +dependencies = [ + "cc", +] + +[[package]] +name = "coarsetime" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "454038500439e141804c655b4cd1bc6a70bcb95cd2bc9463af5661b6956f0e46" +dependencies = [ + "libc", + "once_cell", + "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", +] + +[[package]] +name = "comfy-table" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b103d85ca6e209388771bfb7aa6b68a7aeec4afbf6f0a0264bfbf50360e5212e" +dependencies = [ + "strum 0.23.0", + "strum_macros 0.23.1", + "unicode-width", ] [[package]] @@ -1075,6 +971,12 @@ dependencies = [ "cache-padded", ] +[[package]] +name = "const-oid" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -1089,9 +991,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "core-foundation" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ "core-foundation-sys", "libc", @@ -1104,88 +1006,88 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] -name = "cpp_demangle" -version = "0.3.5" +name = "core2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" +checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" dependencies = [ - "cfg-if 1.0.0", + "memchr", ] [[package]] -name = "cpufeatures" -version = "0.1.5" +name = "cpp_demangle" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" +checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" dependencies = [ - "libc", + "cfg-if 1.0.0", ] [[package]] name = "cpufeatures" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" dependencies = [ "libc", ] [[package]] name = "cranelift-bforest" -version = "0.78.0" +version = "0.85.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc0cb7df82c8cf8f2e6a8dd394a0932a71369c160cc9b027dca414fced242513" +checksum = "749d0d6022c9038dccf480bdde2a38d435937335bf2bb0f14e815d94517cdce8" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.78.0" +version = "0.85.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe4463c15fa42eee909e61e5eac4866b7c6d22d0d8c621e57a0c5380753bfa8c" +checksum = "e94370cc7b37bf652ccd8bb8f09bd900997f7ccf97520edfc75554bb5c4abbea" dependencies = [ "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-entity", - "gimli 0.25.0", + "cranelift-isle", + "gimli", "log", - "regalloc", + "regalloc2", "smallvec", "target-lexicon", ] [[package]] name = "cranelift-codegen-meta" -version = "0.78.0" +version = "0.85.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793f6a94a053a55404ea16e1700202a88101672b8cd6b4df63e13cde950852bf" +checksum = "e0a3cea8fdab90e44018c5b9a1dfd460d8ee265ac354337150222a354628bdb6" dependencies = [ "cranelift-codegen-shared", - "cranelift-entity", ] [[package]] name = "cranelift-codegen-shared" -version = "0.78.0" +version = "0.85.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44aa1846df275bce5eb30379d65964c7afc63c05a117076e62a119c25fe174be" +checksum = "5ac72f76f2698598951ab26d8c96eaa854810e693e7dd52523958b5909fde6b2" [[package]] name = "cranelift-entity" -version = "0.78.0" +version = "0.85.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3a45d8d6318bf8fc518154d9298eab2a8154ec068a8885ff113f6db8d69bb3a" +checksum = "09eaeacfcd2356fe0e66b295e8f9d59fdd1ac3ace53ba50de14d628ec902f72d" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.78.0" +version = "0.85.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e07339bd461766deb7605169de039e01954768ff730fa1254e149001884a8525" +checksum = "dba69c9980d5ffd62c18a2bde927855fcd7c8dc92f29feaf8636052662cbd99c" dependencies = [ "cranelift-codegen", "log", @@ -1193,11 +1095,17 @@ dependencies = [ "target-lexicon", ] +[[package]] +name = "cranelift-isle" +version = "0.85.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2920dc1e05cac40304456ed3301fde2c09bd6a9b0210bcfa2f101398d628d5b" + [[package]] name = "cranelift-native" -version = "0.78.0" +version = "0.85.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e2fca76ff57e0532936a71e3fc267eae6a19a86656716479c66e7f912e3d7b" +checksum = "f04dfa45f9b2a6f587c564d6b63388e00cd6589d2df6ea2758cf79e1a13285e6" dependencies = [ "cranelift-codegen", "libc", @@ -1206,9 +1114,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.78.0" +version = "0.85.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f46fec547a1f8a32c54ea61c28be4f4ad234ad95342b718a9a9adcaadb0c778" +checksum = "31a46513ae6f26f3f267d8d75b5373d555fbbd1e68681f348d99df43f747ec54" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1222,18 +1130,18 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "crossbeam-channel" -version = "0.5.1" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -1252,25 +1160,36 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.5" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" +checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d" dependencies = [ + "autocfg", "cfg-if 1.0.0", "crossbeam-utils", - "lazy_static", "memoffset", + "once_cell", "scopeguard", ] +[[package]] +name = "crossbeam-queue" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" -version = "0.8.5" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +checksum = "7d82ee10ce34d7bc12c2122495e7593a9c41347ecdd64185af4ecf72cb1a7f83" dependencies = [ "cfg-if 1.0.0", - "lazy_static", + "once_cell", ] [[package]] @@ -1280,39 +1199,52 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] -name = "crypto-mac" -version = "0.8.0" +name = "crypto-bigint" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" +checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", + "rand_core 0.6.3", "subtle", + "zeroize", +] + +[[package]] +name = "crypto-common" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ccfd8c0ee4cce11e45b3fd6f9d5e69e0cc62912aa6a0cb1bf4617b0eba5a12f" +dependencies = [ + "generic-array 0.14.5", + "typenum", ] [[package]] name = "crypto-mac" -version = "0.11.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", "subtle", ] [[package]] -name = "ct-logs" -version = "0.8.0" +name = "crypto-mac" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" +checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" dependencies = [ - "sct", + "generic-array 0.14.5", + "subtle", ] [[package]] name = "ctor" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" +checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" dependencies = [ "quote", "syn", @@ -1341,24 +1273,30 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0be8e8fc214641e306e4f913dd64ff1913e46e95#0be8e8fc214641e306e4f913dd64ff1913e46e95" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ + "clap 3.2.11", + "parity-scale-codec", + "sc-chain-spec", "sc-cli", "sc-service", - "structopt", + "sp-core", + "sp-runtime", + "url 2.2.2", ] [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0be8e8fc214641e306e4f913dd64ff1913e46e95#0be8e8fc214641e306e4f913dd64ff1913e46e95" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", "cumulus-primitives-core", - "futures 0.3.18", + "cumulus-relay-chain-interface", + "futures 0.3.21", "parity-scale-codec", - "parking_lot 0.10.2", + "parking_lot 0.12.1", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", @@ -1374,14 +1312,13 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0be8e8fc214641e306e4f913dd64ff1913e46e95#0be8e8fc214641e306e4f913dd64ff1913e46e95" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "async-trait", "cumulus-client-consensus-common", "cumulus-primitives-core", - "futures 0.3.18", + "futures 0.3.21", "parity-scale-codec", - "polkadot-client", "sc-client-api", "sc-consensus", "sc-consensus-aura", @@ -1404,11 +1341,12 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0be8e8fc214641e306e4f913dd64ff1913e46e95#0be8e8fc214641e306e4f913dd64ff1913e46e95" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "async-trait", + "cumulus-relay-chain-interface", "dyn-clone", - "futures 0.3.18", + "futures 0.3.21", "parity-scale-codec", "polkadot-primitives", "sc-client-api", @@ -1424,14 +1362,14 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-relay-chain" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0be8e8fc214641e306e4f913dd64ff1913e46e95#0be8e8fc214641e306e4f913dd64ff1913e46e95" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "async-trait", "cumulus-client-consensus-common", "cumulus-primitives-core", - "futures 0.3.18", - "parking_lot 0.10.2", - "polkadot-client", + "cumulus-relay-chain-interface", + "futures 0.3.21", + "parking_lot 0.12.1", "sc-client-api", "sc-consensus", "sp-api", @@ -1448,14 +1386,15 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0be8e8fc214641e306e4f913dd64ff1913e46e95#0be8e8fc214641e306e4f913dd64ff1913e46e95" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ + "async-trait", + "cumulus-relay-chain-interface", "derive_more", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.21", + "futures-timer", "parity-scale-codec", - "parking_lot 0.10.2", - "polkadot-client", + "parking_lot 0.12.1", "polkadot-node-primitives", "polkadot-parachain", "polkadot-primitives", @@ -1465,23 +1404,25 @@ dependencies = [ "sp-consensus", "sp-core", "sp-runtime", + "sp-state-machine", "tracing", ] [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0be8e8fc214641e306e4f913dd64ff1913e46e95#0be8e8fc214641e306e4f913dd64ff1913e46e95" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-primitives-core", - "futures 0.3.18", - "futures-timer 3.0.2", + "cumulus-relay-chain-interface", + "futures 0.3.21", + "futures-timer", "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", "polkadot-primitives", - "rand 0.8.4", + "rand 0.8.5", "sc-client-api", "sc-consensus", "sp-api", @@ -1494,18 +1435,17 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0be8e8fc214641e306e4f913dd64ff1913e46e95#0be8e8fc214641e306e4f913dd64ff1913e46e95" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ + "cumulus-client-cli", "cumulus-client-collator", "cumulus-client-consensus-common", "cumulus-client-pov-recovery", "cumulus-primitives-core", - "parity-scale-codec", - "parking_lot 0.10.2", + "cumulus-relay-chain-interface", + "parking_lot 0.12.1", "polkadot-overseer", "polkadot-primitives", - "polkadot-service", - "sc-chain-spec", "sc-client-api", "sc-consensus", "sc-consensus-babe", @@ -1523,7 +1463,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0be8e8fc214641e306e4f913dd64ff1913e46e95#0be8e8fc214641e306e4f913dd64ff1913e46e95" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "frame-executive", "frame-support", @@ -1541,7 +1481,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0be8e8fc214641e306e4f913dd64ff1913e46e95#0be8e8fc214641e306e4f913dd64ff1913e46e95" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1559,7 +1499,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0be8e8fc214641e306e4f913dd64ff1913e46e95#0be8e8fc214641e306e4f913dd64ff1913e46e95" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-pallet-parachain-system-proc-macro", "cumulus-primitives-core", @@ -1567,6 +1507,7 @@ dependencies = [ "environmental", "frame-support", "frame-system", + "impl-trait-for-tuples", "log", "pallet-balances", "parity-scale-codec", @@ -1588,9 +1529,9 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0be8e8fc214641e306e4f913dd64ff1913e46e95#0be8e8fc214641e306e4f913dd64ff1913e46e95" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn", @@ -1599,7 +1540,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0be8e8fc214641e306e4f913dd64ff1913e46e95#0be8e8fc214641e306e4f913dd64ff1913e46e95" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1616,7 +1557,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0be8e8fc214641e306e4f913dd64ff1913e46e95#0be8e8fc214641e306e4f913dd64ff1913e46e95" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1634,10 +1575,9 @@ dependencies = [ [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0be8e8fc214641e306e4f913dd64ff1913e46e95#0be8e8fc214641e306e4f913dd64ff1913e46e95" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "frame-support", - "impl-trait-for-tuples", "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain", @@ -1651,13 +1591,13 @@ dependencies = [ [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0be8e8fc214641e306e4f913dd64ff1913e46e95#0be8e8fc214641e306e4f913dd64ff1913e46e95" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "async-trait", "cumulus-primitives-core", - "cumulus-test-relay-sproof-builder 0.1.0 (git+https://github.com/paritytech//cumulus?rev=0be8e8fc214641e306e4f913dd64ff1913e46e95)", + "cumulus-relay-chain-interface", + "cumulus-test-relay-sproof-builder 0.1.0 (git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677)", "parity-scale-codec", - "polkadot-client", "sc-client-api", "scale-info", "sp-api", @@ -1666,6 +1606,7 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-std", + "sp-storage", "sp-trie", "tracing", ] @@ -1673,9 +1614,11 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0be8e8fc214641e306e4f913dd64ff1913e46e95#0be8e8fc214641e306e4f913dd64ff1913e46e95" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-primitives-core", + "futures 0.3.21", + "parity-scale-codec", "sp-inherents", "sp-std", "sp-timestamp", @@ -1684,7 +1627,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0be8e8fc214641e306e4f913dd64ff1913e46e95#0be8e8fc214641e306e4f913dd64ff1913e46e95" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1698,10 +1641,89 @@ dependencies = [ "xcm", ] +[[package]] +name = "cumulus-relay-chain-inprocess-interface" +version = "0.1.0" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" +dependencies = [ + "async-trait", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "futures 0.3.21", + "futures-timer", + "parking_lot 0.12.1", + "polkadot-cli", + "polkadot-client", + "polkadot-service", + "sc-cli", + "sc-client-api", + "sc-consensus-babe", + "sc-network", + "sc-sysinfo 6.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26)", + "sc-telemetry", + "sc-tracing", + "sp-api", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-runtime", + "sp-state-machine", + "tracing", +] + +[[package]] +name = "cumulus-relay-chain-interface" +version = "0.1.0" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" +dependencies = [ + "async-trait", + "cumulus-primitives-core", + "derive_more", + "futures 0.3.21", + "jsonrpsee-core 0.14.0", + "parity-scale-codec", + "parking_lot 0.12.1", + "polkadot-overseer", + "polkadot-service", + "sc-client-api", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-runtime", + "sp-state-machine", + "thiserror", +] + +[[package]] +name = "cumulus-relay-chain-rpc-interface" +version = "0.1.0" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" +dependencies = [ + "async-trait", + "backoff", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "futures 0.3.21", + "futures-timer", + "jsonrpsee 0.14.0", + "parity-scale-codec", + "parking_lot 0.12.1", + "polkadot-service", + "sc-client-api", + "sc-rpc-api", + "sp-api", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-storage", + "tracing", + "url 2.2.2", +] + [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.11#ede4d527c4fc5d84c43216b408a873625488574b" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", @@ -1714,7 +1736,7 @@ dependencies = [ [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0be8e8fc214641e306e4f913dd64ff1913e46e95#0be8e8fc214641e306e4f913dd64ff1913e46e95" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", @@ -1750,6 +1772,19 @@ dependencies = [ "zeroize", ] +[[package]] +name = "curve25519-dalek" +version = "4.0.0-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4033478fbf70d6acf2655ac70da91ee65852d69daf7a67bf7a2f518fb47aafcf" +dependencies = [ + "byteorder", + "digest 0.9.0", + "rand_core 0.6.3", + "subtle", + "zeroize", +] + [[package]] name = "data-encoding" version = "2.3.2" @@ -1776,6 +1811,15 @@ dependencies = [ "syn", ] +[[package]] +name = "der" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" +dependencies = [ + "const-oid", +] + [[package]] name = "derivative" version = "2.2.0" @@ -1811,7 +1855,7 @@ dependencies = [ [[package]] name = "dev-runtime" -version = "2.0.0" +version = "4.0.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", @@ -1832,6 +1876,7 @@ dependencies = [ "hex-literal", "log", "orml-currencies", + "orml-oracle", "orml-tokens", "orml-traits", "orml-unknown-tokens", @@ -1839,15 +1884,15 @@ dependencies = [ "orml-xtokens", "pallet-asset-index", "pallet-asset-index-rpc-runtime-api", - "pallet-asset-tx-payment 0.1.0", + "pallet-asset-tx-payment", "pallet-aura", "pallet-authorship", "pallet-balances", - "pallet-chainlink-feed", "pallet-collator-selection", "pallet-collective", "pallet-committee", "pallet-local-treasury", + "pallet-membership", "pallet-price-feed", "pallet-randomness-collective-flip", "pallet-remote-asset-manager", @@ -1903,7 +1948,18 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", +] + +[[package]] +name = "digest" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" +dependencies = [ + "block-buffer 0.10.2", + "crypto-common", + "subtle", ] [[package]] @@ -1927,13 +1983,13 @@ dependencies = [ [[package]] name = "dirs-sys" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", "redox_users", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1944,7 +2000,7 @@ checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", "redox_users", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1954,7 +2010,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea" dependencies = [ "byteorder", - "quick-error 1.2.3", + "quick-error", ] [[package]] @@ -1965,9 +2021,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dtoa" -version = "0.4.8" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" +checksum = "5caaa75cbd2b960ff1e5392d2cfb1f44717fffe12fc1f32b7b5d1267f99732a6" [[package]] name = "dyn-clonable" @@ -1992,15 +2048,27 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.4" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140206b78fb2bc3edbcfc9b5ccbd0b30699cfe8d348b8b31b330e47df5291a5a" + +[[package]] +name = "ecdsa" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf" +checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9" +dependencies = [ + "der", + "elliptic-curve", + "rfc6979", + "signature", +] [[package]] name = "ed25519" -version = "1.3.0" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74e1069e39f1454367eb2de793ed062fac4c35c2934b76a81d90dd9abcd28816" +checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" dependencies = [ "signature", ] @@ -2015,23 +2083,41 @@ dependencies = [ "ed25519", "rand 0.7.3", "serde", - "sha2 0.9.8", + "sha2 0.9.9", "zeroize", ] [[package]] name = "either" -version = "1.6.1" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" + +[[package]] +name = "elliptic-curve" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6" +dependencies = [ + "base16ct", + "crypto-bigint", + "der", + "ff", + "generic-array 0.14.5", + "group", + "rand_core 0.6.3", + "sec1", + "subtle", + "zeroize", +] [[package]] name = "enum-as-inner" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595" +checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" dependencies = [ - "heck", + "heck 0.4.0", "proc-macro2", "quote", "syn", @@ -2039,18 +2125,18 @@ dependencies = [ [[package]] name = "enumflags2" -version = "0.6.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8d82922337cd23a15f88b70d8e4ef5f11da38dd7cdb55e84dd5de99695da0" +checksum = "e75d4cd21b95383444831539909fbb14b9dc3fdceb2a6f5d36577329a1f55ccb" dependencies = [ "enumflags2_derive", ] [[package]] name = "enumflags2_derive" -version = "0.6.4" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" +checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae" dependencies = [ "proc-macro2", "quote", @@ -2059,28 +2145,15 @@ dependencies = [ [[package]] name = "enumn" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e58b112d5099aa0857c5d05f0eacab86406dd8c0f85fe5d320a13256d29ecf4" +checksum = "052bc8773a98bd051ff37db74a8a25f00e6bfa2cbd03373390c72e9f7afbf344" dependencies = [ "proc-macro2", "quote", "syn", ] -[[package]] -name = "env_logger" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" -dependencies = [ - "atty", - "humantime 1.3.0", - "log", - "regex", - "termcolor", -] - [[package]] name = "env_logger" version = "0.9.0" @@ -2088,7 +2161,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" dependencies = [ "atty", - "humantime 2.1.0", + "humantime", "log", "regex", "termcolor", @@ -2108,7 +2181,7 @@ checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" dependencies = [ "errno-dragonfly", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2122,45 +2195,43 @@ dependencies = [ ] [[package]] -name = "ethbloom" -version = "0.11.1" +name = "event-listener" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb684ac8fa8f6c5759f788862bb22ec6fe3cb392f6bfd08e3c64b603661e3f8" -dependencies = [ - "crunchy", - "fixed-hash", - "impl-rlp", - "impl-serde", - "tiny-keccak", -] +checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" [[package]] -name = "ethereum-types" -version = "0.12.1" +name = "exit-future" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05136f7057fe789f06e6d41d07b34e6f70d8c86e5693b60f97aaa6553553bdaf" +checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5" dependencies = [ - "ethbloom", - "fixed-hash", - "impl-rlp", - "impl-serde", - "primitive-types", - "uint", + "futures 0.3.21", ] [[package]] -name = "event-listener" -version = "2.5.1" +name = "expander" +version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" +checksum = "a718c0675c555c5f976fff4ea9e2c150fa06cefa201cadef87cfbf9324075881" +dependencies = [ + "blake3", + "fs-err", + "proc-macro2", + "quote", +] [[package]] -name = "exit-future" -version = "0.2.0" +name = "expander" +version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5" +checksum = "3774182a5df13c3d1690311ad32fbe913feef26baba609fa2dd5f72042bd2ab6" dependencies = [ - "futures 0.3.18", + "blake2", + "fs-err", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -2177,13 +2248,38 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fastrand" -version = "1.5.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b394ed3d285a429378d3b384b9eb1285267e7df4b166df24b7a6939a04dc392e" +checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" dependencies = [ "instant", ] +[[package]] +name = "fatality" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ad875162843b0d046276327afe0136e9ed3a23d5a754210fb6f1f33610d39ab" +dependencies = [ + "fatality-proc-macro", + "thiserror", +] + +[[package]] +name = "fatality-proc-macro" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5aa1e3ae159e592ad222dc90c5acbad632b527779ba88486abe92782ab268bd" +dependencies = [ + "expander 0.0.4", + "indexmap", + "proc-macro-crate 1.1.3", + "proc-macro2", + "quote", + "syn", + "thiserror", +] + [[package]] name = "fdlimit" version = "0.2.1" @@ -2193,29 +2289,51 @@ dependencies = [ "libc", ] +[[package]] +name = "ff" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "131655483be284720a17d74ff97592b8e76576dc25563148601df2d7c9080924" +dependencies = [ + "rand_core 0.6.3", + "subtle", +] + [[package]] name = "file-per-thread-logger" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fdbe0d94371f9ce939b555dd342d0686cc4c0cadbcd4b61d70af5ff97eb4126" +checksum = "21e16290574b39ee41c71aeb90ae960c504ebaf1e2a1c87bd52aa56ed6e1a02f" dependencies = [ - "env_logger 0.7.1", + "env_logger", "log", ] +[[package]] +name = "filetime" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "windows-sys", +] + [[package]] name = "finality-grandpa" -version = "0.14.4" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ac3ff5224ef91f3c97e03eb1de2db82743427e91aaa5ac635f454f0b164f5a" +checksum = "b22349c6a11563a202d95772a68e0fcf56119e74ea8a2a19cf2301460fcd0df5" dependencies = [ "either", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.21", + "futures-timer", "log", "num-traits", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "scale-info", ] @@ -2226,26 +2344,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" dependencies = [ "byteorder", - "rand 0.8.4", + "rand 0.8.5", "rustc-hex", "static_assertions", ] [[package]] name = "fixedbitset" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.22" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" dependencies = [ - "cfg-if 1.0.0", "crc32fast", - "libc", "libz-sys", "miniz_oxide", ] @@ -2259,7 +2375,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", ] @@ -2277,7 +2393,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -2286,7 +2402,9 @@ dependencies = [ "parity-scale-codec", "paste", "scale-info", + "serde", "sp-api", + "sp-application-crypto", "sp-io", "sp-runtime", "sp-runtime-interface", @@ -2297,47 +2415,85 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "Inflector", "chrono", + "clap 3.2.11", + "comfy-table", "frame-benchmarking", "frame-support", + "frame-system", + "gethostname", "handlebars", + "hash-db", + "hex", + "itertools", + "kvdb", + "lazy_static", "linked-hash-map", "log", + "memory-db", "parity-scale-codec", + "rand 0.8.5", + "rand_pcg 0.3.1", + "sc-block-builder", "sc-cli", + "sc-client-api", "sc-client-db", "sc-executor", "sc-service", + "sc-sysinfo 6.0.0-dev (git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b)", "serde", + "serde_json", + "serde_nanos", + "sp-api", + "sp-blockchain", "sp-core", + "sp-database", "sp-externalities", + "sp-inherents", "sp-keystore", "sp-runtime", "sp-state-machine", - "structopt", + "sp-storage", + "sp-trie", + "tempfile", + "thiserror", + "thousands", +] + +[[package]] +name = "frame-election-provider-solution-type" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" +dependencies = [ + "proc-macro-crate 1.1.3", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ + "frame-election-provider-solution-type", "frame-support", "frame-system", "parity-scale-codec", "scale-info", "sp-arithmetic", "sp-npos-elections", + "sp-runtime", "sp-std", ] [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -2352,9 +2508,9 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "14.2.0" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ed5e5c346de62ca5c184b4325a6600d1eaca210666e4606fe4e449574978d0" +checksum = "df6bb8542ef006ef0de09a5c4420787d79823c0ed7924225822362fd2bf2ff2d" dependencies = [ "cfg-if 1.0.0", "parity-scale-codec", @@ -2365,12 +2521,13 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "bitflags", "frame-metadata", "frame-support-procedural", "impl-trait-for-tuples", + "k256", "log", "once_cell", "parity-scale-codec", @@ -2394,7 +2551,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2406,10 +2563,10 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support-procedural-tools-derive", - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn", @@ -2418,7 +2575,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "proc-macro2", "quote", @@ -2428,7 +2585,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "log", @@ -2445,7 +2602,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -2460,7 +2617,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "sp-api", @@ -2469,7 +2626,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "sp-api", @@ -2479,9 +2636,9 @@ dependencies = [ [[package]] name = "fs-err" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ebd3504ad6116843b8375ad70df74e7bfe83cac77a1f3fe73200c844d43bfe0" +checksum = "5bd79fa345a495d3ae89fb7165fec01c0e72f41821d642dda363a1e97975652e" [[package]] name = "fs-swap" @@ -2492,7 +2649,7 @@ dependencies = [ "lazy_static", "libc", "libloading 0.5.2", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2502,30 +2659,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" dependencies = [ "libc", - "winapi 0.3.9", -] - -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags", - "fuchsia-zircon-sys", + "winapi", ] [[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" +name = "fs_extra" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" +checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" [[package]] name = "funty" -version = "1.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" @@ -2535,9 +2682,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd0210d8c325c245ff06fd95a3b13689a1a276ac8cfa8e8720cb840bfb84b9e" +checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" dependencies = [ "futures-channel", "futures-core", @@ -2550,9 +2697,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc8cd39e3dbf865f7340dce6a2d401d24fd37c6fe6c4f0ee0de8bfca2252d27" +checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" dependencies = [ "futures-core", "futures-sink", @@ -2560,15 +2707,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629316e42fe7c2a0b9a65b47d159ceaa5453ab14e8f0a3c5eedbb8cd55b4a445" +checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" [[package]] name = "futures-executor" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b808bf53348a36cab739d7e04755909b9fcaaa69b7d7e588b37b6ec62704c97" +checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" dependencies = [ "futures-core", "futures-task", @@ -2578,9 +2725,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e481354db6b5c353246ccf6a728b0c5511d752c08da7260546fc0933869daa11" +checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" [[package]] name = "futures-lite" @@ -2593,15 +2740,15 @@ dependencies = [ "futures-io", "memchr", "parking", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.9", "waker-fn", ] [[package]] name = "futures-macro" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a89f17b21645bc4ed773c69af9c9a0effd4a3f1a3876eadd453469f8854e7fdd" +checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" dependencies = [ "proc-macro2", "quote", @@ -2610,9 +2757,9 @@ dependencies = [ [[package]] name = "futures-rustls" -version = "0.21.1" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a1387e07917c711fb4ee4f48ea0adb04a3c9739e53ef85bf43ae1edc2937a8b" +checksum = "e01fe9932a224b72b45336d96040aa86386d674a31d0af27d800ea7bc8ca97fe" dependencies = [ "futures-io", "rustls", @@ -2621,21 +2768,15 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "996c6442437b62d21a32cd9906f9c41e7dc1e19a9579843fad948696769305af" +checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" [[package]] name = "futures-task" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dabf1872aaab32c886832f2276d2f5399887e2bd613698a02359e4ea83f8de12" - -[[package]] -name = "futures-timer" -version = "2.0.2" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1de7508b218029b0f01662ed8f61b1c964b3ae99d6f25462d0f55a595109df6" +checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" [[package]] name = "futures-timer" @@ -2645,9 +2786,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d22213122356472061ac0f1ab2cee28d2bac8491410fd68c2af53d1cedb83e" +checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" dependencies = [ "futures 0.1.31", "futures-channel", @@ -2657,11 +2798,20 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.9", "pin-utils", "slab", ] +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + [[package]] name = "generic-array" version = "0.12.4" @@ -2673,14 +2823,24 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.4" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" dependencies = [ "typenum", "version_check", ] +[[package]] +name = "gethostname" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "getrandom" version = "0.1.16" @@ -2696,13 +2856,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.3" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" dependencies = [ "cfg-if 1.0.0", "libc", - "wasi 0.10.0+wasi-snapshot-preview1", + "wasi 0.11.0+wasi-snapshot-preview1", ] [[package]] @@ -2717,21 +2877,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.25.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" +checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" dependencies = [ "fallible-iterator", "indexmap", "stable_deref_trait", ] -[[package]] -name = "gimli" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" - [[package]] name = "glob" version = "0.3.0" @@ -2740,9 +2894,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "globset" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd" +checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" dependencies = [ "aho-corasick", "bstr", @@ -2753,24 +2907,34 @@ dependencies = [ [[package]] name = "gloo-timers" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f16c88aa13d2656ef20d1c042086b8767bbe2bdb62526894275a1b062161b2e" +checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9" dependencies = [ "futures-channel", "futures-core", "js-sys", "wasm-bindgen", - "web-sys", +] + +[[package]] +name = "group" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89" +dependencies = [ + "ff", + "rand_core 0.6.3", + "subtle", ] [[package]] name = "h2" -version = "0.3.9" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f072413d126e57991455e0a922b31e4c8ba7c2ffbebf6b78b4f8521397d65cd" +checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" dependencies = [ - "bytes 1.1.0", + "bytes", "fnv", "futures-core", "futures-sink", @@ -2785,16 +2949,16 @@ dependencies = [ [[package]] name = "handlebars" -version = "4.1.6" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167fa173496c9eadd8749cca6f8339ac88e248f3ad2442791d0b743318a94fc0" +checksum = "36641a8b9deb60e23fb9bb47ac631d664a780b088909b89179a4eab5618b076b" dependencies = [ "log", "pest", "pest_derive", - "quick-error 2.0.1", "serde", "serde_json", + "thiserror", ] [[package]] @@ -2821,6 +2985,15 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "607c8a29735385251a339424dd462993c0fed8fa09d378f259377df08c126022" +dependencies = [ + "ahash", +] + [[package]] name = "heck" version = "0.3.3" @@ -2830,6 +3003,12 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -2884,7 +3063,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1" dependencies = [ "digest 0.9.0", - "generic-array 0.14.4", + "generic-array 0.14.5", "hmac 0.8.1", ] @@ -2896,36 +3075,36 @@ checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" dependencies = [ "libc", "match_cfg", - "winapi 0.3.9", + "winapi", ] [[package]] name = "http" -version = "0.2.5" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ - "bytes 1.1.0", + "bytes", "fnv", - "itoa", + "itoa 1.0.2", ] [[package]] name = "http-body" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.1.0", + "bytes", "http", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.9", ] [[package]] name = "httparse" -version = "1.5.1" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" +checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" [[package]] name = "httpdate" @@ -2933,15 +3112,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" -[[package]] -name = "humantime" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error 1.2.3", -] - [[package]] name = "humantime" version = "2.1.0" @@ -2950,11 +3120,11 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.16" +version = "0.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7ec3e62bdc98a2f0393a5048e4c30ef659440ea6e0e572965103e72bd836f55" +checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" dependencies = [ - "bytes 1.1.0", + "bytes", "futures-channel", "futures-core", "futures-util", @@ -2963,9 +3133,9 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa", - "pin-project-lite 0.2.7", - "socket2 0.4.2", + "itoa 1.0.2", + "pin-project-lite 0.2.9", + "socket2", "tokio", "tower-service", "tracing", @@ -2974,19 +3144,17 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.22.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" +checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" dependencies = [ - "ct-logs", - "futures-util", + "http", "hyper", "log", "rustls", "rustls-native-certs", "tokio", "tokio-rustls", - "webpki", ] [[package]] @@ -3013,59 +3181,41 @@ dependencies = [ [[package]] name = "if-addrs" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2273e421f7c4f0fc99e1934fe4776f59d8df2972f4199d703fc0da9f2a9f73de" -dependencies = [ - "if-addrs-sys", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "if-addrs-sys" -version = "0.3.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de74b9dd780476e837e5eb5ab7c88b49ed304126e412030a0adba99c8efe79ea" +checksum = "cbc0fa01ffc752e9dbc72818cdb072cd028b86be5e09dd04c5a643704fe101a9" dependencies = [ - "cc", "libc", + "winapi", ] [[package]] name = "if-watch" -version = "0.2.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8ab7f67bad3240049cb24fb9cb0b4c2c6af4c245840917fbbdededeee91179" +checksum = "015a7df1eb6dda30df37f34b63ada9b7b352984b0e84de2a20ed526345000791" dependencies = [ "async-io", - "futures 0.3.18", - "futures-lite", + "core-foundation", + "fnv", + "futures 0.3.21", "if-addrs", "ipnet", - "libc", "log", - "winapi 0.3.9", + "rtnetlink", + "system-configuration", + "windows", ] [[package]] name = "impl-codec" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443" +checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ "parity-scale-codec", ] -[[package]] -name = "impl-rlp" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" -dependencies = [ - "rlp", -] - [[package]] name = "impl-serde" version = "0.3.2" @@ -3077,9 +3227,9 @@ dependencies = [ [[package]] name = "impl-trait-for-tuples" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5dacb10c5b3bb92d46ba347505a9041e676bb20ad220101326bffb0c93031ee" +checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" dependencies = [ "proc-macro2", "quote", @@ -3088,12 +3238,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.7.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.2", "serde", ] @@ -3108,9 +3258,9 @@ dependencies = [ [[package]] name = "integer-encoding" -version = "1.1.7" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dc51180a9b377fd75814d0cc02199c20f8e99433d6762f650d39cdbbd3b56f" +checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" [[package]] name = "integer-sqrt" @@ -3121,34 +3271,17 @@ dependencies = [ "num-traits", ] -[[package]] -name = "intervalier" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64fa110ec7b8f493f416eed552740d10e7030ad5f63b2308f82c9608ec2df275" -dependencies = [ - "futures 0.3.18", - "futures-timer 2.0.2", -] - [[package]] name = "io-lifetimes" -version = "0.3.3" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "278e90d6f8a6c76a8334b336e306efa3c5f2b604048cbfd486d6f49878e3af14" -dependencies = [ - "rustc_version 0.4.0", - "winapi 0.3.9", -] +checksum = "ec58677acfea8a15352d42fc87d11d63596ade9239e0a7c9352914417515dbe6" [[package]] -name = "iovec" -version = "0.1.4" +name = "io-lifetimes" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] +checksum = "1ea37f355c05dde75b84bba2d767906ad522e97cd9e2eef2be7a4ab7fb442c06" [[package]] name = "ip_network" @@ -3158,21 +3291,21 @@ checksum = "aa2f047c0a98b2f299aa5d6d7088443570faae494e9ae1305e48be000c9e0eb1" [[package]] name = "ipconfig" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7" +checksum = "723519edce41262b05d4143ceb95050e4c614f483e78e9fd9e39a8275a84ad98" dependencies = [ - "socket2 0.3.19", + "socket2", "widestring", - "winapi 0.3.9", + "winapi", "winreg", ] [[package]] name = "ipnet" -version = "2.3.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" +checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" [[package]] name = "itertools" @@ -3189,6 +3322,12 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" +[[package]] +name = "itoa" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" + [[package]] name = "jobserver" version = "0.1.24" @@ -3200,9 +3339,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.55" +version = "0.3.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" +checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27" dependencies = [ "wasm-bindgen", ] @@ -3214,7 +3353,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2b99d4207e2a04fb4581746903c2bb7eb376f88de9c699d0f3e10feeac0cd3a" dependencies = [ "derive_more", - "futures 0.3.18", + "futures 0.3.21", "jsonrpc-core", "jsonrpc-pubsub", "log", @@ -3229,7 +3368,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" dependencies = [ - "futures 0.3.18", + "futures 0.3.21", "futures-executor", "futures-util", "log", @@ -3244,7 +3383,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b51da17abecbdab3e3d4f26b01c5ec075e88d3abe3ab3b05dc9aa69392764ec0" dependencies = [ - "futures 0.3.18", + "futures 0.3.21", "jsonrpc-client-transports", ] @@ -3261,104 +3400,180 @@ dependencies = [ ] [[package]] -name = "jsonrpc-http-server" +name = "jsonrpc-pubsub" version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1dea6e07251d9ce6a552abfb5d7ad6bc290a4596c8dcc3d795fae2bbdc1f3ff" +checksum = "240f87695e6c6f62fb37f05c02c04953cf68d6408b8c1c89de85c7a0125b1011" dependencies = [ - "futures 0.3.18", - "hyper", + "futures 0.3.21", "jsonrpc-core", - "jsonrpc-server-utils", + "lazy_static", "log", - "net2", "parking_lot 0.11.2", - "unicase", + "rand 0.7.3", + "serde", ] [[package]] -name = "jsonrpc-ipc-server" -version = "18.0.0" +name = "jsonrpsee" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382bb0206323ca7cda3dcd7e245cea86d37d02457a02a975e3378fb149a48845" +checksum = "a1f2ab5a60e558e74ea93bcf5164ebc47939a7fff8938fa9b5233bbc63e16061" dependencies = [ - "futures 0.3.18", - "jsonrpc-core", - "jsonrpc-server-utils", - "log", - "parity-tokio-ipc", - "parking_lot 0.11.2", - "tower-service", + "jsonrpsee-core 0.13.1", + "jsonrpsee-http-server 0.13.1", + "jsonrpsee-proc-macros 0.13.1", + "jsonrpsee-types 0.13.1", + "jsonrpsee-ws-server 0.13.1", + "tracing", ] [[package]] -name = "jsonrpc-pubsub" -version = "18.0.0" +name = "jsonrpsee" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240f87695e6c6f62fb37f05c02c04953cf68d6408b8c1c89de85c7a0125b1011" +checksum = "11e017217fcd18da0a25296d3693153dd19c8a6aadab330b3595285d075385d1" dependencies = [ - "futures 0.3.18", - "jsonrpc-core", + "jsonrpsee-core 0.14.0", + "jsonrpsee-http-server 0.14.0", + "jsonrpsee-proc-macros 0.14.0", + "jsonrpsee-types 0.14.0", + "jsonrpsee-ws-client", + "jsonrpsee-ws-server 0.14.0", + "tracing", +] + +[[package]] +name = "jsonrpsee-client-transport" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce395539a14d3ad4ec1256fde105abd36a2da25d578a291cabe98f45adfdb111" +dependencies = [ + "futures-util", + "http", + "jsonrpsee-core 0.14.0", + "jsonrpsee-types 0.14.0", + "pin-project", + "rustls-native-certs", + "soketto", + "thiserror", + "tokio", + "tokio-rustls", + "tokio-util", + "tracing", + "webpki-roots", +] + +[[package]] +name = "jsonrpsee-core" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e27462b21279edf9a6a91f46ffbe125e9cdc58b901d2e08bf59b31a47d7d0ab" +dependencies = [ + "anyhow", + "arrayvec 0.7.2", + "async-trait", + "beef", + "futures-channel", + "futures-util", + "hyper", + "jsonrpsee-types 0.13.1", + "parking_lot 0.12.1", + "rand 0.8.5", + "rustc-hash", + "serde", + "serde_json", + "soketto", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "jsonrpsee-core" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16efcd4477de857d4a2195a45769b2fe9ebb54f3ef5a4221d3b014a4fe33ec0b" +dependencies = [ + "anyhow", + "arrayvec 0.7.2", + "async-lock", + "async-trait", + "beef", + "futures-channel", + "futures-timer", + "futures-util", + "globset", + "hyper", + "jsonrpsee-types 0.14.0", "lazy_static", - "log", - "parking_lot 0.11.2", - "rand 0.7.3", + "parking_lot 0.12.1", + "rand 0.8.5", + "rustc-hash", "serde", + "serde_json", + "soketto", + "thiserror", + "tokio", + "tracing", + "unicase", ] [[package]] -name = "jsonrpc-server-utils" -version = "18.0.0" +name = "jsonrpsee-http-server" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4" +checksum = "7178f16eabd7154c094e24d295b9ee355ec1e5f24c328759c56255ff7bbd4548" dependencies = [ - "bytes 1.1.0", - "futures 0.3.18", + "futures-channel", + "futures-util", "globset", - "jsonrpc-core", + "hyper", + "jsonrpsee-core 0.13.1", + "jsonrpsee-types 0.13.1", "lazy_static", - "log", + "serde_json", "tokio", - "tokio-stream", - "tokio-util", + "tracing", "unicase", ] [[package]] -name = "jsonrpc-ws-server" -version = "18.0.0" +name = "jsonrpsee-http-server" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f892c7d766369475ab7b0669f417906302d7c0fb521285c0a0c92e52e7c8e946" +checksum = "bdd69efeb3ce2cba767f126872f4eeb4624038a29098e75d77608b2b4345ad03" dependencies = [ - "futures 0.3.18", - "jsonrpc-core", - "jsonrpc-server-utils", - "log", - "parity-ws", - "parking_lot 0.11.2", - "slab", + "futures-channel", + "futures-util", + "hyper", + "jsonrpsee-core 0.14.0", + "jsonrpsee-types 0.14.0", + "serde", + "serde_json", + "tokio", + "tracing", ] [[package]] -name = "jsonrpsee" -version = "0.4.1" +name = "jsonrpsee-proc-macros" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6373a33d987866ccfe1af4bc11b089dce941764313f9fd8b7cf13fcb51b72dc5" +checksum = "8b8d7f449cab3b747f12c3efc27f5cad537f3b597c6a3838b0fac628f4bf730a" dependencies = [ - "jsonrpsee-proc-macros", - "jsonrpsee-types", - "jsonrpsee-utils", - "jsonrpsee-ws-client", + "proc-macro-crate 1.1.3", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "jsonrpsee-proc-macros" -version = "0.4.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d802063f7a3c867456955f9d2f15eb3ee0edb5ec9ec2b5526324756759221c0f" +checksum = "874cf3f6a027cebf36cae767feca9aa2e8a8f799880e49eb5540819fcbd8eada" dependencies = [ - "log", - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn", @@ -3366,90 +3581,110 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.4.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f778cf245158fbd8f5d50823a2e9e4c708a40be164766bd35e9fb1d86715b2" +checksum = "8fd11763134104122ddeb0f97e4bbe393058017dfb077db63fbf44b4dd0dd86e" dependencies = [ "anyhow", - "async-trait", "beef", - "futures-channel", - "futures-util", - "hyper", - "log", "serde", "serde_json", - "soketto", "thiserror", + "tracing", ] [[package]] -name = "jsonrpsee-utils" -version = "0.4.1" +name = "jsonrpsee-types" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0109c4f972058f3b1925b73a17210aff7b63b65967264d0045d15ee88fe84f0c" +checksum = "3bcf76cd316f5d3ad48138085af1f45e2c58c98e02f0779783dbb034d43f7c86" dependencies = [ - "arrayvec 0.7.2", + "anyhow", "beef", - "jsonrpsee-types", + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] +name = "jsonrpsee-ws-client" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee043cb5dd0d51d3eb93432e998d5bae797691a7b10ec4a325e036bcdb48c48a" +dependencies = [ + "jsonrpsee-client-transport", + "jsonrpsee-core 0.14.0", + "jsonrpsee-types 0.14.0", +] + +[[package]] +name = "jsonrpsee-ws-server" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfb6c21556c551582b56e4e8e6e6249b0bbdb69bb7fa39efe9b9a6b54af9f206" +dependencies = [ + "futures-channel", + "futures-util", + "jsonrpsee-core 0.13.1", + "jsonrpsee-types 0.13.1", + "serde_json", + "soketto", + "tokio", + "tokio-util", + "tracing", ] [[package]] -name = "jsonrpsee-ws-client" -version = "0.4.1" +name = "jsonrpsee-ws-server" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559aa56fc402af206c00fc913dc2be1d9d788dcde045d14df141a535245d35ef" +checksum = "2bd2e4d266774a671f8def3794255b28eddd09b18d76e0b913fa439f34588c0a" dependencies = [ - "arrayvec 0.7.2", - "async-trait", - "fnv", - "futures 0.3.18", - "http", - "jsonrpsee-types", - "log", - "pin-project 1.0.8", - "rustls-native-certs", - "serde", + "futures-channel", + "futures-util", + "jsonrpsee-core 0.14.0", + "jsonrpsee-types 0.14.0", "serde_json", "soketto", - "thiserror", "tokio", - "tokio-rustls", + "tokio-stream", "tokio-util", + "tracing", ] [[package]] -name = "keccak" -version = "0.1.0" +name = "k256" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" +checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d" +dependencies = [ + "cfg-if 1.0.0", + "ecdsa", + "elliptic-curve", + "sec1", +] [[package]] -name = "kernel32-sys" -version = "0.2.2" +name = "keccak" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] +checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" [[package]] name = "kusama-runtime" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "beefy-primitives", "bitvec", - "frame-benchmarking", "frame-election-provider-support", "frame-executive", "frame-support", "frame-system", - "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal", + "kusama-runtime-constants", "log", "pallet-authority-discovery", "pallet-authorship", @@ -3457,6 +3692,7 @@ dependencies = [ "pallet-bags-list", "pallet-balances", "pallet-bounties", + "pallet-child-bounties", "pallet-collective", "pallet-democracy", "pallet-election-provider-multi-phase", @@ -3467,16 +3703,14 @@ dependencies = [ "pallet-im-online", "pallet-indices", "pallet-membership", - "pallet-mmr-primitives", "pallet-multisig", - "pallet-nicks", + "pallet-nomination-pools", "pallet-offences", - "pallet-offences-benchmarking", + "pallet-preimage", "pallet-proxy", "pallet-recovery", "pallet-scheduler", "pallet-session", - "pallet-session-benchmarking", "pallet-society", "pallet-staking", "pallet-staking-reward-fn", @@ -3505,6 +3739,7 @@ dependencies = [ "sp-core", "sp-inherents", "sp-io", + "sp-mmr-primitives", "sp-npos-elections", "sp-offchain", "sp-runtime", @@ -3520,6 +3755,18 @@ dependencies = [ "xcm-executor", ] +[[package]] +name = "kusama-runtime-constants" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" +dependencies = [ + "frame-support", + "polkadot-primitives", + "polkadot-runtime-common", + "smallvec", + "sp-runtime", +] + [[package]] name = "kv-log-macro" version = "1.0.7" @@ -3531,9 +3778,9 @@ dependencies = [ [[package]] name = "kvdb" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a3f58dc069ec0e205a27f5b45920722a46faed802a0541538241af6228f512" +checksum = "a301d8ecb7989d4a6e2c57a49baca77d353bdbf879909debe3f375fe25d61f86" dependencies = [ "parity-util-mem", "smallvec", @@ -3541,20 +3788,20 @@ dependencies = [ [[package]] name = "kvdb-memorydb" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3b6b85fc643f5acd0bffb2cc8a6d150209379267af0d41db72170021841f9f5" +checksum = "ece7e668abd21387aeb6628130a6f4c802787f014fa46bc83221448322250357" dependencies = [ "kvdb", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.1", ] [[package]] name = "kvdb-rocksdb" -version = "0.14.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1b6ea8f2536f504b645ad78419c8246550e19d2c3419a167080ce08edee35a" +checksum = "ca7fbdfd71cd663dceb0faf3367a99f8cf724514933e9867cec4995b6027cbc1" dependencies = [ "fs-swap", "kvdb", @@ -3562,7 +3809,7 @@ dependencies = [ "num_cpus", "owning_ref", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "regex", "rocksdb", "smallvec", @@ -3582,9 +3829,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.111" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e167738f1866a7ec625567bae89ca0d44477232a4f7c52b1c7f2adc2c98804f" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" [[package]] name = "libloading" @@ -3593,35 +3840,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" dependencies = [ "cc", - "winapi 0.3.9", + "winapi", ] [[package]] name = "libloading" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe203d669ec979b7128619bae5a63b7b42e9203c1b29146079ee05e2f604b52" +checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" dependencies = [ "cfg-if 1.0.0", - "winapi 0.3.9", + "winapi", ] [[package]] name = "libm" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" +checksum = "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db" [[package]] name = "libp2p" -version = "0.40.0" +version = "0.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bec54343492ba5940a6c555e512c6721139835d28c59bc22febece72dfd0d9d" +checksum = "81327106887e42d004fbdab1fef93675be2e2e07c1b95fce45e2cc813485611d" dependencies = [ - "atomic", - "bytes 1.1.0", - "futures 0.3.18", + "bytes", + "futures 0.3.21", + "futures-timer", + "getrandom 0.2.7", + "instant", "lazy_static", + "libp2p-autonat", "libp2p-core", "libp2p-deflate", "libp2p-dns", @@ -3647,80 +3897,101 @@ dependencies = [ "libp2p-websocket", "libp2p-yamux", "multiaddr", - "parking_lot 0.11.2", - "pin-project 1.0.8", + "parking_lot 0.12.1", + "pin-project", + "rand 0.7.3", "smallvec", - "wasm-timer", +] + +[[package]] +name = "libp2p-autonat" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4decc51f3573653a9f4ecacb31b1b922dd20c25a6322bb15318ec04287ec46f9" +dependencies = [ + "async-trait", + "futures 0.3.21", + "futures-timer", + "instant", + "libp2p-core", + "libp2p-request-response", + "libp2p-swarm", + "log", + "prost", + "prost-build", + "rand 0.8.5", ] [[package]] name = "libp2p-core" -version = "0.30.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef22d9bba1e8bcb7ec300073e6802943fe8abb8190431842262b5f1c30abba1" +checksum = "fbf9b94cefab7599b2d3dff2f93bee218c6621d68590b23ede4485813cbcece6" dependencies = [ "asn1_der", "bs58", "ed25519-dalek", "either", "fnv", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.21", + "futures-timer", + "instant", "lazy_static", "libsecp256k1", "log", "multiaddr", - "multihash 0.14.0", + "multihash", "multistream-select", - "parking_lot 0.11.2", - "pin-project 1.0.8", + "parking_lot 0.12.1", + "pin-project", "prost", "prost-build", - "rand 0.8.4", + "rand 0.8.5", "ring", "rw-stream-sink", - "sha2 0.9.8", + "sha2 0.10.2", "smallvec", "thiserror", - "unsigned-varint 0.7.1", + "unsigned-varint", "void", "zeroize", ] [[package]] name = "libp2p-deflate" -version = "0.30.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51a800adb195f33de63f4b17b63fe64cfc23bf2c6a0d3d0d5321328664e65197" +checksum = "d0183dc2a3da1fbbf85e5b6cf51217f55b14f5daea0c455a9536eef646bfec71" dependencies = [ "flate2", - "futures 0.3.18", + "futures 0.3.21", "libp2p-core", ] [[package]] name = "libp2p-dns" -version = "0.30.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb8f89d15cb6e3c5bc22afff7513b11bab7856f2872d3cfba86f7f63a06bc498" +checksum = "6cbf54723250fa5d521383be789bf60efdabe6bacfb443f87da261019a49b4b5" dependencies = [ "async-std-resolver", - "futures 0.3.18", + "futures 0.3.21", "libp2p-core", "log", + "parking_lot 0.12.1", "smallvec", "trust-dns-resolver", ] [[package]] name = "libp2p-floodsub" -version = "0.31.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aab3d7210901ea51b7bae2b581aa34521797af8c4ec738c980bda4a06434067f" +checksum = "98a4b6ffd53e355775d24b76f583fdda54b3284806f678499b57913adb94f231" dependencies = [ "cuckoofilter", "fnv", - "futures 0.3.18", + "futures 0.3.21", "libp2p-core", "libp2p-swarm", "log", @@ -3732,142 +4003,152 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.33.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfeead619eb5dac46e65acc78c535a60aaec803d1428cca6407c3a4fc74d698d" +checksum = "74b4b888cfbeb1f5551acd3aa1366e01bf88ede26cc3c4645d0d2d004d5ca7b0" dependencies = [ - "asynchronous-codec 0.6.0", + "asynchronous-codec", "base64", "byteorder", - "bytes 1.1.0", + "bytes", "fnv", - "futures 0.3.18", + "futures 0.3.21", "hex_fmt", + "instant", "libp2p-core", "libp2p-swarm", "log", + "prometheus-client", "prost", "prost-build", "rand 0.7.3", "regex", - "sha2 0.9.8", + "sha2 0.10.2", "smallvec", - "unsigned-varint 0.7.1", + "unsigned-varint", "wasm-timer", ] [[package]] name = "libp2p-identify" -version = "0.31.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cca1275574183f288ff8b72d535d5ffa5ea9292ef7829af8b47dcb197c7b0dcd" +checksum = "c50b585518f8efd06f93ac2f976bd672e17cdac794644b3117edd078e96bda06" dependencies = [ - "futures 0.3.18", + "asynchronous-codec", + "futures 0.3.21", + "futures-timer", "libp2p-core", "libp2p-swarm", "log", - "lru 0.6.6", + "lru 0.7.7", "prost", "prost-build", + "prost-codec", "smallvec", - "wasm-timer", + "thiserror", + "void", ] [[package]] name = "libp2p-kad" -version = "0.32.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2297dc0ca285f3a09d1368bde02449e539b46f94d32d53233f53f6625bcd3ba" +checksum = "740862893bb5f06ac24acc9d49bdeadc3a5e52e51818a30a25c1f3519da2c851" dependencies = [ - "arrayvec 0.5.2", - "asynchronous-codec 0.6.0", - "bytes 1.1.0", + "arrayvec 0.7.2", + "asynchronous-codec", + "bytes", "either", "fnv", - "futures 0.3.18", + "futures 0.3.21", + "futures-timer", + "instant", "libp2p-core", "libp2p-swarm", "log", "prost", "prost-build", "rand 0.7.3", - "sha2 0.9.8", + "sha2 0.10.2", "smallvec", + "thiserror", "uint", - "unsigned-varint 0.7.1", + "unsigned-varint", "void", - "wasm-timer", ] [[package]] name = "libp2p-mdns" -version = "0.32.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c864b64bdc8a84ff3910a0df88e6535f256191a450870f1e7e10cbf8e64d45" +checksum = "66e5e5919509603281033fd16306c61df7a4428ce274b67af5e14b07de5cdcb2" dependencies = [ "async-io", "data-encoding", "dns-parser", - "futures 0.3.18", + "futures 0.3.21", "if-watch", "lazy_static", "libp2p-core", "libp2p-swarm", "log", - "rand 0.8.4", + "rand 0.8.5", "smallvec", - "socket2 0.4.2", + "socket2", "void", ] [[package]] name = "libp2p-metrics" -version = "0.1.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4af432fcdd2f8ba4579b846489f8f0812cfd738ced2c0af39df9b1c48bbb6ab2" +checksum = "ef8aff4a1abef42328fbb30b17c853fff9be986dc39af17ee39f9c5f755c5e0c" dependencies = [ "libp2p-core", + "libp2p-gossipsub", "libp2p-identify", "libp2p-kad", "libp2p-ping", + "libp2p-relay", "libp2p-swarm", - "open-metrics-client", + "prometheus-client", ] [[package]] name = "libp2p-mplex" -version = "0.30.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2cd64ef597f40e14bfce0497f50ecb63dd6d201c61796daeb4227078834fbf" +checksum = "61fd1b20638ec209c5075dfb2e8ce6a7ea4ec3cd3ad7b77f7a477c06d53322e2" dependencies = [ - "asynchronous-codec 0.6.0", - "bytes 1.1.0", - "futures 0.3.18", + "asynchronous-codec", + "bytes", + "futures 0.3.21", "libp2p-core", "log", "nohash-hasher", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "rand 0.7.3", "smallvec", - "unsigned-varint 0.7.1", + "unsigned-varint", ] [[package]] name = "libp2p-noise" -version = "0.33.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8772c7a99088221bb7ca9c5c0574bf55046a7ab4c319f3619b275f28c8fb87a" +checksum = "762408cb5d84b49a600422d7f9a42c18012d8da6ebcd570f9a4a4290ba41fb6f" dependencies = [ - "bytes 1.1.0", + "bytes", "curve25519-dalek 3.2.0", - "futures 0.3.18", + "futures 0.3.21", "lazy_static", "libp2p-core", "log", "prost", "prost-build", - "rand 0.8.4", - "sha2 0.9.8", + "rand 0.8.5", + "sha2 0.10.2", "snow", "static_assertions", "x25519-dalek", @@ -3876,33 +4157,34 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.31.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80ef7b0ec5cf06530d9eb6cf59ae49d46a2c45663bde31c25a12f682664adbcf" +checksum = "100a6934ae1dbf8a693a4e7dd1d730fd60b774dafc45688ed63b554497c6c925" dependencies = [ - "futures 0.3.18", + "futures 0.3.21", + "futures-timer", + "instant", "libp2p-core", "libp2p-swarm", "log", "rand 0.7.3", "void", - "wasm-timer", ] [[package]] name = "libp2p-plaintext" -version = "0.30.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fba1a6ff33e4a274c89a3b1d78b9f34f32af13265cc5c46c16938262d4e945a" +checksum = "be27bf0820a6238a4e06365b096d428271cce85a129cf16f2fe9eb1610c4df86" dependencies = [ - "asynchronous-codec 0.6.0", - "bytes 1.1.0", - "futures 0.3.18", + "asynchronous-codec", + "bytes", + "futures 0.3.21", "libp2p-core", "log", "prost", "prost-build", - "unsigned-varint 0.7.1", + "unsigned-varint", "void", ] @@ -3912,99 +4194,106 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f1a458bbda880107b5b36fcb9b5a1ef0c329685da0e203ed692a8ebe64cc92c" dependencies = [ - "futures 0.3.18", + "futures 0.3.21", "log", - "pin-project 1.0.8", + "pin-project", "rand 0.7.3", "salsa20", - "sha3", + "sha3 0.9.1", ] [[package]] name = "libp2p-relay" -version = "0.4.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2852b61c90fa8ce3c8fcc2aba76e6cefc20d648f9df29157d6b3a916278ef3e3" +checksum = "4931547ee0cce03971ccc1733ff05bb0c4349fd89120a39e9861e2bbe18843c3" dependencies = [ - "asynchronous-codec 0.6.0", - "bytes 1.1.0", - "futures 0.3.18", - "futures-timer 3.0.2", + "asynchronous-codec", + "bytes", + "either", + "futures 0.3.21", + "futures-timer", + "instant", "libp2p-core", "libp2p-swarm", "log", - "pin-project 1.0.8", + "pin-project", "prost", "prost-build", - "rand 0.7.3", + "prost-codec", + "rand 0.8.5", "smallvec", - "unsigned-varint 0.7.1", + "static_assertions", + "thiserror", "void", - "wasm-timer", ] [[package]] name = "libp2p-rendezvous" -version = "0.1.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14a6d2b9e7677eff61dc3d2854876aaf3976d84a01ef6664b610c77a0c9407c5" +checksum = "9511c9672ba33284838e349623319c8cad2d18cfad243ae46c6b7e8a2982ea4e" dependencies = [ - "asynchronous-codec 0.6.0", + "asynchronous-codec", "bimap", - "futures 0.3.18", + "futures 0.3.21", + "futures-timer", + "instant", "libp2p-core", "libp2p-swarm", "log", "prost", "prost-build", - "rand 0.8.4", - "sha2 0.9.8", + "rand 0.8.5", + "sha2 0.10.2", "thiserror", - "unsigned-varint 0.7.1", + "unsigned-varint", "void", - "wasm-timer", ] [[package]] name = "libp2p-request-response" -version = "0.13.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a877a4ced6d46bf84677e1974e8cf61fb434af73b2e96fb48d6cb6223a4634d8" +checksum = "508a189e2795d892c8f5c1fa1e9e0b1845d32d7b0b249dbf7b05b18811361843" dependencies = [ "async-trait", - "bytes 1.1.0", - "futures 0.3.18", + "bytes", + "futures 0.3.21", + "instant", "libp2p-core", "libp2p-swarm", "log", - "lru 0.7.0", "rand 0.7.3", "smallvec", - "unsigned-varint 0.7.1", - "wasm-timer", + "unsigned-varint", ] [[package]] name = "libp2p-swarm" -version = "0.31.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f5184a508f223bc100a12665517773fb8730e9f36fc09eefb670bf01b107ae9" +checksum = "95ac5be6c2de2d1ff3f7693fda6faf8a827b1f3e808202277783fea9f527d114" dependencies = [ "either", - "futures 0.3.18", + "fnv", + "futures 0.3.21", + "futures-timer", + "instant", "libp2p-core", "log", + "pin-project", "rand 0.7.3", "smallvec", + "thiserror", "void", - "wasm-timer", ] [[package]] name = "libp2p-swarm-derive" -version = "0.25.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "072c290f727d39bdc4e9d6d1c847978693d25a673bd757813681e33e5f6c00c2" +checksum = "9f54a64b6957249e0ce782f8abf41d97f69330d02bf229f0672d864f0650cc76" dependencies = [ "quote", "syn", @@ -4012,40 +4301,40 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.30.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7399c5b6361ef525d41c11fcf51635724f832baf5819b30d3d873eabb4fbae4b" +checksum = "8a6771dc19aa3c65d6af9a8c65222bfc8fcd446630ddca487acd161fa6096f3b" dependencies = [ "async-io", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.21", + "futures-timer", "if-watch", "ipnet", "libc", "libp2p-core", "log", - "socket2 0.4.2", + "socket2", ] [[package]] name = "libp2p-uds" -version = "0.30.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8b7563e46218165dfd60f64b96f7ce84590d75f53ecbdc74a7dd01450dc5973" +checksum = "d125e3e5f0d58f3c6ac21815b20cf4b6a88b8db9dc26368ea821838f4161fd4d" dependencies = [ "async-std", - "futures 0.3.18", + "futures 0.3.21", "libp2p-core", "log", ] [[package]] name = "libp2p-wasm-ext" -version = "0.30.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1008a302b73c5020251f9708c653f5ed08368e530e247cc9cd2f109ff30042cf" +checksum = "ec894790eec3c1608f8d1a8a0bdf0dbeb79ed4de2dce964222011c2896dfa05a" dependencies = [ - "futures 0.3.18", + "futures 0.3.21", "js-sys", "libp2p-core", "parity-send-wrapper", @@ -4055,15 +4344,16 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.31.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e12df82d1ed64969371a9e65ea92b91064658604cc2576c2757f18ead9a1cf" +checksum = "9808e57e81be76ff841c106b4c5974fb4d41a233a7bdd2afbf1687ac6def3818" dependencies = [ "either", - "futures 0.3.18", + "futures 0.3.21", "futures-rustls", "libp2p-core", "log", + "parking_lot 0.12.1", "quicksink", "rw-stream-sink", "soketto", @@ -4073,27 +4363,30 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.34.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7362abb8867d7187e7e93df17f460d554c997fc5c8ac57dc1259057f6889af" +checksum = "c6dea686217a06072033dc025631932810e2f6ad784e4fafa42e27d311c7a81c" dependencies = [ - "futures 0.3.18", + "futures 0.3.21", "libp2p-core", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "thiserror", "yamux", ] [[package]] name = "librocksdb-sys" -version = "6.20.3" +version = "0.6.1+6.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c309a9d2470844aceb9a4a098cf5286154d20596868b75a6b36357d2bb9ca25d" +checksum = "81bc587013734dadb7cf23468e531aa120788b87243648be42e2d3a072186291" dependencies = [ "bindgen", + "bzip2-sys", "cc", "glob", "libc", + "libz-sys", + "tikv-jemalloc-sys", ] [[package]] @@ -4109,9 +4402,9 @@ dependencies = [ "libsecp256k1-core", "libsecp256k1-gen-ecmult", "libsecp256k1-gen-genmult", - "rand 0.8.4", + "rand 0.8.5", "serde", - "sha2 0.9.8", + "sha2 0.9.9", "typenum", ] @@ -4146,9 +4439,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.3" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" +checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" dependencies = [ "cc", "pkg-config", @@ -4157,9 +4450,9 @@ dependencies = [ [[package]] name = "linked-hash-map" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linked_hash_set" @@ -4182,33 +4475,31 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.0.28" +version = "0.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "687387ff42ec7ea4f2149035a5675fedb675d26f98db90a1846ac63d3addb5f5" +checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7" [[package]] -name = "lock_api" -version = "0.3.4" +name = "linux-raw-sys" +version = "0.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" -dependencies = [ - "scopeguard", -] +checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" [[package]] name = "lock_api" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" dependencies = [ + "autocfg", "scopeguard", ] [[package]] name = "log" -version = "0.4.14" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if 1.0.0", "value-bag", @@ -4220,16 +4511,16 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ea2d928b485416e8908cff2d97d621db22b27f7b3b6729e438bcf42c671ba91" dependencies = [ - "hashbrown", + "hashbrown 0.11.2", ] [[package]] name = "lru" -version = "0.7.0" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c748cfe47cb8da225c37595b3108bea1c198c84aaae8ea0ba76d01dda9fc803" +checksum = "c84e6fe5655adc6ce00787cf7dcaf8dc4f998a0565d23eafc207a8b08ca3349a" dependencies = [ - "hashbrown", + "hashbrown 0.11.2", ] [[package]] @@ -4243,9 +4534,9 @@ dependencies = [ [[package]] name = "lz4" -version = "1.23.2" +version = "1.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac20ed6991e01bf6a2e68cc73df2b389707403662a8ba89f68511fb340f724c" +checksum = "4edcb94251b1c375c459e5abe9fb0168c1c826c3370172684844f8f3f8d1a885" dependencies = [ "libc", "lz4-sys", @@ -4253,9 +4544,9 @@ dependencies = [ [[package]] name = "lz4-sys" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dca79aa95d8b3226213ad454d328369853be3a1382d89532a854f4d69640acae" +checksum = "d7be8908e2ed6f31c02db8a9fa962f03e36c53fbfde437363eae3306b85d7e17" dependencies = [ "cc", "libc", @@ -4308,9 +4599,18 @@ dependencies = [ [[package]] name = "memchr" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memfd" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6627dc657574b49d6ad27105ed671822be56e0d2547d413bfbf3e8d8fa92e7a" +dependencies = [ + "libc", +] [[package]] name = "memmap2" @@ -4323,9 +4623,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.5.0" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4647a11b578fead29cdbb34d4adef8dd3dc35b876c9c6d5240d83f205abfe96e" +checksum = "3a79b39c93a7a5a27eeaf9a23b5ff43f1b9e0ad6b1cdd441140ae53c35613fc7" dependencies = [ "libc", ] @@ -4341,12 +4641,12 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de006e09d04fc301a5f7e817b75aa49801c4479a8af753764416b085337ddcc5" +checksum = "6566c70c1016f525ced45d7b7f97730a2bafb037c788211d0c186ef5b2189f0a" dependencies = [ "hash-db", - "hashbrown", + "hashbrown 0.12.2", "parity-util-mem", ] @@ -4377,26 +4677,14 @@ dependencies = [ "zeroize", ] -[[package]] -name = "metered-channel" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" -dependencies = [ - "derive_more", - "futures 0.3.18", - "futures-timer 3.0.2", - "thiserror", - "tracing", -] - [[package]] name = "mick-jaeger" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaa77fad8461bb1e0d01be11299e24c6e544007715ed442bfec29f165dc487ae" +checksum = "69672161530e8aeca1d1400fbf3f1a1747ff60ea604265a4e906c2442df20532" dependencies = [ - "futures 0.3.18", - "rand 0.7.3", + "futures 0.3.21", + "rand 0.8.5", "thrift", ] @@ -4408,77 +4696,23 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.4.4" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" dependencies = [ "adler", - "autocfg", -] - -[[package]] -name = "mio" -version = "0.6.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log", - "miow 0.2.2", - "net2", - "slab", - "winapi 0.2.8", ] [[package]] name = "mio" -version = "0.7.14" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" dependencies = [ "libc", "log", - "miow 0.3.7", - "ntapi", - "winapi 0.3.9", -] - -[[package]] -name = "mio-extras" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" -dependencies = [ - "lazycell", - "log", - "mio 0.6.23", - "slab", -] - -[[package]] -name = "miow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi 0.3.9", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys", ] [[package]] @@ -4489,27 +4723,27 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" [[package]] name = "multiaddr" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ee4ea82141951ac6379f964f71b20876d43712bea8faf6dd1a375e08a46499" +checksum = "3c580bfdd8803cce319b047d239559a22f809094aaea4ac13902a1fdcfcd4261" dependencies = [ "arrayref", "bs58", "byteorder", "data-encoding", - "multihash 0.14.0", + "multihash", "percent-encoding 2.1.0", "serde", "static_assertions", - "unsigned-varint 0.7.1", + "unsigned-varint", "url 2.2.2", ] [[package]] name = "multibase" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b78c60039650ff12e140ae867ef5299a58e19dded4d334c849dc7177083667e2" +checksum = "9b3539ec3c1f04ac9748a260728e855f261b4977f5c3406612c884564f329404" dependencies = [ "base-x", "data-encoding", @@ -4518,41 +4752,28 @@ dependencies = [ [[package]] name = "multihash" -version = "0.13.2" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dac63698b887d2d929306ea48b63760431ff8a24fac40ddb22f9c7f49fb7cab" +checksum = "e3db354f401db558759dfc1e568d010a5d4146f4d3f637be1275ec4a3cf09689" dependencies = [ "blake2b_simd", "blake2s_simd", "blake3", - "digest 0.9.0", - "generic-array 0.14.4", + "core2", + "digest 0.10.3", "multihash-derive", - "sha2 0.9.8", - "sha3", - "unsigned-varint 0.5.1", -] - -[[package]] -name = "multihash" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "752a61cd890ff691b4411423d23816d5866dd5621e4d1c5687a53b94b5a979d8" -dependencies = [ - "digest 0.9.0", - "generic-array 0.14.4", - "multihash-derive", - "sha2 0.9.8", - "unsigned-varint 0.7.1", + "sha2 0.10.2", + "sha3 0.10.1", + "unsigned-varint", ] [[package]] name = "multihash-derive" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "424f6e86263cd5294cbd7f1e95746b95aca0e0d66bff31e5a40d6baa87b4aa99" +checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro-error", "proc-macro2", "quote", @@ -4568,16 +4789,16 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multistream-select" -version = "0.10.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56a336acba8bc87c8876f6425407dbbe6c417bf478b22015f8fb0994ef3bc0ab" +checksum = "363a84be6453a70e63513660f4894ef815daf88e3356bffcda9ca27d810ce83b" dependencies = [ - "bytes 1.1.0", - "futures 0.3.18", + "bytes", + "futures 0.3.21", "log", - "pin-project 1.0.8", + "pin-project", "smallvec", - "unsigned-varint 0.7.1", + "unsigned-varint", ] [[package]] @@ -4590,9 +4811,9 @@ dependencies = [ "matrixmultiply", "nalgebra-macros", "num-complex", - "num-rational 0.4.0", + "num-rational 0.4.1", "num-traits", - "rand 0.8.4", + "rand 0.8.5", "rand_distr", "simba", "typenum", @@ -4611,28 +4832,100 @@ dependencies = [ [[package]] name = "names" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7d66043b25d4a6cccb23619d10c19c25304b355a7dccd4a8e11423dd2382146" +dependencies = [ + "rand 0.8.5", +] + +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" + +[[package]] +name = "netlink-packet-core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345b8ab5bd4e71a2986663e88c56856699d060e78e152e6e9d7966fcd5491297" +dependencies = [ + "anyhow", + "byteorder", + "libc", + "netlink-packet-utils", +] + +[[package]] +name = "netlink-packet-route" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a8690bf09abf659851e58cd666c3d37ac6af07c2bd7a9e332cfba471715775" +checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab" dependencies = [ - "rand 0.8.4", + "anyhow", + "bitflags", + "byteorder", + "libc", + "netlink-packet-core", + "netlink-packet-utils", +] + +[[package]] +name = "netlink-packet-utils" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25af9cf0dc55498b7bd94a1508af7a78706aa0ab715a73c5169273e03c84845e" +dependencies = [ + "anyhow", + "byteorder", + "paste", + "thiserror", +] + +[[package]] +name = "netlink-proto" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65b4b14489ab424703c092062176d52ba55485a89c076b4f9db05092b7223aa6" +dependencies = [ + "bytes", + "futures 0.3.21", + "log", + "netlink-packet-core", + "netlink-sys", + "thiserror", + "tokio", +] + +[[package]] +name = "netlink-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92b654097027250401127914afb37cb1f311df6610a9891ff07a757e94199027" +dependencies = [ + "async-io", + "bytes", + "futures 0.3.21", + "libc", + "log", ] [[package]] -name = "net2" -version = "0.2.37" +name = "nix" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9" dependencies = [ - "cfg-if 0.1.10", + "bitflags", + "cfg-if 1.0.0", "libc", - "winapi 0.3.9", ] [[package]] name = "node-executor" version = "3.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "node-primitives", @@ -4643,13 +4936,14 @@ dependencies = [ "sp-core", "sp-keystore", "sp-state-machine", + "sp-tracing", "sp-trie", ] [[package]] name = "node-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-system", "parity-scale-codec", @@ -4662,7 +4956,7 @@ dependencies = [ [[package]] name = "node-runtime" version = "3.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4673,7 +4967,8 @@ dependencies = [ "frame-try-runtime", "log", "node-primitives", - "pallet-asset-tx-payment 4.0.0-dev", + "pallet-alliance", + "pallet-asset-tx-payment", "pallet-assets", "pallet-authority-discovery", "pallet-authorship", @@ -4681,10 +4976,12 @@ dependencies = [ "pallet-bags-list", "pallet-balances", "pallet-bounties", + "pallet-child-bounties", "pallet-collective", "pallet-contracts", "pallet-contracts-primitives", "pallet-contracts-rpc-runtime-api", + "pallet-conviction-voting", "pallet-democracy", "pallet-election-provider-multi-phase", "pallet-elections-phragmen", @@ -4697,15 +4994,21 @@ dependencies = [ "pallet-membership", "pallet-mmr", "pallet-multisig", + "pallet-nomination-pools", "pallet-offences", + "pallet-preimage", "pallet-proxy", "pallet-randomness-collective-flip", + "pallet-ranked-collective", "pallet-recovery", + "pallet-referenda", + "pallet-remark", "pallet-scheduler", "pallet-session", "pallet-society", "pallet-staking", "pallet-staking-reward-curve", + "pallet-state-trie-migration", "pallet-sudo", "pallet-timestamp", "pallet-tips", @@ -4716,6 +5019,7 @@ dependencies = [ "pallet-uniques", "pallet-utility", "pallet-vesting", + "pallet-whitelist", "parity-scale-codec", "scale-info", "sp-api", @@ -4725,11 +5029,9 @@ dependencies = [ "sp-core", "sp-inherents", "sp-io", - "sp-keyring 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13)", - "sp-npos-elections", "sp-offchain", "sp-runtime", - "sp-sandbox", + "sp-sandbox 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26)", "sp-session", "sp-staking", "sp-std", @@ -4753,22 +5055,12 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[package]] name = "nom" -version = "7.1.0" +version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109" +checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" dependencies = [ "memchr", "minimal-lexical", - "version_check", -] - -[[package]] -name = "ntapi" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" -dependencies = [ - "winapi 0.3.9", ] [[package]] @@ -4784,18 +5076,28 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085" +checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19" dependencies = [ "num-traits", ] +[[package]] +name = "num-format" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bafe4179722c2894288ee77a9f044f02811c86af699344c498b0840c698a2465" +dependencies = [ + "arrayvec 0.4.12", + "itoa 0.4.8", +] + [[package]] name = "num-integer" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", "num-traits", @@ -4815,9 +5117,9 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", "num-integer", @@ -4826,9 +5128,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", "libm", @@ -4836,9 +5138,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" dependencies = [ "hermit-abi", "libc", @@ -4846,20 +5148,30 @@ dependencies = [ [[package]] name = "object" -version = "0.27.1" +version = "0.28.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" +checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" dependencies = [ "crc32fast", + "hashbrown 0.11.2", "indexmap", "memchr", ] +[[package]] +name = "object" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +dependencies = [ + "memchr", +] + [[package]] name = "once_cell" -version = "1.8.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" +checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" [[package]] name = "opaque-debug" @@ -4874,34 +5186,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] -name = "open-metrics-client" -version = "0.12.0" +name = "openssl-probe" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7337d80c23c2d8b1349563981bc4fb531220733743ba8115454a67b181173f0d" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "orchestra" +version = "0.0.1" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "dtoa", - "itoa", - "open-metrics-client-derive-text-encode", - "owning_ref", + "async-trait", + "dyn-clonable", + "futures 0.3.21", + "futures-timer", + "orchestra-proc-macro", + "pin-project", + "prioritized-metered-channel", + "thiserror", + "tracing", ] [[package]] -name = "open-metrics-client-derive-text-encode" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c83b586f00268c619c1cb3340ec1a6f59dd9ba1d9833a273a68e6d5cd8ffc" +name = "orchestra-proc-macro" +version = "0.0.1" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ + "expander 0.0.6", + "itertools", + "petgraph", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn", ] -[[package]] -name = "openssl-probe" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" - [[package]] name = "ordered-float" version = "1.1.1" @@ -4914,15 +5233,33 @@ dependencies = [ [[package]] name = "orml-currencies" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=1f520348f31b5e94b8a5dd7f8e6b8ec359df4177#1f520348f31b5e94b8a5dd7f8e6b8ec359df4177" +source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=33dbc5e35305d0cf5937c896dae8655ca7da95d8#33dbc5e35305d0cf5937c896dae8655ca7da95d8" +dependencies = [ + "frame-support", + "frame-system", + "orml-traits", + "orml-utilities 0.4.1-dev (git+https://github.com/open-web3-stack//open-runtime-module-library?rev=33dbc5e35305d0cf5937c896dae8655ca7da95d8)", + "parity-scale-codec", + "scale-info", + "serde", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "orml-oracle" +version = "0.4.1-dev" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8" dependencies = [ "frame-support", "frame-system", "orml-traits", - "orml-utilities", + "orml-utilities 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.26)", "parity-scale-codec", "scale-info", "serde", + "sp-application-crypto", "sp-io", "sp-runtime", "sp-std", @@ -4931,7 +5268,7 @@ dependencies = [ [[package]] name = "orml-tokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=1f520348f31b5e94b8a5dd7f8e6b8ec359df4177#1f520348f31b5e94b8a5dd7f8e6b8ec359df4177" +source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=33dbc5e35305d0cf5937c896dae8655ca7da95d8#33dbc5e35305d0cf5937c896dae8655ca7da95d8" dependencies = [ "frame-support", "frame-system", @@ -4946,12 +5283,12 @@ dependencies = [ [[package]] name = "orml-traits" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=1f520348f31b5e94b8a5dd7f8e6b8ec359df4177#1f520348f31b5e94b8a5dd7f8e6b8ec359df4177" +source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=33dbc5e35305d0cf5937c896dae8655ca7da95d8#33dbc5e35305d0cf5937c896dae8655ca7da95d8" dependencies = [ "frame-support", "impl-trait-for-tuples", "num-traits", - "orml-utilities", + "orml-utilities 0.4.1-dev (git+https://github.com/open-web3-stack//open-runtime-module-library?rev=33dbc5e35305d0cf5937c896dae8655ca7da95d8)", "parity-scale-codec", "scale-info", "serde", @@ -4964,7 +5301,7 @@ dependencies = [ [[package]] name = "orml-unknown-tokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=1f520348f31b5e94b8a5dd7f8e6b8ec359df4177#1f520348f31b5e94b8a5dd7f8e6b8ec359df4177" +source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=33dbc5e35305d0cf5937c896dae8655ca7da95d8#33dbc5e35305d0cf5937c896dae8655ca7da95d8" dependencies = [ "frame-support", "frame-system", @@ -4979,7 +5316,21 @@ dependencies = [ [[package]] name = "orml-utilities" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=1f520348f31b5e94b8a5dd7f8e6b8ec359df4177#1f520348f31b5e94b8a5dd7f8e6b8ec359df4177" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.26#33dbc5e35305d0cf5937c896dae8655ca7da95d8" +dependencies = [ + "frame-support", + "parity-scale-codec", + "scale-info", + "serde", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "orml-utilities" +version = "0.4.1-dev" +source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=33dbc5e35305d0cf5937c896dae8655ca7da95d8#33dbc5e35305d0cf5937c896dae8655ca7da95d8" dependencies = [ "frame-support", "parity-scale-codec", @@ -4993,7 +5344,7 @@ dependencies = [ [[package]] name = "orml-xcm-support" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=1f520348f31b5e94b8a5dd7f8e6b8ec359df4177#1f520348f31b5e94b8a5dd7f8e6b8ec359df4177" +source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=33dbc5e35305d0cf5937c896dae8655ca7da95d8#33dbc5e35305d0cf5937c896dae8655ca7da95d8" dependencies = [ "frame-support", "orml-traits", @@ -5007,13 +5358,14 @@ dependencies = [ [[package]] name = "orml-xtokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=1f520348f31b5e94b8a5dd7f8e6b8ec359df4177#1f520348f31b5e94b8a5dd7f8e6b8ec359df4177" +source = "git+https://github.com/open-web3-stack//open-runtime-module-library?rev=33dbc5e35305d0cf5937c896dae8655ca7da95d8#33dbc5e35305d0cf5937c896dae8655ca7da95d8" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", "orml-traits", "orml-xcm-support", + "pallet-xcm", "parity-scale-codec", "scale-info", "serde", @@ -5024,6 +5376,12 @@ dependencies = [ "xcm-executor", ] +[[package]] +name = "os_str_bytes" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa" + [[package]] name = "owning_ref" version = "0.4.1" @@ -5033,9 +5391,26 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "pallet-alliance" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" +dependencies = [ + "frame-support", + "frame-system", + "log", + "pallet-identity", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-asset-index" -version = "0.0.1" +version = "0.0.2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5043,13 +5418,12 @@ dependencies = [ "orml-tokens", "orml-traits", "pallet-balances", - "pallet-chainlink-feed", "pallet-price-feed", "pallet-saft-registry", "parity-scale-codec", "polkadot-parachain", "primitives", - "rand 0.8.4", + "rand 0.8.5", "scale-info", "serde", "sp-core", @@ -5090,33 +5464,17 @@ dependencies = [ "sp-std", ] -[[package]] -name = "pallet-asset-tx-payment" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.13#0be8e8fc214641e306e4f913dd64ff1913e46e95" -dependencies = [ - "frame-support", - "frame-system", - "pallet-transaction-payment", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", -] - [[package]] name = "pallet-asset-tx-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", "pallet-transaction-payment", "parity-scale-codec", "scale-info", + "serde", "sp-core", "sp-io", "sp-runtime", @@ -5126,7 +5484,7 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5140,7 +5498,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -5156,7 +5514,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -5172,14 +5530,14 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-authorship 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465)", + "sp-authorship 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b)", "sp-runtime", "sp-std", ] @@ -5187,7 +5545,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5211,27 +5569,22 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "frame-benchmarking", "frame-election-provider-support", "frame-support", "frame-system", "log", - "pallet-balances", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", "sp-runtime", "sp-std", - "sp-tracing", ] [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5246,7 +5599,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "beefy-primitives", "frame-support", @@ -5262,18 +5615,16 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "beefy-merkle-tree", "beefy-primitives", "frame-support", "frame-system", "hex", - "libsecp256k1", "log", "pallet-beefy", "pallet-mmr", - "pallet-mmr-primitives", "pallet-session", "parity-scale-codec", "scale-info", @@ -5287,9 +5638,8 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "frame-benchmarking", "frame-support", "frame-system", "log", @@ -5303,79 +5653,19 @@ dependencies = [ ] [[package]] -name = "pallet-bridge-dispatch" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" -dependencies = [ - "bp-message-dispatch", - "bp-runtime", - "frame-support", - "frame-system", - "log", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-bridge-grandpa" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" -dependencies = [ - "bp-header-chain", - "bp-runtime", - "bp-test-utils", - "finality-grandpa", - "frame-support", - "frame-system", - "log", - "num-traits", - "parity-scale-codec", - "scale-info", - "serde", - "sp-finality-grandpa", - "sp-runtime", - "sp-std", - "sp-trie", -] - -[[package]] -name = "pallet-bridge-messages" -version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +name = "pallet-child-bounties" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "bitvec", - "bp-message-dispatch", - "bp-messages", - "bp-rialto", - "bp-runtime", "frame-support", "frame-system", "log", - "num-traits", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "pallet-chainlink-feed" -version = "0.1.0" -source = "git+https://github.com/smartcontractkit/chainlink-polkadot?branch=polkadot-v0.9.13#36deb1a68a5593c2fbd26d48f98004f16e212e2d" -dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", + "pallet-bounties", + "pallet-treasury", "parity-scale-codec", "scale-info", - "serde", - "sp-arithmetic", "sp-core", + "sp-io", "sp-runtime", "sp-std", ] @@ -5383,7 +5673,7 @@ dependencies = [ [[package]] name = "pallet-collator-selection" version = "3.0.0" -source = "git+https://github.com/paritytech//cumulus?rev=0be8e8fc214641e306e4f913dd64ff1913e46e95#0be8e8fc214641e306e4f913dd64ff1913e46e95" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "frame-benchmarking", "frame-support", @@ -5392,7 +5682,7 @@ dependencies = [ "pallet-authorship", "pallet-session", "parity-scale-codec", - "rand 0.7.3", + "rand 0.8.5", "scale-info", "serde", "sp-runtime", @@ -5403,7 +5693,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5419,7 +5709,7 @@ dependencies = [ [[package]] name = "pallet-committee" -version = "0.0.1" +version = "0.0.2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5435,40 +5725,40 @@ dependencies = [ [[package]] name = "pallet-contracts" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "bitflags", "frame-benchmarking", "frame-support", "frame-system", - "libsecp256k1", "log", "pallet-contracts-primitives", "pallet-contracts-proc-macro", "parity-scale-codec", - "pwasm-utils", - "rand 0.8.4", + "rand 0.8.5", "scale-info", "serde", "smallvec", "sp-core", "sp-io", "sp-runtime", - "sp-sandbox", + "sp-sandbox 0.10.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26)", "sp-std", + "wasm-instrument", "wasmi-validation", ] [[package]] name = "pallet-contracts-primitives" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "bitflags", "parity-scale-codec", "scale-info", "serde", "sp-core", + "sp-rpc", "sp-runtime", "sp-std", ] @@ -5476,7 +5766,7 @@ dependencies = [ [[package]] name = "pallet-contracts-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "proc-macro2", "quote", @@ -5486,7 +5776,7 @@ dependencies = [ [[package]] name = "pallet-contracts-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "pallet-contracts-primitives", "parity-scale-codec", @@ -5496,10 +5786,27 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-conviction-voting" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" +dependencies = [ + "assert_matches", + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "serde", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5515,7 +5822,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5532,16 +5839,14 @@ dependencies = [ "sp-runtime", "sp-std", "static_assertions", - "strum", - "strum_macros", + "strum 0.23.0", ] [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "frame-benchmarking", "frame-support", "frame-system", "log", @@ -5557,7 +5862,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5572,7 +5877,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5595,7 +5900,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5611,9 +5916,8 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "frame-benchmarking", "frame-support", "frame-system", "log", @@ -5631,23 +5935,22 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", "scale-info", "sp-core", "sp-io", - "sp-keyring 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465)", + "sp-keyring 6.0.0 (git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b)", "sp-runtime", "sp-std", ] [[package]] name = "pallet-local-treasury" -version = "0.0.1" +version = "0.0.2" dependencies = [ "frame-benchmarking", "frame-support", @@ -5665,7 +5968,7 @@ dependencies = [ [[package]] name = "pallet-lottery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -5678,7 +5981,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5695,146 +5998,170 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", "frame-support", "frame-system", - "pallet-mmr-primitives", "parity-scale-codec", "scale-info", "sp-core", "sp-io", + "sp-mmr-primitives", "sp-runtime", "sp-std", ] [[package]] -name = "pallet-mmr-primitives" +name = "pallet-mmr-rpc" +version = "3.0.0" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" +dependencies = [ + "jsonrpsee 0.14.0", + "parity-scale-codec", + "serde", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-mmr-primitives", + "sp-runtime", +] + +[[package]] +name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" +dependencies = [ + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-nomination-pools" +version = "1.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", "log", "parity-scale-codec", - "serde", - "sp-api", + "scale-info", "sp-core", + "sp-io", "sp-runtime", + "sp-staking", "sp-std", ] [[package]] -name = "pallet-mmr-rpc" -version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +name = "pallet-offences" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "pallet-mmr-primitives", + "frame-support", + "frame-system", + "log", + "pallet-balances", "parity-scale-codec", + "scale-info", "serde", - "sp-api", - "sp-blockchain", - "sp-core", "sp-runtime", + "sp-staking", + "sp-std", ] [[package]] -name = "pallet-multisig" +name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", "scale-info", + "sp-core", "sp-io", "sp-runtime", "sp-std", ] [[package]] -name = "pallet-nicks" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +name = "pallet-price-feed" +version = "0.0.1" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", + "orml-oracle", + "orml-traits", + "pallet-balances", + "pallet-timestamp", "parity-scale-codec", + "primitives", "scale-info", + "serde", + "sp-core", "sp-io", "sp-runtime", - "sp-std", ] [[package]] -name = "pallet-offences" +name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", - "log", - "pallet-balances", "parity-scale-codec", "scale-info", - "serde", + "sp-io", "sp-runtime", - "sp-staking", "sp-std", ] [[package]] -name = "pallet-offences-benchmarking" +name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "frame-benchmarking", - "frame-election-provider-support", "frame-support", "frame-system", - "pallet-babe", - "pallet-balances", - "pallet-grandpa", - "pallet-im-online", - "pallet-offences", - "pallet-session", - "pallet-staking", "parity-scale-codec", + "safe-mix", "scale-info", "sp-runtime", - "sp-staking", "sp-std", ] [[package]] -name = "pallet-price-feed" -version = "0.0.1" +name = "pallet-ranked-collective" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "pallet-balances", - "pallet-chainlink-feed", - "pallet-timestamp", + "log", "parity-scale-codec", - "primitives", "scale-info", - "serde", + "sp-arithmetic", "sp-core", "sp-io", "sp-runtime", + "sp-std", ] [[package]] -name = "pallet-proxy" +name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5847,28 +6174,33 @@ dependencies = [ ] [[package]] -name = "pallet-randomness-collective-flip" +name = "pallet-referenda" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", - "safe-mix", "scale-info", + "serde", + "sp-arithmetic", + "sp-io", "sp-runtime", "sp-std", ] [[package]] -name = "pallet-recovery" +name = "pallet-remark" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "scale-info", + "serde", + "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -5876,7 +6208,7 @@ dependencies = [ [[package]] name = "pallet-remote-asset-manager" -version = "0.0.1" +version = "0.0.2" dependencies = [ "cumulus-pallet-xcm", "cumulus-primitives-core", @@ -5944,7 +6276,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5960,7 +6292,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -5978,26 +6310,10 @@ dependencies = [ "sp-trie", ] -[[package]] -name = "pallet-session-benchmarking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" -dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "pallet-session", - "pallet-staking", - "rand 0.7.3", - "sp-runtime", - "sp-session", - "sp-std", -] - [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -6011,9 +6327,8 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "frame-benchmarking", "frame-election-provider-support", "frame-support", "frame-system", @@ -6021,7 +6336,6 @@ dependencies = [ "pallet-authorship", "pallet-session", "parity-scale-codec", - "rand_chacha 0.2.2", "scale-info", "serde", "sp-application-crypto", @@ -6034,9 +6348,9 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn", @@ -6045,16 +6359,33 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "log", "sp-arithmetic", ] +[[package]] +name = "pallet-state-trie-migration" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", @@ -6068,7 +6399,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6086,9 +6417,8 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "frame-benchmarking", "frame-support", "frame-system", "log", @@ -6105,14 +6435,13 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "scale-info", "serde", - "smallvec", "sp-core", "sp-io", "sp-runtime", @@ -6122,11 +6451,9 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", + "jsonrpsee 0.14.0", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "sp-api", @@ -6139,7 +6466,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -6150,10 +6477,11 @@ dependencies = [ [[package]] name = "pallet-transaction-storage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", + "log", "pallet-balances", "parity-scale-codec", "scale-info", @@ -6162,13 +6490,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "sp-transaction-storage-proof 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13)", + "sp-transaction-storage-proof 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26)", ] [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6185,11 +6513,12 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", "sp-runtime", @@ -6199,7 +6528,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-benchmarking", "frame-support", @@ -6215,9 +6544,8 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "frame-benchmarking", "frame-support", "frame-system", "log", @@ -6228,34 +6556,31 @@ dependencies = [ ] [[package]] -name = "pallet-xcm" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +name = "pallet-whitelist" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-support", "frame-system", - "log", "parity-scale-codec", "scale-info", - "serde", - "sp-core", + "sp-api", "sp-runtime", "sp-std", - "xcm", - "xcm-executor", ] [[package]] -name = "pallet-xcm-benchmarks" -version = "0.9.8" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +name = "pallet-xcm" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "frame-benchmarking", "frame-support", "frame-system", "log", "parity-scale-codec", "scale-info", + "serde", + "sp-core", "sp-runtime", "sp-std", "xcm", @@ -6265,7 +6590,7 @@ dependencies = [ [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=0be8e8fc214641e306e4f913dd64ff1913e46e95#0be8e8fc214641e306e4f913dd64ff1913e46e95" +source = "git+https://github.com/paritytech//cumulus?rev=e43b8b878a6fd0ca8b5e88d19822c4d777d3c677#e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -6277,9 +6602,9 @@ dependencies = [ [[package]] name = "parity-db" -version = "0.3.5" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78a95abf24f1097c6e3181abbbbfc3630b3b5e681470940f719b69acb4911c7f" +checksum = "966eb23bd3a09758b8dac09f82b9d417c00f14e5d46171bf04cffdd9cb2e1eb1" dependencies = [ "blake2-rfc", "crc32fast", @@ -6290,15 +6615,15 @@ dependencies = [ "lz4", "memmap2 0.2.3", "parking_lot 0.11.2", - "rand 0.8.4", + "rand 0.8.5", "snap", ] [[package]] name = "parity-scale-codec" -version = "2.3.1" +version = "3.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" +checksum = "9182e4a71cae089267ab03e67c99368db7cd877baf50f931e5d6d4b71e195ac0" dependencies = [ "arrayvec 0.7.2", "bitvec", @@ -6310,11 +6635,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "2.3.1" +version = "3.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" +checksum = "9299338969a3d2f491d65f140b00ddec470858402f888af98e8642fb5e8965cd" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn", @@ -6326,36 +6651,20 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" -[[package]] -name = "parity-tokio-ipc" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6" -dependencies = [ - "futures 0.3.18", - "libc", - "log", - "rand 0.7.3", - "tokio", - "winapi 0.3.9", -] - [[package]] name = "parity-util-mem" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f4cb4e169446179cbc6b8b6320cc9fca49bd2e94e8db25f25f200a8ea774770" +checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f" dependencies = [ "cfg-if 1.0.0", - "ethereum-types", - "hashbrown", + "hashbrown 0.12.2", "impl-trait-for-tuples", - "lru 0.6.6", "parity-util-mem-derive", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "primitive-types", "smallvec", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -6384,24 +6693,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92" -[[package]] -name = "parity-ws" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5983d3929ad50f12c3eb9a6743f19d691866ecd44da74c0a3308c3f8a56df0c6" -dependencies = [ - "byteorder", - "bytes 0.4.12", - "httparse", - "log", - "mio 0.6.23", - "mio-extras", - "rand 0.7.3", - "sha-1 0.8.2", - "slab", - "url 2.2.2", -] - [[package]] name = "parking" version = "2.0.0" @@ -6410,58 +6701,57 @@ checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" [[package]] name = "parking_lot" -version = "0.10.2" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ - "lock_api 0.3.4", - "parking_lot_core 0.7.2", + "instant", + "lock_api", + "parking_lot_core 0.8.5", ] [[package]] name = "parking_lot" -version = "0.11.2" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ - "instant", - "lock_api 0.4.5", - "parking_lot_core 0.8.5", + "lock_api", + "parking_lot_core 0.9.3", ] [[package]] name = "parking_lot_core" -version = "0.7.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" +checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" dependencies = [ - "cfg-if 0.1.10", - "cloudabi", + "cfg-if 1.0.0", + "instant", "libc", - "redox_syscall 0.1.57", + "redox_syscall", "smallvec", - "winapi 0.3.9", + "winapi", ] [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" dependencies = [ "cfg-if 1.0.0", - "instant", "libc", - "redox_syscall 0.2.10", + "redox_syscall", "smallvec", - "winapi 0.3.9", + "windows-sys", ] [[package]] name = "paste" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" +checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" [[package]] name = "pbkdf2" @@ -6544,9 +6834,9 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" +checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" dependencies = [ "fixedbitset", "indexmap", @@ -6554,38 +6844,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "0.4.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f" -dependencies = [ - "pin-project-internal 0.4.28", -] - -[[package]] -name = "pin-project" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" -dependencies = [ - "pin-project-internal 1.0.8", -] - -[[package]] -name = "pin-project-internal" -version = "0.4.28" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e" +checksum = "78203e83c48cffbe01e4a2d35d566ca4de445d79a85372fc64e378bfc812a260" dependencies = [ - "proc-macro2", - "quote", - "syn", + "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.8" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" +checksum = "710faf75e1b33345361201d36d04e98ac1ed8909151a017ed384700836104c74" dependencies = [ "proc-macro2", "quote", @@ -6600,9 +6870,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pin-utils" @@ -6612,9 +6882,10 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pint" -version = "3.0.0" +version = "4.0.0" dependencies = [ "async-trait", + "clap 3.2.11", "cumulus-client-cli", "cumulus-client-collator", "cumulus-client-consensus-aura", @@ -6625,15 +6896,19 @@ dependencies = [ "cumulus-pallet-parachain-system", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", + "cumulus-relay-chain-inprocess-interface", + "cumulus-relay-chain-interface", + "cumulus-relay-chain-rpc-interface", "derive_more", "dev-runtime", "frame-benchmarking", "frame-benchmarking-cli", "frame-support", "frame-system-rpc-runtime-api", - "futures 0.3.18", + "futures 0.3.21", "hex-literal", "jsonrpc-core", + "jsonrpsee 0.13.1", "log", "node-executor", "pallet-asset-index-rpc", @@ -6674,6 +6949,7 @@ dependencies = [ "sp-consensus-aura", "sp-core", "sp-inherents", + "sp-io", "sp-keystore", "sp-offchain", "sp-runtime", @@ -6686,6 +6962,7 @@ dependencies = [ "substrate-build-script-utils", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", + "try-runtime-cli", "xcm-calls", ] @@ -6694,6 +6971,7 @@ name = "pint-rpc" version = "0.0.1" dependencies = [ "jsonrpc-core", + "jsonrpsee 0.14.0", "pallet-asset-index-rpc", "pallet-transaction-payment-rpc", "parity-scale-codec", @@ -6711,7 +6989,7 @@ dependencies = [ [[package]] name = "pint-runtime" -version = "2.0.0" +version = "4.0.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", @@ -6732,6 +7010,7 @@ dependencies = [ "hex-literal", "log", "orml-currencies", + "orml-oracle", "orml-tokens", "orml-traits", "orml-unknown-tokens", @@ -6739,15 +7018,15 @@ dependencies = [ "orml-xtokens", "pallet-asset-index", "pallet-asset-index-rpc-runtime-api", - "pallet-asset-tx-payment 0.1.0", + "pallet-asset-tx-payment", "pallet-aura", "pallet-authorship", "pallet-balances", - "pallet-chainlink-feed", "pallet-collator-selection", "pallet-collective", "pallet-committee", "pallet-local-treasury", + "pallet-membership", "pallet-price-feed", "pallet-randomness-collective-flip", "pallet-remote-asset-manager", @@ -6790,9 +7069,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" [[package]] name = "platforms" @@ -6802,39 +7081,42 @@ checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" [[package]] name = "polkadot-approval-distribution" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "futures 0.3.18", + "futures 0.3.21", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "tracing", + "rand 0.8.5", + "tracing-gum", ] [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "futures 0.3.18", + "futures 0.3.21", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "tracing", + "rand 0.8.5", + "tracing-gum", ] [[package]] name = "polkadot-availability-distribution" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "derive_more", - "futures 0.3.18", - "lru 0.7.0", + "fatality", + "futures 0.3.21", + "lru 0.7.7", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -6842,20 +7124,21 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand 0.8.4", + "rand 0.8.5", "sp-core", "sp-keystore", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-availability-recovery" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "futures 0.3.18", - "lru 0.7.0", + "fatality", + "futures 0.3.21", + "lru 0.7.7", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -6863,27 +7146,32 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand 0.8.4", + "rand 0.8.5", "sc-network", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-cli" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ + "clap 3.2.11", "frame-benchmarking-cli", - "futures 0.3.18", + "futures 0.3.21", "log", + "polkadot-client", "polkadot-node-core-pvf", + "polkadot-node-metrics", + "polkadot-performance-test", "polkadot-service", "sc-cli", "sc-service", + "sc-sysinfo 6.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26)", + "sc-tracing", "sp-core", "sp-trie", - "structopt", "substrate-build-script-utils", "thiserror", "try-runtime-cli", @@ -6891,16 +7179,21 @@ dependencies = [ [[package]] name = "polkadot-client" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "beefy-primitives", "frame-benchmarking", + "frame-benchmarking-cli", + "frame-system", "frame-system-rpc-runtime-api", - "pallet-mmr-primitives", + "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", + "polkadot-core-primitives", + "polkadot-node-core-parachains-inherent", "polkadot-primitives", "polkadot-runtime", + "polkadot-runtime-common", "sc-client-api", "sc-consensus", "sc-executor", @@ -6911,23 +7204,28 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-consensus-babe", + "sp-core", "sp-finality-grandpa", + "sp-inherents", + "sp-keyring 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26)", + "sp-mmr-primitives", "sp-offchain", "sp-runtime", "sp-session", "sp-storage", + "sp-timestamp", "sp-transaction-pool", ] [[package]] name = "polkadot-collator-protocol" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "always-assert", - "derive_more", - "futures 0.3.18", - "futures-timer 3.0.2", + "fatality", + "futures 0.3.21", + "futures-timer", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -6937,13 +7235,13 @@ dependencies = [ "sp-keystore", "sp-runtime", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-core-primitives" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -6955,12 +7253,13 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "derive_more", - "futures 0.3.18", - "lru 0.7.0", + "fatality", + "futures 0.3.21", + "lru 0.7.7", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -6972,13 +7271,13 @@ dependencies = [ "sp-application-crypto", "sp-keystore", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-erasure-coding" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -6991,33 +7290,35 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.21", + "futures-timer", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand 0.8.4", + "rand 0.8.5", "rand_chacha 0.3.1", "sc-network", "sp-application-crypto", "sp-core", "sp-keystore", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-network-bridge" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ + "always-assert", "async-trait", - "futures 0.3.18", + "bytes", + "futures 0.3.21", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -7025,15 +7326,15 @@ dependencies = [ "polkadot-primitives", "sc-network", "sp-consensus", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-collation-generation" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "futures 0.3.18", + "futures 0.3.21", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-primitives", @@ -7043,20 +7344,20 @@ dependencies = [ "sp-core", "sp-maybe-compressed-blob", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "bitvec", "derive_more", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.21", + "futures-timer", "kvdb", - "lru 0.7.0", + "lru 0.7.7", "merlin", "parity-scale-codec", "polkadot-node-jaeger", @@ -7071,17 +7372,18 @@ dependencies = [ "sp-consensus", "sp-consensus-slots", "sp-runtime", - "tracing", + "thiserror", + "tracing-gum", ] [[package]] name = "polkadot-node-core-av-store" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "bitvec", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.21", + "futures-timer", "kvdb", "parity-scale-codec", "polkadot-erasure-coding", @@ -7091,16 +7393,17 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-backing" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "bitvec", - "futures 0.3.18", + "fatality", + "futures 0.3.21", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7109,31 +7412,31 @@ dependencies = [ "polkadot-statement-table", "sp-keystore", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "futures 0.3.18", + "futures 0.3.21", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", "sp-keystore", "thiserror", - "tracing", + "tracing-gum", "wasm-timer", ] [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "async-trait", - "futures 0.3.18", + "futures 0.3.21", "parity-scale-codec", "polkadot-node-core-pvf", "polkadot-node-primitives", @@ -7142,31 +7445,31 @@ dependencies = [ "polkadot-parachain", "polkadot-primitives", "sp-maybe-compressed-blob", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "futures 0.3.18", + "futures 0.3.21", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", "sc-client-api", "sc-consensus-babe", "sp-blockchain", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.21", + "futures-timer", "kvdb", "parity-scale-codec", "polkadot-node-primitives", @@ -7174,18 +7477,18 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "bitvec", - "derive_more", - "futures 0.3.18", + "fatality", + "futures 0.3.21", "kvdb", + "lru 0.7.7", "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7193,72 +7496,62 @@ dependencies = [ "polkadot-primitives", "sc-keystore", "thiserror", - "tracing", -] - -[[package]] -name = "polkadot-node-core-dispute-participation" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" -dependencies = [ - "futures 0.3.18", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-primitives", - "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "async-trait", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.21", + "futures-timer", "polkadot-node-subsystem", "polkadot-primitives", "sp-blockchain", "sp-inherents", "sp-runtime", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "bitvec", - "futures 0.3.18", - "futures-timer 3.0.2", + "fatality", + "futures 0.3.21", + "futures-timer", + "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", + "rand 0.8.5", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-core-pvf" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "always-assert", "assert_matches", "async-process", "async-std", - "futures 0.3.18", - "futures-timer 3.0.2", - "libc", + "futures 0.3.21", + "futures-timer", "parity-scale-codec", - "pin-project 1.0.8", + "pin-project", "polkadot-core-primitives", "polkadot-node-subsystem-util", "polkadot-parachain", - "rand 0.8.4", + "rand 0.8.5", + "rayon", "sc-executor", "sc-executor-common", "sc-executor-wasmtime", @@ -7269,15 +7562,32 @@ dependencies = [ "sp-maybe-compressed-blob", "sp-tracing", "sp-wasm-interface", - "tracing", + "tempfile", + "tracing-gum", +] + +[[package]] +name = "polkadot-node-core-pvf-checker" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" +dependencies = [ + "futures 0.3.21", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-overseer", + "polkadot-primitives", + "sp-keystore", + "thiserror", + "tracing-gum", ] [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "futures 0.3.18", + "futures 0.3.21", "memory-lru", "parity-util-mem", "polkadot-node-subsystem", @@ -7286,21 +7596,20 @@ dependencies = [ "sp-api", "sp-authority-discovery", "sp-consensus-babe", - "sp-core", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-node-jaeger" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "async-std", "lazy_static", "log", "mick-jaeger", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "polkadot-node-primitives", "polkadot-primitives", "sc-network", @@ -7310,40 +7619,51 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "futures 0.3.18", - "futures-timer 3.0.2", - "metered-channel", + "bs58", + "futures 0.3.21", + "futures-timer", + "log", + "parity-scale-codec", + "polkadot-primitives", + "prioritized-metered-channel", + "sc-cli", + "sc-service", + "sc-tracing", "substrate-prometheus-endpoint", + "tracing-gum", ] [[package]] name = "polkadot-node-network-protocol" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "async-trait", "derive_more", - "futures 0.3.18", + "fatality", + "futures 0.3.21", "parity-scale-codec", "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-primitives", + "rand 0.8.5", "sc-authority-discovery", "sc-network", - "strum", + "strum 0.24.1", "thiserror", + "tracing-gum", ] [[package]] name = "polkadot-node-primitives" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "bounded-vec", - "futures 0.3.18", + "futures 0.3.21", "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", @@ -7361,8 +7681,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -7371,15 +7691,15 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "derive_more", - "futures 0.3.18", + "futures 0.3.21", + "orchestra", "polkadot-node-jaeger", "polkadot-node-network-protocol", "polkadot-node-primitives", - "polkadot-overseer-gen", "polkadot-primitives", "polkadot-statement-table", "sc-network", @@ -7390,84 +7710,63 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "async-trait", "derive_more", - "futures 0.3.18", + "fatality", + "futures 0.3.21", "itertools", - "lru 0.7.0", - "metered-channel", + "kvdb", + "lru 0.7.7", + "parity-db", "parity-scale-codec", - "pin-project 1.0.8", + "parity-util-mem", + "parking_lot 0.11.2", + "pin-project", "polkadot-node-jaeger", "polkadot-node-metrics", "polkadot-node-network-protocol", + "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", "polkadot-primitives", - "rand 0.8.4", + "prioritized-metered-channel", + "rand 0.8.5", "sp-application-crypto", "sp-core", "sp-keystore", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-overseer" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "futures 0.3.18", - "futures-timer 3.0.2", - "lru 0.7.0", + "futures 0.3.21", + "futures-timer", + "lru 0.7.7", + "orchestra", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem-types", - "polkadot-overseer-gen", "polkadot-primitives", "sc-client-api", "sp-api", - "tracing", -] - -[[package]] -name = "polkadot-overseer-gen" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" -dependencies = [ - "async-trait", - "futures 0.3.18", - "futures-timer 3.0.2", - "metered-channel", - "pin-project 1.0.8", - "polkadot-node-network-protocol", - "polkadot-node-primitives", - "polkadot-overseer-gen-proc-macro", - "thiserror", - "tracing", -] - -[[package]] -name = "polkadot-overseer-gen-proc-macro" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" -dependencies = [ - "proc-macro-crate 1.1.0", - "proc-macro2", - "quote", - "syn", + "sp-core", + "tracing-gum", ] [[package]] name = "polkadot-parachain" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "derive_more", "frame-support", @@ -7481,10 +7780,25 @@ dependencies = [ "sp-std", ] +[[package]] +name = "polkadot-performance-test" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" +dependencies = [ + "env_logger", + "kusama-runtime", + "log", + "polkadot-erasure-coding", + "polkadot-node-core-pvf", + "polkadot-node-primitives", + "quote", + "thiserror", +] + [[package]] name = "polkadot-primitives" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "bitvec", "frame-system", @@ -7513,12 +7827,12 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", - "jsonrpc-core", + "jsonrpsee 0.14.0", "pallet-mmr-rpc", "pallet-transaction-payment-rpc", "polkadot-primitives", @@ -7540,24 +7854,22 @@ dependencies = [ "sp-keystore", "sp-runtime", "substrate-frame-rpc-system", + "substrate-state-trie-migration-rpc", ] [[package]] name = "polkadot-runtime" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "beefy-primitives", "bitvec", - "frame-benchmarking", "frame-election-provider-support", "frame-executive", "frame-support", "frame-system", - "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal", "log", "pallet-authority-discovery", "pallet-authorship", @@ -7565,6 +7877,7 @@ dependencies = [ "pallet-bags-list", "pallet-balances", "pallet-bounties", + "pallet-child-bounties", "pallet-collective", "pallet-democracy", "pallet-election-provider-multi-phase", @@ -7574,15 +7887,12 @@ dependencies = [ "pallet-im-online", "pallet-indices", "pallet-membership", - "pallet-mmr-primitives", "pallet-multisig", - "pallet-nicks", "pallet-offences", - "pallet-offences-benchmarking", + "pallet-preimage", "pallet-proxy", "pallet-scheduler", "pallet-session", - "pallet-session-benchmarking", "pallet-staking", "pallet-staking-reward-curve", "pallet-timestamp", @@ -7596,6 +7906,7 @@ dependencies = [ "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", + "polkadot-runtime-constants", "polkadot-runtime-parachains", "rustc-hex", "scale-info", @@ -7609,6 +7920,7 @@ dependencies = [ "sp-core", "sp-inherents", "sp-io", + "sp-mmr-primitives", "sp-npos-elections", "sp-offchain", "sp-runtime", @@ -7626,12 +7938,11 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "beefy-primitives", "bitvec", - "frame-benchmarking", "frame-election-provider-support", "frame-support", "frame-system", @@ -7639,7 +7950,6 @@ dependencies = [ "libsecp256k1", "log", "pallet-authorship", - "pallet-babe", "pallet-bags-list", "pallet-balances", "pallet-beefy-mmr", @@ -7671,15 +7981,38 @@ dependencies = [ "xcm", ] +[[package]] +name = "polkadot-runtime-constants" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" +dependencies = [ + "frame-support", + "polkadot-primitives", + "polkadot-runtime-common", + "smallvec", + "sp-runtime", +] + +[[package]] +name = "polkadot-runtime-metrics" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" +dependencies = [ + "bs58", + "parity-scale-codec", + "polkadot-primitives", + "sp-std", + "sp-tracing", +] + [[package]] name = "polkadot-runtime-parachains" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "bitflags", "bitvec", "derive_more", - "frame-benchmarking", "frame-support", "frame-system", "log", @@ -7693,7 +8026,8 @@ dependencies = [ "pallet-vesting", "parity-scale-codec", "polkadot-primitives", - "rand 0.8.4", + "polkadot-runtime-metrics", + "rand 0.8.5", "rand_chacha 0.3.1", "rustc-hex", "scale-info", @@ -7713,24 +8047,23 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "async-trait", "beefy-gadget", "beefy-primitives", "frame-system-rpc-runtime-api", - "futures 0.3.18", + "futures 0.3.21", "hex-literal", - "kusama-runtime", "kvdb", "kvdb-rocksdb", - "lru 0.7.0", + "lru 0.7.7", "pallet-babe", "pallet-im-online", - "pallet-mmr-primitives", "pallet-staking", "pallet-transaction-payment-rpc-runtime-api", + "parity-db", "polkadot-approval-distribution", "polkadot-availability-bitfield-distribution", "polkadot-availability-distribution", @@ -7749,22 +8082,23 @@ dependencies = [ "polkadot-node-core-chain-api", "polkadot-node-core-chain-selection", "polkadot-node-core-dispute-coordinator", - "polkadot-node-core-dispute-participation", "polkadot-node-core-parachains-inherent", "polkadot-node-core-provisioner", + "polkadot-node-core-pvf-checker", "polkadot-node-core-runtime-api", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", + "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-overseer", "polkadot-parachain", "polkadot-primitives", "polkadot-rpc", "polkadot-runtime", + "polkadot-runtime-constants", "polkadot-runtime-parachains", "polkadot-statement-distribution", - "rococo-runtime", "sc-authority-discovery", "sc-basic-authorship", "sc-block-builder", @@ -7782,9 +8116,11 @@ dependencies = [ "sc-offchain", "sc-service", "sc-sync-state-rpc", + "sc-sysinfo 6.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26)", "sc-telemetry", "sc-transaction-pool", "serde", + "serde_json", "sp-api", "sp-authority-discovery", "sp-block-builder", @@ -7806,18 +8142,17 @@ dependencies = [ "sp-trie", "substrate-prometheus-endpoint", "thiserror", - "tracing", - "westend-runtime", + "tracing-gum", ] [[package]] name = "polkadot-statement-distribution" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "arrayvec 0.5.2", - "derive_more", - "futures 0.3.18", + "fatality", + "futures 0.3.21", "indexmap", "parity-scale-codec", "polkadot-node-network-protocol", @@ -7828,13 +8163,13 @@ dependencies = [ "sp-keystore", "sp-staking", "thiserror", - "tracing", + "tracing-gum", ] [[package]] name = "polkadot-statement-table" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -7851,7 +8186,7 @@ dependencies = [ "libc", "log", "wepoll-ffi", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -7860,7 +8195,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" dependencies = [ - "cpufeatures 0.2.1", + "cpufeatures", "opaque-debug 0.3.0", "universal-hash", ] @@ -7872,26 +8207,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" dependencies = [ "cfg-if 1.0.0", - "cpufeatures 0.2.1", + "cpufeatures", "opaque-debug 0.3.0", "universal-hash", ] [[package]] name = "ppv-lite86" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" +checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "primitive-types" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" +checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a" dependencies = [ "fixed-hash", "impl-codec", - "impl-rlp", "impl-serde", "scale-info", "uint", @@ -7909,6 +8243,21 @@ dependencies = [ "xcm", ] +[[package]] +name = "prioritized-metered-channel" +version = "0.2.0" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" +dependencies = [ + "coarsetime", + "crossbeam-queue", + "derive_more", + "futures 0.3.21", + "futures-timer", + "nanorand", + "thiserror", + "tracing", +] + [[package]] name = "proc-macro-crate" version = "0.1.5" @@ -7920,9 +8269,9 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83" +checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" dependencies = [ "thiserror", "toml", @@ -7954,45 +8303,70 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.33" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb37d2df5df740e582f28f8560cf425f52bb267d872fe58358eadb554909f07a" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] name = "prometheus" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f64969ffd5dd8f39bd57a68ac53c163a095ed9d0fb707146da1b27025a3504" +checksum = "cface98dfa6d645ea4c789839f176e4b072265d085bfcc48eaa8d137f58d3c39" dependencies = [ "cfg-if 1.0.0", "fnv", "lazy_static", "memchr", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "thiserror", ] +[[package]] +name = "prometheus-client" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1abe0255c04d15f571427a2d1e00099016506cf3297b53853acd2b7eb87825" +dependencies = [ + "dtoa", + "itoa 1.0.2", + "owning_ref", + "prometheus-client-derive-text-encode", +] + +[[package]] +name = "prometheus-client-derive-text-encode" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8e12d01b9d66ad9eb4529c57666b6263fc1993cb30261d83ead658fdd932652" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "prost" -version = "0.9.0" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" +checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" dependencies = [ - "bytes 1.1.0", + "bytes", "prost-derive", ] [[package]] name = "prost-build" -version = "0.9.0" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" +checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab" dependencies = [ - "bytes 1.1.0", - "heck", + "bytes", + "cfg-if 1.0.0", + "cmake", + "heck 0.4.0", "itertools", "lazy_static", "log", @@ -8005,11 +8379,24 @@ dependencies = [ "which", ] +[[package]] +name = "prost-codec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00af1e92c33b4813cc79fda3f2dbf56af5169709be0202df730e9ebc3e4cd007" +dependencies = [ + "asynchronous-codec", + "bytes", + "prost", + "thiserror", + "unsigned-varint", +] + [[package]] name = "prost-derive" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" +checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" dependencies = [ "anyhow", "itertools", @@ -8020,46 +8407,29 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" +checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68" dependencies = [ - "bytes 1.1.0", + "bytes", "prost", ] [[package]] name = "psm" -version = "0.1.16" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd136ff4382c4753fc061cb9e4712ab2af263376b95bbd5bd8cd50c020b78e69" +checksum = "accd89aa18fbf9533a581355a22438101fe9c2ed8c9e2f0dcf520552a3afddf2" dependencies = [ "cc", ] -[[package]] -name = "pwasm-utils" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "880b3384fb00b8f6ecccd5d358b93bd2201900ae3daad213791d1864f6441f5c" -dependencies = [ - "byteorder", - "log", - "parity-wasm 0.42.2", -] - [[package]] name = "quick-error" version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -[[package]] -name = "quick-error" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" - [[package]] name = "quicksink" version = "0.1.2" @@ -8073,18 +8443,18 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.10" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ "proc-macro2", ] [[package]] name = "radium" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rand" @@ -8096,20 +8466,19 @@ dependencies = [ "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", - "rand_hc 0.2.0", - "rand_pcg", + "rand_hc", + "rand_pcg 0.2.1", ] [[package]] name = "rand" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha 0.3.1", "rand_core 0.6.3", - "rand_hc 0.3.1", ] [[package]] @@ -8147,17 +8516,17 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.2.3", + "getrandom 0.2.7", ] [[package]] name = "rand_distr" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "964d548f8e7d12e102ef183a0de7e98180c9f8729f555897a857b96e48122d2f" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" dependencies = [ "num-traits", - "rand 0.8.4", + "rand 0.8.5", ] [[package]] @@ -8170,21 +8539,21 @@ dependencies = [ ] [[package]] -name = "rand_hc" -version = "0.3.1" +name = "rand_pcg" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" dependencies = [ - "rand_core 0.6.3", + "rand_core 0.5.1", ] [[package]] name = "rand_pcg" -version = "0.2.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +checksum = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e" dependencies = [ - "rand_core 0.5.1", + "rand_core 0.6.3", ] [[package]] @@ -8195,9 +8564,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" dependencies = [ "autocfg", "crossbeam-deque", @@ -8207,40 +8576,34 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" dependencies = [ "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "lazy_static", "num_cpus", ] [[package]] name = "redox_syscall" -version = "0.1.57" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - -[[package]] -name = "redox_syscall" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" +checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" dependencies = [ "bitflags", ] [[package]] name = "redox_users" -version = "0.4.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.3", - "redox_syscall 0.2.10", + "getrandom 0.2.7", + "redox_syscall", + "thiserror", ] [[package]] @@ -8258,18 +8621,18 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300f2a835d808734ee295d45007adacb9ebb29dd3ae2424acfa17930cae541da" +checksum = "685d58625b6c2b83e4cc88a27c4bf65adb7b6b16dbdc413e515c9405b47432ab" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2" +checksum = "a043824e29c94169374ac5183ac0ed43f5724dc4556b19568007486bd840fa1f" dependencies = [ "proc-macro2", "quote", @@ -8277,21 +8640,22 @@ dependencies = [ ] [[package]] -name = "regalloc" -version = "0.0.32" +name = "regalloc2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6304468554ed921da3d32c355ea107b8d13d7b8996c3adfb7aab48d3bc321f4" +checksum = "4a8d23b35d7177df3b9d31ed8a9ab4bf625c668be77a319d4f5efd4a5257701c" dependencies = [ + "fxhash", "log", - "rustc-hash", + "slice-group-by", "smallvec", ] [[package]] name = "regex" -version = "1.5.4" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" dependencies = [ "aho-corasick", "memchr", @@ -8309,9 +8673,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.6.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" [[package]] name = "region" @@ -8322,16 +8686,16 @@ dependencies = [ "bitflags", "libc", "mach", - "winapi 0.3.9", + "winapi", ] [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "env_logger 0.9.0", - "jsonrpsee", + "env_logger", + "jsonrpsee 0.14.0", "log", "parity-scale-codec", "serde", @@ -8348,7 +8712,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -8358,122 +8722,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" dependencies = [ "hostname", - "quick-error 1.2.3", + "quick-error", ] [[package]] name = "retain_mut" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11000e6ba5020e53e7cc26f73b91ae7d5496b4977851479edb66b694c0675c21" - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi 0.3.9", -] - -[[package]] -name = "rlp" -version = "0.5.1" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "999508abb0ae792aabed2460c45b89106d97fe4adac593bdaef433c2605847b5" -dependencies = [ - "bytes 1.1.0", - "rustc-hex", -] +checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0" [[package]] -name = "rocksdb" -version = "0.17.0" +name = "rfc6979" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a62eca5cacf2c8261128631bed9f045598d40bfbe4b29f5163f0f802f8f44a7" +checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525" dependencies = [ - "libc", - "librocksdb-sys", -] - -[[package]] -name = "rococo-runtime" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" -dependencies = [ - "beefy-primitives", - "bp-messages", - "bp-rococo", - "bp-runtime", - "bp-wococo", - "bridge-runtime-common", - "frame-benchmarking", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-rpc-runtime-api", - "hex-literal", - "log", - "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", - "pallet-balances", - "pallet-beefy", - "pallet-beefy-mmr", - "pallet-bridge-dispatch", - "pallet-bridge-grandpa", - "pallet-bridge-messages", - "pallet-collective", - "pallet-grandpa", - "pallet-im-online", - "pallet-indices", - "pallet-membership", - "pallet-mmr", - "pallet-mmr-primitives", - "pallet-multisig", - "pallet-offences", - "pallet-proxy", - "pallet-session", - "pallet-staking", - "pallet-sudo", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-utility", - "pallet-xcm", - "parity-scale-codec", - "polkadot-parachain", - "polkadot-primitives", - "polkadot-runtime-common", - "polkadot-runtime-parachains", - "scale-info", - "serde", - "serde_derive", - "smallvec", - "sp-api", - "sp-authority-discovery", - "sp-block-builder", - "sp-consensus-babe", - "sp-core", - "sp-inherents", - "sp-io", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "sp-transaction-pool", - "sp-version", - "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", + "crypto-bigint", + "hmac 0.11.0", + "zeroize", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi", +] + +[[package]] +name = "rocksdb" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "620f4129485ff1a7128d184bc687470c21c7951b64779ebc9cfdad3dcd920290" +dependencies = [ + "libc", + "librocksdb-sys", ] [[package]] @@ -8483,24 +8774,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] -name = "rsix" -version = "0.23.9" +name = "rtnetlink" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f64c5788d5aab8b75441499d99576a24eb09f76fb267b36fec7e3d970c66431" +checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0" dependencies = [ - "bitflags", - "cc", - "errno", - "io-lifetimes", - "itoa", - "libc", - "linux-raw-sys", - "once_cell", - "rustc_version 0.4.0", + "async-global-executor", + "futures 0.3.21", + "log", + "netlink-packet-route", + "netlink-proto", + "nix", + "thiserror", ] [[package]] @@ -8510,9 +8799,9 @@ dependencies = [ "cumulus-pallet-xcm", "frame-support", "frame-system", + "orml-oracle", "orml-traits", "pallet-asset-index", - "pallet-chainlink-feed", "pallet-committee", "pallet-local-treasury", "pallet-price-feed", @@ -8536,12 +8825,13 @@ dependencies = [ "cumulus-pallet-xcmp-queue", "cumulus-primitives-core", "cumulus-primitives-utility", - "env_logger 0.9.0", + "env_logger", "frame-election-provider-support", "frame-support", "frame-system", "kusama-runtime", "orml-currencies", + "orml-oracle", "orml-tokens", "orml-traits", "orml-unknown-tokens", @@ -8551,7 +8841,6 @@ dependencies = [ "pallet-assets", "pallet-bags-list", "pallet-balances", - "pallet-chainlink-feed", "pallet-committee", "pallet-price-feed", "pallet-proxy", @@ -8612,29 +8901,47 @@ dependencies = [ [[package]] name = "rustc_version" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 0.11.0", + "semver 1.0.12", ] [[package]] -name = "rustc_version" -version = "0.4.0" +name = "rustix" +version = "0.33.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "938a344304321a9da4973b9ff4f9f8db9caf4597dfd9dda6a60b523340a0fff0" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes 0.5.3", + "libc", + "linux-raw-sys 0.0.42", + "winapi", +] + +[[package]] +name = "rustix" +version = "0.35.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72c825b8aa8010eb9ee99b75f05e10180b9278d161583034d7574c9d617aeada" dependencies = [ - "semver 1.0.4", + "bitflags", + "errno", + "io-lifetimes 0.7.3", + "libc", + "linux-raw-sys 0.0.46", + "windows-sys", ] [[package]] name = "rustls" -version = "0.19.1" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" dependencies = [ - "base64", "log", "ring", "sct", @@ -8643,32 +8950,47 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.5.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" +checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" dependencies = [ "openssl-probe", - "rustls", + "rustls-pemfile", "schannel", "security-framework", ] +[[package]] +name = "rustls-pemfile" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9" +dependencies = [ + "base64", +] + +[[package]] +name = "rustversion" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0a5f7c728f5d284929a1cccb5bc19884422bfe6ef4d6c409da2c41838983fcf" + [[package]] name = "rw-stream-sink" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020" +checksum = "26338f5e09bb721b85b135ea05af7767c90b52f6de4f087d4f4a3a9d64e7dc04" dependencies = [ - "futures 0.3.18", - "pin-project 0.4.28", + "futures 0.3.21", + "pin-project", "static_assertions", ] [[package]] name = "ryu" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" +checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" [[package]] name = "safe-mix" @@ -8700,7 +9022,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "log", "sp-core", @@ -8711,12 +9033,11 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", - "derive_more", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.21", + "futures-timer", "ip_network", "libp2p", "log", @@ -8733,15 +9054,16 @@ dependencies = [ "sp-keystore", "sp-runtime", "substrate-prometheus-endpoint", + "thiserror", ] [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.21", + "futures-timer", "log", "parity-scale-codec", "sc-block-builder", @@ -8761,7 +9083,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8777,10 +9099,10 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "impl-trait-for-tuples", - "memmap2 0.5.0", + "memmap2 0.5.5", "parity-scale-codec", "sc-chain-spec-derive", "sc-network", @@ -8794,9 +9116,9 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn", @@ -8805,11 +9127,12 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "chrono", + "clap 3.2.11", "fdlimit", - "futures 0.3.18", + "futures 0.3.21", "hex", "libp2p", "log", @@ -8819,22 +9142,22 @@ dependencies = [ "regex", "rpassword", "sc-client-api", + "sc-client-db", "sc-keystore", "sc-network", "sc-service", "sc-telemetry", "sc-tracing", - "sc-utils 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465)", + "sc-utils 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b)", "serde", "serde_json", "sp-blockchain", "sp-core", - "sp-keyring 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465)", + "sp-keyring 6.0.0 (git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b)", "sp-keystore", "sp-panic-handler", "sp-runtime", "sp-version", - "structopt", "thiserror", "tiny-bip39", "tokio", @@ -8843,17 +9166,17 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "fnv", - "futures 0.3.18", + "futures 0.3.21", "hash-db", "log", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "sc-executor", "sc-transaction-pool-api", - "sc-utils 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465)", + "sc-utils 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b)", "sp-api", "sp-blockchain", "sp-consensus", @@ -8871,7 +9194,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "hash-db", "kvdb", @@ -8881,7 +9204,7 @@ dependencies = [ "log", "parity-db", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "sc-client-api", "sc-state-db", "sp-arithmetic", @@ -8896,16 +9219,16 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.21", + "futures-timer", "libp2p", "log", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "sc-client-api", - "sc-utils 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465)", + "sc-utils 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b)", "serde", "sp-api", "sp-blockchain", @@ -8920,11 +9243,10 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", - "derive_more", - "futures 0.3.18", + "futures 0.3.21", "log", "parity-scale-codec", "sc-block-builder", @@ -8944,24 +9266,24 @@ dependencies = [ "sp-keystore", "sp-runtime", "substrate-prometheus-endpoint", + "thiserror", ] [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", - "derive_more", "fork-tree", - "futures 0.3.18", + "futures 0.3.21", "log", "merlin", "num-bigint", "num-rational 0.2.4", "num-traits", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "rand 0.7.3", "retain_mut", "sc-client-api", @@ -8987,18 +9309,16 @@ dependencies = [ "sp-runtime", "sp-version", "substrate-prometheus-endpoint", + "thiserror", ] [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "derive_more", - "futures 0.3.18", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", + "futures 0.3.21", + "jsonrpsee 0.14.0", "sc-consensus-babe", "sc-consensus-epochs", "sc-rpc-api", @@ -9011,12 +9331,13 @@ dependencies = [ "sp-core", "sp-keystore", "sp-runtime", + "thiserror", ] [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "fork-tree", "parity-scale-codec", @@ -9029,19 +9350,17 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "assert_matches", "async-trait", - "derive_more", - "futures 0.3.18", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", + "futures 0.3.21", + "jsonrpsee 0.14.0", "log", "parity-scale-codec", "sc-client-api", "sc-consensus", + "sc-consensus-aura", "sc-consensus-babe", "sc-consensus-epochs", "sc-transaction-pool", @@ -9050,6 +9369,7 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", + "sp-consensus-aura", "sp-consensus-babe", "sp-consensus-slots", "sp-core", @@ -9058,22 +9378,22 @@ dependencies = [ "sp-runtime", "sp-timestamp", "substrate-prometheus-endpoint", + "thiserror", ] [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.21", + "futures-timer", "log", "parity-scale-codec", "sc-client-api", "sc-consensus", "sc-telemetry", - "sp-api", "sp-arithmetic", "sp-blockchain", "sp-consensus", @@ -9089,10 +9409,10 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "sc-client-api", - "sp-authorship 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13)", + "sp-authorship 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26)", "sp-runtime", "thiserror", ] @@ -9100,13 +9420,12 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "lazy_static", - "libsecp256k1", - "log", + "lru 0.7.7", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "sc-executor-common", "sc-executor-wasmi", "sc-executor-wasmtime", @@ -9121,39 +9440,38 @@ dependencies = [ "sp-trie", "sp-version", "sp-wasm-interface", + "tracing", "wasmi", ] [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "derive_more", "environmental", "parity-scale-codec", - "pwasm-utils", "sc-allocator", - "sp-core", "sp-maybe-compressed-blob", + "sp-sandbox 0.10.0-dev (git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b)", "sp-serializer", "sp-wasm-interface", "thiserror", + "wasm-instrument", "wasmi", ] [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "log", "parity-scale-codec", "sc-allocator", "sc-executor-common", - "scoped-tls", - "sp-core", "sp-runtime-interface", + "sp-sandbox 0.10.0-dev (git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b)", "sp-wasm-interface", "wasmi", ] @@ -9161,17 +9479,19 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "cfg-if 1.0.0", "libc", "log", + "once_cell", "parity-scale-codec", "parity-wasm 0.42.2", + "rustix 0.35.9", "sc-allocator", "sc-executor-common", - "sp-core", "sp-runtime-interface", + "sp-sandbox 0.10.0-dev (git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b)", "sp-wasm-interface", "wasmtime", ] @@ -9179,27 +9499,29 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ + "ahash", "async-trait", - "derive_more", "dyn-clone", "finality-grandpa", "fork-tree", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.21", + "futures-timer", + "hex", "log", "parity-scale-codec", - "parking_lot 0.11.2", - "rand 0.8.4", + "parking_lot 0.12.1", + "rand 0.8.5", "sc-block-builder", + "sc-chain-spec", "sc-client-api", "sc-consensus", "sc-keystore", "sc-network", "sc-network-gossip", "sc-telemetry", - "sc-utils 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465)", + "sc-utils 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b)", "serde_json", "sp-api", "sp-application-crypto", @@ -9211,20 +9533,17 @@ dependencies = [ "sp-keystore", "sp-runtime", "substrate-prometheus-endpoint", + "thiserror", ] [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "derive_more", "finality-grandpa", - "futures 0.3.18", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "jsonrpc-pubsub", + "futures 0.3.21", + "jsonrpsee 0.14.0", "log", "parity-scale-codec", "sc-client-api", @@ -9235,16 +9554,17 @@ dependencies = [ "sp-blockchain", "sp-core", "sp-runtime", + "thiserror", ] [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "ansi_term", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.21", + "futures-timer", "log", "parity-util-mem", "sc-client-api", @@ -9257,53 +9577,54 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", - "derive_more", "hex", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "serde_json", "sp-application-crypto", "sp-core", "sp-keystore", + "thiserror", ] [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "async-std", "async-trait", - "asynchronous-codec 0.5.0", + "asynchronous-codec", "bitflags", - "bytes 1.1.0", + "bytes", "cid", - "derive_more", "either", "fnv", "fork-tree", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.21", + "futures-timer", "hex", "ip_network", "libp2p", "linked-hash-map", "linked_hash_set", "log", - "lru 0.7.0", + "lru 0.7.7", "parity-scale-codec", - "parking_lot 0.11.2", - "pin-project 1.0.8", + "parking_lot 0.12.1", + "pin-project", "prost", "prost-build", "rand 0.7.3", "sc-block-builder", "sc-client-api", "sc-consensus", + "sc-network-common", + "sc-network-light", + "sc-network-sync", "sc-peerset", - "sc-utils 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465)", + "sc-utils 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b)", "serde", "serde_json", "smallvec", @@ -9315,47 +9636,110 @@ dependencies = [ "sp-runtime", "substrate-prometheus-endpoint", "thiserror", - "unsigned-varint 0.6.0", + "unsigned-varint", "void", "zeroize", ] +[[package]] +name = "sc-network-common" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" +dependencies = [ + "futures 0.3.21", + "libp2p", + "parity-scale-codec", + "prost-build", + "sc-peerset", + "smallvec", +] + [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "futures 0.3.18", - "futures-timer 3.0.2", + "ahash", + "futures 0.3.21", + "futures-timer", "libp2p", "log", - "lru 0.7.0", + "lru 0.7.7", "sc-network", "sp-runtime", "substrate-prometheus-endpoint", "tracing", ] +[[package]] +name = "sc-network-light" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" +dependencies = [ + "futures 0.3.21", + "libp2p", + "log", + "parity-scale-codec", + "prost", + "prost-build", + "sc-client-api", + "sc-network-common", + "sc-peerset", + "sp-blockchain", + "sp-core", + "sp-runtime", + "thiserror", +] + +[[package]] +name = "sc-network-sync" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" +dependencies = [ + "bitflags", + "either", + "fork-tree", + "futures 0.3.21", + "libp2p", + "log", + "lru 0.7.7", + "parity-scale-codec", + "prost", + "prost-build", + "sc-client-api", + "sc-consensus", + "sc-network-common", + "sc-peerset", + "smallvec", + "sp-arithmetic", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-finality-grandpa", + "sp-runtime", + "thiserror", +] + [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "bytes 1.1.0", + "bytes", "fnv", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.21", + "futures-timer", "hex", "hyper", "hyper-rustls", "num_cpus", "once_cell", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "rand 0.7.3", "sc-client-api", "sc-network", - "sc-utils 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465)", + "sc-utils 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b)", "sp-api", "sp-core", "sp-offchain", @@ -9367,12 +9751,12 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "futures 0.3.18", + "futures 0.3.21", "libp2p", "log", - "sc-utils 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465)", + "sc-utils 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b)", "serde_json", "wasm-timer", ] @@ -9380,7 +9764,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9389,22 +9773,21 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "futures 0.3.18", + "futures 0.3.21", "hash-db", - "jsonrpc-core", - "jsonrpc-pubsub", + "jsonrpsee 0.14.0", "log", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "sc-block-builder", "sc-chain-spec", "sc-client-api", "sc-rpc-api", "sc-tracing", "sc-transaction-pool-api", - "sc-utils 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465)", + "sc-utils 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b)", "serde_json", "sp-api", "sp-blockchain", @@ -9420,18 +9803,16 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "futures 0.3.18", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "jsonrpc-pubsub", + "futures 0.3.21", + "jsonrpsee 0.14.0", "log", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "sc-chain-spec", "sc-transaction-pool-api", + "scale-info", "serde", "serde_json", "sp-core", @@ -9445,14 +9826,10 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "futures 0.3.18", - "jsonrpc-core", - "jsonrpc-http-server", - "jsonrpc-ipc-server", - "jsonrpc-pubsub", - "jsonrpc-ws-server", + "futures 0.3.21", + "jsonrpsee 0.14.0", "log", "serde_json", "substrate-prometheus-endpoint", @@ -9462,21 +9839,20 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "directories", "exit-future", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.21", + "futures-timer", "hash-db", - "jsonrpc-core", - "jsonrpc-pubsub", + "jsonrpsee 0.14.0", "log", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.11.2", - "pin-project 1.0.8", + "parking_lot 0.12.1", + "pin-project", "rand 0.7.3", "sc-block-builder", "sc-chain-spec", @@ -9487,14 +9863,16 @@ dependencies = [ "sc-informant", "sc-keystore", "sc-network", + "sc-network-common", "sc-offchain", "sc-rpc", "sc-rpc-server", + "sc-sysinfo 6.0.0-dev (git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b)", "sc-telemetry", "sc-tracing", "sc-transaction-pool", "sc-transaction-pool-api", - "sc-utils 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465)", + "sc-utils 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b)", "serde", "serde_json", "sp-api", @@ -9512,7 +9890,7 @@ dependencies = [ "sp-storage", "sp-tracing", "sp-transaction-pool", - "sp-transaction-storage-proof 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465)", + "sp-transaction-storage-proof 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b)", "sp-trie", "sp-version", "substrate-prometheus-endpoint", @@ -9526,13 +9904,13 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "log", "parity-scale-codec", "parity-util-mem", "parity-util-mem-derive", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "sc-client-api", "sp-core", ] @@ -9540,18 +9918,15 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", + "jsonrpsee 0.14.0", "parity-scale-codec", "sc-chain-spec", "sc-client-api", "sc-consensus-babe", "sc-consensus-epochs", "sc-finality-grandpa", - "sc-rpc-api", "serde", "serde_json", "sp-blockchain", @@ -9559,17 +9934,55 @@ dependencies = [ "thiserror", ] +[[package]] +name = "sc-sysinfo" +version = "6.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" +dependencies = [ + "futures 0.3.21", + "libc", + "log", + "rand 0.7.3", + "rand_pcg 0.2.1", + "regex", + "sc-telemetry", + "serde", + "serde_json", + "sp-core", + "sp-io", + "sp-std", +] + +[[package]] +name = "sc-sysinfo" +version = "6.0.0-dev" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" +dependencies = [ + "futures 0.3.21", + "libc", + "log", + "rand 0.7.3", + "rand_pcg 0.2.1", + "regex", + "sc-telemetry", + "serde", + "serde_json", + "sp-core", + "sp-io", + "sp-std", +] + [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "chrono", - "futures 0.3.18", + "futures 0.3.21", "libp2p", "log", - "parking_lot 0.11.2", - "pin-project 1.0.8", + "parking_lot 0.12.1", + "pin-project", "rand 0.7.3", "serde", "serde_json", @@ -9580,7 +9993,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "ansi_term", "atty", @@ -9589,7 +10002,7 @@ dependencies = [ "libc", "log", "once_cell", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "regex", "rustc-hash", "sc-client-api", @@ -9611,9 +10024,9 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn", @@ -9622,19 +10035,19 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "futures 0.3.18", - "intervalier", + "futures 0.3.21", + "futures-timer", "linked-hash-map", "log", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "retain_mut", "sc-client-api", "sc-transaction-pool-api", - "sc-utils 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465)", + "sc-utils 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b)", "serde", "sp-api", "sp-blockchain", @@ -9649,10 +10062,9 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "derive_more", - "futures 0.3.18", + "futures 0.3.21", "log", "serde", "sp-blockchain", @@ -9663,30 +10075,34 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.21", + "futures-timer", "lazy_static", + "log", + "parking_lot 0.12.1", "prometheus", ] [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.21", + "futures-timer", "lazy_static", + "log", + "parking_lot 0.12.1", "prometheus", ] [[package]] name = "scale-info" -version = "1.0.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c55b744399c25532d63a0d2789b109df8d46fc93752d46b0782991a931a782f" +checksum = "c46be926081c9f4dd5dd9b6f1d3e3229f2360bc6502dd8836f84a93b7c75e99a" dependencies = [ "bitvec", "cfg-if 1.0.0", @@ -9698,11 +10114,11 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "1.0.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baeb2780690380592f86205aa4ee49815feb2acad8c2f59e6dd207148c3f1fcd" +checksum = "50e334bb10a245e28e5fd755cabcafd96cfcd167c99ae63a46924ca8d8703a3c" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn", @@ -9710,12 +10126,12 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" dependencies = [ "lazy_static", - "winapi 0.3.9", + "windows-sys", ] [[package]] @@ -9736,12 +10152,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "scoped-tls" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" - [[package]] name = "scopeguard" version = "1.1.0" @@ -9749,13 +10159,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "sct" -version = "0.6.1" +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sec1" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" +dependencies = [ + "der", + "generic-array 0.14.5", + "subtle", + "zeroize", +] + +[[package]] +name = "secp256k1" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c42e6f1735c5f00f51e43e28d6634141f2bcad10931b2609ddd74a86d751260" +dependencies = [ + "secp256k1-sys", +] + +[[package]] +name = "secp256k1-sys" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +checksum = "957da2573cde917463ece3570eab4a0b3f19de6f1646cde62e6fd3868f566036" dependencies = [ - "ring", - "untrusted", + "cc", ] [[package]] @@ -9769,9 +10209,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.4.2" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" +checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" dependencies = [ "bitflags", "core-foundation", @@ -9782,9 +10222,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.4.2" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e" +checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" dependencies = [ "core-foundation-sys", "libc", @@ -9796,7 +10236,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a3186ec9e65071a2095434b1f5bb24838d4e8e130f584c790f6033c79943537" dependencies = [ - "semver-parser 0.7.0", + "semver-parser", ] [[package]] @@ -9805,23 +10245,14 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" dependencies = [ - "semver-parser 0.7.0", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser 0.10.2", + "semver-parser", ] [[package]] name = "semver" -version = "1.0.4" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" +checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1" dependencies = [ "serde", ] @@ -9832,29 +10263,20 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - [[package]] name = "serde" -version = "1.0.131" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ad69dfbd3e45369132cc64e6748c2d65cdfb001a2b1c232d128b4ad60561c1" +checksum = "0171ebb889e45aa68b44aee0859b3eede84c6f5f5c228e6f140c0b2a0a46cad6" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.131" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b710a83c4e0dff6a3d511946b95274ad9ca9e5d3ae497b63fda866ac955358d2" +checksum = "dc1d3230c1de7932af58ad8ffbe1d784bd55efd5a9d84ac24f69c72d83543dfb" dependencies = [ "proc-macro2", "quote", @@ -9863,15 +10285,24 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.72" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527" +checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" dependencies = [ - "itoa", + "itoa 1.0.2", "ryu", "serde", ] +[[package]] +name = "serde_nanos" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e44969a61f5d316be20a42ff97816efb3b407a924d06824c3d8a49fa8450de0e" +dependencies = [ + "serde", +] + [[package]] name = "sha-1" version = "0.8.2" @@ -9892,7 +10323,7 @@ checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpufeatures 0.2.1", + "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -9911,17 +10342,28 @@ dependencies = [ [[package]] name = "sha2" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpufeatures 0.2.1", + "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", ] +[[package]] +name = "sha2" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.10.3", +] + [[package]] name = "sha3" version = "0.9.1" @@ -9934,6 +10376,16 @@ dependencies = [ "opaque-debug 0.3.0", ] +[[package]] +name = "sha3" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "881bf8156c87b6301fc5ca6b27f11eeb2761224c7081e69b409d5a1951a70c86" +dependencies = [ + "digest 0.10.3", + "keccak", +] + [[package]] name = "sharded-slab" version = "0.1.4" @@ -9951,7 +10403,7 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "shot-runtime" -version = "2.0.0" +version = "4.0.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", @@ -9972,6 +10424,7 @@ dependencies = [ "hex-literal", "log", "orml-currencies", + "orml-oracle", "orml-tokens", "orml-traits", "orml-unknown-tokens", @@ -9979,15 +10432,15 @@ dependencies = [ "orml-xtokens", "pallet-asset-index", "pallet-asset-index-rpc-runtime-api", - "pallet-asset-tx-payment 0.1.0", + "pallet-asset-tx-payment", "pallet-aura", "pallet-authorship", "pallet-balances", - "pallet-chainlink-feed", "pallet-collator-selection", "pallet-collective", "pallet-committee", "pallet-local-treasury", + "pallet-membership", "pallet-price-feed", "pallet-randomness-collective-flip", "pallet-remote-asset-manager", @@ -10030,9 +10483,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.3.12" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c35dfd12afb7828318348b8c408383cf5071a086c1d4ab1c0f9840ec92dbb922" +checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" dependencies = [ "libc", "signal-hook-registry", @@ -10052,6 +10505,10 @@ name = "signature" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788" +dependencies = [ + "digest 0.9.0", + "rand_core 0.6.3", +] [[package]] name = "simba" @@ -10067,14 +10524,20 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.5" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" + +[[package]] +name = "slice-group-by" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" +checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" [[package]] name = "slot-range-helper" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "enumn", "parity-scale-codec", @@ -10094,9 +10557,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" +checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" [[package]] name = "snap" @@ -10106,41 +10569,29 @@ checksum = "45456094d1983e2ee2a18fdfebce3189fa451699d0502cb8e3b49dba5ba41451" [[package]] name = "snow" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6142f7c25e94f6fd25a32c3348ec230df9109b463f59c8c7acc4bd34936babb7" +checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d" dependencies = [ "aes-gcm", "blake2", "chacha20poly1305", - "rand 0.8.4", + "curve25519-dalek 4.0.0-pre.1", "rand_core 0.6.3", "ring", - "rustc_version 0.3.3", - "sha2 0.9.8", + "rustc_version 0.4.0", + "sha2 0.10.2", "subtle", - "x25519-dalek", -] - -[[package]] -name = "socket2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "winapi 0.3.9", ] [[package]] name = "socket2" -version = "0.4.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516" +checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -10150,19 +10601,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" dependencies = [ "base64", - "bytes 1.1.0", + "bytes", "flate2", - "futures 0.3.18", + "futures 0.3.21", "httparse", "log", - "rand 0.8.4", + "rand 0.8.5", "sha-1 0.9.8", ] [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "hash-db", "log", @@ -10179,10 +10630,10 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "blake2-rfc", - "proc-macro-crate 1.1.0", + "blake2", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn", @@ -10190,8 +10641,8 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +version = "6.0.0" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "scale-info", @@ -10203,8 +10654,8 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +version = "5.0.0" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "integer-sqrt", "num-traits", @@ -10219,7 +10670,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "scale-info", @@ -10232,7 +10683,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "parity-scale-codec", @@ -10244,7 +10695,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "parity-scale-codec", @@ -10256,7 +10707,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "sp-api", @@ -10268,13 +10719,13 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "futures 0.3.18", + "futures 0.3.21", "log", - "lru 0.7.0", + "lru 0.7.7", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "sp-api", "sp-consensus", "sp-database", @@ -10286,11 +10737,11 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", - "futures 0.3.18", - "futures-timer 3.0.2", + "futures 0.3.21", + "futures-timer", "log", "parity-scale-codec", "sp-core", @@ -10305,7 +10756,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "parity-scale-codec", @@ -10323,7 +10774,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "merlin", @@ -10346,21 +10797,24 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "scale-info", "serde", "sp-arithmetic", "sp-runtime", + "sp-std", + "sp-timestamp", ] [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", + "scale-info", "schnorrkel", "sp-core", "sp-runtime", @@ -10369,8 +10823,8 @@ dependencies = [ [[package]] name = "sp-core" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +version = "6.0.0" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "base58", "bitflags", @@ -10378,7 +10832,7 @@ dependencies = [ "byteorder", "dyn-clonable", "ed25519-dalek", - "futures 0.3.18", + "futures 0.3.21", "hash-db", "hash256-std-hasher", "hex", @@ -10390,15 +10844,15 @@ dependencies = [ "num-traits", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "primitive-types", "rand 0.7.3", "regex", "scale-info", "schnorrkel", + "secp256k1", "secrecy", "serde", - "sha2 0.9.8", "sp-core-hashing", "sp-debug-derive", "sp-externalities", @@ -10409,29 +10863,28 @@ dependencies = [ "substrate-bip39", "thiserror", "tiny-bip39", - "tiny-keccak", - "twox-hash", "wasmi", "zeroize", ] [[package]] name = "sp-core-hashing" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +version = "4.0.0" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "blake2-rfc", + "blake2", "byteorder", - "sha2 0.9.8", + "digest 0.10.3", + "sha2 0.10.2", + "sha3 0.10.1", "sp-std", - "tiny-keccak", "twox-hash", ] [[package]] name = "sp-core-hashing-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +version = "5.0.0" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "proc-macro2", "quote", @@ -10442,16 +10895,16 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "kvdb", - "parking_lot 0.11.2", + "parking_lot 0.12.1", ] [[package]] name = "sp-debug-derive" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +version = "4.0.0" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "proc-macro2", "quote", @@ -10460,8 +10913,8 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +version = "0.12.0" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "environmental", "parity-scale-codec", @@ -10472,7 +10925,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "finality-grandpa", "log", @@ -10490,7 +10943,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10503,15 +10956,16 @@ dependencies = [ [[package]] name = "sp-io" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +version = "6.0.0" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "futures 0.3.18", + "futures 0.3.21", "hash-db", "libsecp256k1", "log", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.1", + "secp256k1", "sp-core", "sp-externalities", "sp-keystore", @@ -10527,81 +10981,85 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "lazy_static", "sp-core", "sp-runtime", - "strum", + "strum 0.23.0", ] [[package]] name = "sp-keyring" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +version = "6.0.0" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "lazy_static", "sp-core", "sp-runtime", - "strum", + "strum 0.23.0", ] [[package]] name = "sp-keystore" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +version = "0.12.0" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", - "derive_more", - "futures 0.3.18", + "futures 0.3.21", "merlin", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "schnorrkel", "serde", "sp-core", "sp-externalities", + "thiserror", ] [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ + "thiserror", "zstd", ] [[package]] -name = "sp-npos-elections" +name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ + "log", "parity-scale-codec", - "scale-info", "serde", - "sp-arithmetic", + "sp-api", "sp-core", - "sp-npos-elections-solution-type", + "sp-debug-derive", "sp-runtime", "sp-std", ] [[package]] -name = "sp-npos-elections-solution-type" +name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "proc-macro-crate 1.1.0", - "proc-macro2", - "quote", - "syn", + "parity-scale-codec", + "scale-info", + "serde", + "sp-arithmetic", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "sp-api", "sp-core", @@ -10610,8 +11068,8 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +version = "4.0.0" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "backtrace", "lazy_static", @@ -10620,8 +11078,8 @@ dependencies = [ [[package]] name = "sp-rpc" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +version = "6.0.0" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "rustc-hash", "serde", @@ -10630,8 +11088,8 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +version = "6.0.0" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "either", "hash256-std-hasher", @@ -10652,8 +11110,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +version = "6.0.0" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10669,11 +11127,11 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +version = "5.0.0" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "Inflector", - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn", @@ -10682,7 +11140,21 @@ dependencies = [ [[package]] name = "sp-sandbox" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" +dependencies = [ + "log", + "parity-scale-codec", + "sp-core", + "sp-io", + "sp-std", + "sp-wasm-interface", + "wasmi", +] + +[[package]] +name = "sp-sandbox" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "log", "parity-scale-codec", @@ -10696,7 +11168,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "serde", "serde_json", @@ -10705,7 +11177,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "scale-info", @@ -10719,7 +11191,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "scale-info", @@ -10729,14 +11201,14 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +version = "0.12.0" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "hash-db", "log", "num-traits", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "rand 0.7.3", "smallvec", "sp-core", @@ -10746,19 +11218,18 @@ dependencies = [ "sp-trie", "thiserror", "tracing", - "trie-db", "trie-root", ] [[package]] name = "sp-std" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +version = "4.0.0" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" [[package]] name = "sp-storage" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +version = "6.0.0" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10771,7 +11242,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "log", "sp-core", @@ -10784,10 +11255,10 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", - "futures-timer 3.0.2", + "futures-timer", "log", "parity-scale-codec", "sp-api", @@ -10799,8 +11270,8 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +version = "5.0.0" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "sp-std", @@ -10812,7 +11283,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "sp-api", "sp-runtime", @@ -10821,19 +11292,23 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.13#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ + "async-trait", + "log", "parity-scale-codec", "scale-info", + "sp-core", "sp-inherents", "sp-runtime", "sp-std", + "sp-trie", ] [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "async-trait", "log", @@ -10848,8 +11323,8 @@ dependencies = [ [[package]] name = "sp-trie" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +version = "6.0.0" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "hash-db", "memory-db", @@ -10857,20 +11332,22 @@ dependencies = [ "scale-info", "sp-core", "sp-std", + "thiserror", "trie-db", "trie-root", ] [[package]] name = "sp-version" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +version = "5.0.0" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "impl-serde", "parity-scale-codec", "parity-wasm 0.42.2", "scale-info", "serde", + "sp-core-hashing-proc-macro", "sp-runtime", "sp-std", "sp-version-proc-macro", @@ -10880,7 +11357,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -10890,13 +11367,15 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +version = "6.0.0" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "impl-trait-for-tuples", + "log", "parity-scale-codec", "sp-std", "wasmi", + "wasmtime", ] [[package]] @@ -10907,11 +11386,12 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "ss58-registry" -version = "1.9.0" +version = "1.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "827441708a5dd8ca54e6b79690dc06d1bede78e61961e667f683c23c16ef964c" +checksum = "77ef98aedad3dc52e10995e7ed15f1279e11d4da35795f5dac7305742d0feb66" dependencies = [ "Inflector", + "num-format", "proc-macro2", "quote", "serde", @@ -10966,7 +11446,7 @@ dependencies = [ "lazy_static", "nalgebra", "num-traits", - "rand 0.8.4", + "rand 0.8.5", ] [[package]] @@ -10975,13 +11455,19 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + [[package]] name = "structopt" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40b9788f4202aa75c240ecc9c15c65185e6a39ccdeb0fd5d008b98825464c87c" +checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" dependencies = [ - "clap", + "clap 2.34.0", "lazy_static", "structopt-derive", ] @@ -10992,7 +11478,7 @@ version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ - "heck", + "heck 0.3.3", "proc-macro-error", "proc-macro2", "quote", @@ -11001,22 +11487,45 @@ dependencies = [ [[package]] name = "strum" -version = "0.22.0" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb" +dependencies = [ + "strum_macros 0.23.1", +] + +[[package]] +name = "strum" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e" +checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" dependencies = [ - "strum_macros", + "strum_macros 0.24.2", ] [[package]] name = "strum_macros" -version = "0.22.0" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38" +dependencies = [ + "heck 0.3.3", + "proc-macro2", + "quote", + "rustversion", + "syn", +] + +[[package]] +name = "strum_macros" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" +checksum = "4faebde00e8ff94316c01800f9054fd2ba77d30d9e922541913051d1d978918b" dependencies = [ - "heck", + "heck 0.4.0", "proc-macro2", "quote", + "rustversion", "syn", ] @@ -11029,14 +11538,14 @@ dependencies = [ "hmac 0.11.0", "pbkdf2 0.8.0", "schnorrkel", - "sha2 0.9.8", + "sha2 0.9.9", "zeroize", ] [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "platforms", ] @@ -11044,18 +11553,17 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "frame-system-rpc-runtime-api", - "futures 0.3.18", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", + "futures 0.3.21", + "jsonrpsee 0.14.0", "log", "parity-scale-codec", "sc-client-api", "sc-rpc-api", "sc-transaction-pool-api", + "serde_json", "sp-api", "sp-block-builder", "sp-blockchain", @@ -11066,26 +11574,48 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "async-std", - "derive_more", "futures-util", "hyper", "log", "prometheus", + "thiserror", "tokio", ] +[[package]] +name = "substrate-state-trie-migration-rpc" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.26#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" +dependencies = [ + "jsonrpsee 0.14.0", + "log", + "parity-scale-codec", + "sc-client-api", + "sc-rpc-api", + "scale-info", + "serde", + "sp-core", + "sp-io", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", + "trie-db", +] + [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ "ansi_term", "build-helper", "cargo_metadata", + "filetime", "sp-maybe-compressed-blob", + "strum 0.23.0", "tempfile", "toml", "walkdir", @@ -11100,13 +11630,13 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.82" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] @@ -11121,6 +11651,27 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "system-configuration" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd" +dependencies = [ + "bitflags", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tap" version = "1.0.1" @@ -11129,29 +11680,29 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.2" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9bffcddbc2458fa3e6058414599e3c838a022abae82e5c67b4f7f80298d5bff" +checksum = "c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1" [[package]] name = "tempfile" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ "cfg-if 1.0.0", + "fastrand", "libc", - "rand 0.8.4", - "redox_syscall 0.2.10", + "redox_syscall", "remove_dir_all", - "winapi 0.3.9", + "winapi", ] [[package]] name = "termcolor" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" dependencies = [ "winapi-util", ] @@ -11165,31 +11716,43 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "textwrap" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" + [[package]] name = "thiserror" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" dependencies = [ "proc-macro2", "quote", "syn", ] +[[package]] +name = "thousands" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" + [[package]] name = "thread_local" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" dependencies = [ "once_cell", ] @@ -11205,9 +11768,9 @@ dependencies = [ [[package]] name = "thrift" -version = "0.13.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6d965454947cc7266d22716ebfd07b18d84ebaf35eec558586bbb2a8cb6b5b" +checksum = "b82ca8f46f95b3ce96081fe3dd89160fdea970c254bb72925255d1b62aae692e" dependencies = [ "byteorder", "integer-encoding", @@ -11216,6 +11779,17 @@ dependencies = [ "threadpool", ] +[[package]] +name = "tikv-jemalloc-sys" +version = "0.4.3+5.2.1-patched.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1792ccb507d955b46af42c123ea8863668fae24d03721e40cad6a41773dbb49" +dependencies = [ + "cc", + "fs_extra", + "libc", +] + [[package]] name = "time" version = "0.1.44" @@ -11224,7 +11798,7 @@ checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", "wasi 0.10.0+wasi-snapshot-preview1", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -11239,27 +11813,18 @@ dependencies = [ "pbkdf2 0.4.0", "rand 0.7.3", "rustc-hash", - "sha2 0.9.8", + "sha2 0.9.9", "thiserror", - "unicode-normalization", - "wasm-bindgen", - "zeroize", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", + "unicode-normalization", + "wasm-bindgen", + "zeroize", ] [[package]] name = "tinyvec" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] @@ -11272,28 +11837,30 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.14.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e992e41e0d2fb9f755b37446f20900f64446ef54874f40a60c78f021ac6144" +checksum = "57aec3cfa4c296db7255446efb4928a6be304b431a806216105542a67b6ca82e" dependencies = [ "autocfg", - "bytes 1.1.0", + "bytes", "libc", "memchr", - "mio 0.7.14", + "mio", "num_cpus", "once_cell", - "pin-project-lite 0.2.7", + "parking_lot 0.12.1", + "pin-project-lite 0.2.9", "signal-hook-registry", + "socket2", "tokio-macros", - "winapi 0.3.9", + "winapi", ] [[package]] name = "tokio-macros" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9efc1aba077437943f7515666aa2b882dfabfbfdf89c819ea75a8d6e9eaba5e" +checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" dependencies = [ "proc-macro2", "quote", @@ -11302,9 +11869,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.22.0" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ "rustls", "tokio", @@ -11313,62 +11880,62 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" +checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" dependencies = [ "futures-core", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.9", "tokio", ] [[package]] name = "tokio-util" -version = "0.6.9" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" +checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" dependencies = [ - "bytes 1.1.0", + "bytes", "futures-core", "futures-io", "futures-sink", - "log", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.9", "tokio", + "tracing", ] [[package]] name = "toml" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" dependencies = [ "serde", ] [[package]] name = "tower-service" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.29" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" +checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160" dependencies = [ "cfg-if 1.0.0", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.9", "tracing-attributes", "tracing-core", ] [[package]] name = "tracing-attributes" -version = "0.1.18" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" +checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" dependencies = [ "proc-macro2", "quote", @@ -11377,11 +11944,12 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.21" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" +checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7" dependencies = [ - "lazy_static", + "once_cell", + "valuable", ] [[package]] @@ -11390,26 +11958,51 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project 1.0.8", + "pin-project", + "tracing", +] + +[[package]] +name = "tracing-gum" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" +dependencies = [ + "polkadot-node-jaeger", + "polkadot-primitives", "tracing", + "tracing-gum-proc-macro", +] + +[[package]] +name = "tracing-gum-proc-macro" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" +dependencies = [ + "expander 0.0.6", + "proc-macro-crate 1.1.3", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "tracing-log" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" dependencies = [ + "ahash", "lazy_static", "log", + "lru 0.7.7", "tracing-core", ] [[package]] name = "tracing-serde" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" dependencies = [ "serde", "tracing-core", @@ -11440,12 +12033,12 @@ dependencies = [ [[package]] name = "trie-db" -version = "0.22.6" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eac131e334e81b6b3be07399482042838adcd7957aa0010231d0813e39e02fa" +checksum = "d32d034c0d3db64b43c31de38e945f15b40cd4ca6d2dcfc26d4798ce8de4ab83" dependencies = [ "hash-db", - "hashbrown", + "hashbrown 0.12.2", "log", "rustc-hex", "smallvec", @@ -11453,18 +12046,18 @@ dependencies = [ [[package]] name = "trie-root" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "652931506d2c1244d7217a70b99f56718a7b4161b37f04e7cd868072a99f68cd" +checksum = "9a36c5ca3911ed3c9a5416ee6c679042064b93fc637ded67e25f92e68d783891" dependencies = [ "hash-db", ] [[package]] name = "trust-dns-proto" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0d7f5db438199a6e2609debe3f69f808d074e0a2888ee0bccb45fe234d03f4" +checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" dependencies = [ "async-trait", "cfg-if 1.0.0", @@ -11477,7 +12070,7 @@ dependencies = [ "ipnet", "lazy_static", "log", - "rand 0.8.4", + "rand 0.8.5", "smallvec", "thiserror", "tinyvec", @@ -11486,9 +12079,9 @@ dependencies = [ [[package]] name = "trust-dns-resolver" -version = "0.20.3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ad17b608a64bd0735e67bde16b0636f8aa8591f831a25d18443ed00a699770" +checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558" dependencies = [ "cfg-if 1.0.0", "futures-util", @@ -11496,7 +12089,7 @@ dependencies = [ "lazy_static", "log", "lru-cache", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "resolv-conf", "smallvec", "thiserror", @@ -11512,9 +12105,10 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=fcc54a72973d03afe7bf9e3ef2736050b3f33465#fcc54a72973d03afe7bf9e3ef2736050b3f33465" +source = "git+https://github.com/paritytech//substrate?rev=e8a7d161f39db70cb27fdad6c6e215cf493ebc3b#e8a7d161f39db70cb27fdad6c6e215cf493ebc3b" dependencies = [ - "jsonrpsee", + "clap 3.2.11", + "jsonrpsee 0.14.0", "log", "parity-scale-codec", "remote-externalities", @@ -11530,7 +12124,7 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-version", - "structopt", + "zstd", ] [[package]] @@ -11541,32 +12135,33 @@ checksum = "5e66dcbec4290c69dd03c57e76c2469ea5c7ce109c6dd4351c13055cf71ea055" [[package]] name = "twox-hash" -version = "1.6.1" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f559b464de2e2bdabcac6a210d12e9b5a5973c251e102c44c585c71d51bd78e" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if 1.0.0", - "rand 0.8.4", + "digest 0.10.3", + "rand 0.8.5", "static_assertions", ] [[package]] name = "typenum" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "ucd-trie" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" +checksum = "89570599c4fe5585de2b388aab47e99f7fa4e9238a1399f707a02e356058141c" [[package]] name = "uint" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6470ab50f482bde894a037a57064480a246dbfdd5960bd65a44824693f08da5f" +checksum = "12f03af7ccf01dd611cc450a0d10dbc9b745770d096473e2faf0ca6e2d66d1e0" dependencies = [ "byteorder", "crunchy", @@ -11585,24 +12180,30 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" + +[[package]] +name = "unicode-ident" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" [[package]] name = "unicode-normalization" -version = "0.1.19" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" +checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" [[package]] name = "unicode-width" @@ -11612,9 +12213,9 @@ checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" [[package]] name = "unicode-xid" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" [[package]] name = "universal-hash" @@ -11622,36 +12223,18 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", "subtle", ] -[[package]] -name = "unsigned-varint" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fdeedbf205afadfe39ae559b75c3240f24e257d0ca27e85f85cb82aa19ac35" - -[[package]] -name = "unsigned-varint" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35581ff83d4101e58b582e607120c7f5ffb17e632a980b1f38334d76b36908b2" -dependencies = [ - "asynchronous-codec 0.5.0", - "bytes 1.1.0", - "futures-io", - "futures-util", -] - [[package]] name = "unsigned-varint" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836" dependencies = [ - "asynchronous-codec 0.6.0", - "bytes 1.1.0", + "asynchronous-codec", + "bytes", "futures-io", "futures-util", ] @@ -11685,11 +12268,17 @@ dependencies = [ "percent-encoding 2.1.0", ] +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "value-bag" -version = "1.0.0-alpha.8" +version = "1.0.0-alpha.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79923f7731dc61ebfba3633098bf3ac533bbd35ccd8c57e7088d9a5eebe0263f" +checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" dependencies = [ "ctor", "version_check", @@ -11709,9 +12298,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "version_check" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "void" @@ -11732,7 +12321,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" dependencies = [ "same-file", - "winapi 0.3.9", + "winapi", "winapi-util", ] @@ -11758,11 +12347,17 @@ version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + [[package]] name = "wasm-bindgen" -version = "0.2.78" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" +checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -11770,9 +12365,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.78" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" +checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a" dependencies = [ "bumpalo", "lazy_static", @@ -11785,9 +12380,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.28" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39" +checksum = "de9a9cec1733468a8c657e57fa2413d2ae2c0129b95e87c5b72b8ace4d13f31f" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -11797,9 +12392,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.78" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" +checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -11807,9 +12402,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.78" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" +checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048" dependencies = [ "proc-macro2", "quote", @@ -11820,9 +12415,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.78" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" +checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be" [[package]] name = "wasm-gc-api" @@ -11835,13 +12430,22 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "wasm-instrument" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "962e5b0401bbb6c887f54e69b8c496ea36f704df65db73e81fd5ff8dc3e63a9f" +dependencies = [ + "parity-wasm 0.42.2", +] + [[package]] name = "wasm-timer" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ - "futures 0.3.18", + "futures 0.3.21", "js-sys", "parking_lot 0.11.2", "pin-utils", @@ -11877,31 +12481,33 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.81.0" +version = "0.85.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98930446519f63d00a836efdc22f67766ceae8dbcc1571379f2bcabc6b2b9abc" +checksum = "570460c58b21e9150d2df0eaaedbb7816c34bcec009ae0dcc976e40ba81463e7" +dependencies = [ + "indexmap", +] [[package]] name = "wasmtime" -version = "0.31.0" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311d06b0c49346d1fbf48a17052e844036b95a7753c1afb34e8c0af3f6b5bb13" +checksum = "1f50eadf868ab6a04b7b511460233377d0bfbb92e417b2f6a98b98fef2e098f5" dependencies = [ "anyhow", "backtrace", "bincode", "cfg-if 1.0.0", - "cpp_demangle", "indexmap", "lazy_static", "libc", "log", - "object", + "object 0.28.4", + "once_cell", "paste", "psm", "rayon", "region", - "rustc-demangle", "serde", "target-lexicon", "wasmparser", @@ -11910,14 +12516,14 @@ dependencies = [ "wasmtime-environ", "wasmtime-jit", "wasmtime-runtime", - "winapi 0.3.9", + "winapi", ] [[package]] name = "wasmtime-cache" -version = "0.31.0" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36147930a4995137dc096e5b17a573b446799be2bbaea433e821ce6a80abe2c5" +checksum = "d1df23c642e1376892f3b72f311596976979cbf8b85469680cdd3a8a063d12a2" dependencies = [ "anyhow", "base64", @@ -11925,19 +12531,19 @@ dependencies = [ "directories-next", "file-per-thread-logger", "log", - "rsix", + "rustix 0.33.7", "serde", - "sha2 0.9.8", + "sha2 0.9.9", "toml", - "winapi 0.3.9", + "winapi", "zstd", ] [[package]] name = "wasmtime-cranelift" -version = "0.31.0" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3083a47e1ede38aac06a1d9831640d673f9aeda0b82a64e4ce002f3432e2e7" +checksum = "f264ff6b4df247d15584f2f53d009fbc90032cfdc2605b52b961bffc71b6eccd" dependencies = [ "anyhow", "cranelift-codegen", @@ -11945,10 +12551,10 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli 0.25.0", + "gimli", "log", "more-asserts", - "object", + "object 0.28.4", "target-lexicon", "thiserror", "wasmparser", @@ -11957,18 +12563,17 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "0.31.0" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c2d194b655321053bc4111a1aa4ead552655c8a17d17264bc97766e70073510" +checksum = "839d2820e4b830f4b9e7aa08d4c0acabf4a5036105d639f6dfa1c6891c73bdc6" dependencies = [ "anyhow", - "cfg-if 1.0.0", "cranelift-entity", - "gimli 0.25.0", + "gimli", "indexmap", "log", "more-asserts", - "object", + "object 0.28.4", "serde", "target-lexicon", "thiserror", @@ -11978,59 +12583,72 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "0.31.0" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864ac8dfe4ce310ac59f16fdbd560c257389cb009ee5d030ac6e30523b023d11" +checksum = "ef0a0bcbfa18b946d890078ba0e1bc76bcc53eccfb40806c0020ec29dcd1bd49" dependencies = [ - "addr2line 0.16.0", + "addr2line", "anyhow", "bincode", "cfg-if 1.0.0", - "gimli 0.25.0", + "cpp_demangle", + "gimli", "log", - "more-asserts", - "object", + "object 0.28.4", "region", - "rsix", + "rustc-demangle", + "rustix 0.33.7", "serde", "target-lexicon", "thiserror", - "wasmparser", "wasmtime-environ", + "wasmtime-jit-debug", "wasmtime-runtime", - "winapi 0.3.9", + "winapi", +] + +[[package]] +name = "wasmtime-jit-debug" +version = "0.38.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f4779d976206c458edd643d1ac622b6c37e4a0800a8b1d25dfbf245ac2f2cac" +dependencies = [ + "lazy_static", + "object 0.28.4", + "rustix 0.33.7", ] [[package]] name = "wasmtime-runtime" -version = "0.31.0" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab97da813a26b98c9abfd3b0c2d99e42f6b78b749c0646344e2e262d212d8c8b" +checksum = "b7eb6ffa169eb5dcd18ac9473c817358cd57bc62c244622210566d473397954a" dependencies = [ "anyhow", "backtrace", "cc", "cfg-if 1.0.0", "indexmap", - "lazy_static", "libc", "log", "mach", + "memfd", "memoffset", "more-asserts", - "rand 0.8.4", + "rand 0.8.5", "region", - "rsix", + "rustix 0.33.7", "thiserror", "wasmtime-environ", - "winapi 0.3.9", + "wasmtime-jit-debug", + "winapi", ] [[package]] name = "wasmtime-types" -version = "0.31.0" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff94409cc3557bfbbcce6b14520ccd6bd3727e965c0fe68d63ef2c185bf379c6" +checksum = "8d932b0ac5336f7308d869703dd225610a6a3aeaa8e968c52b43eed96cefb1c2" dependencies = [ "cranelift-entity", "serde", @@ -12040,9 +12658,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.55" +version = "0.3.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" +checksum = "2fed94beee57daf8dd7d51f2b15dc2bcde92d7a72304cdf662a4371008b71b90" dependencies = [ "js-sys", "wasm-bindgen", @@ -12050,9 +12668,9 @@ dependencies = [ [[package]] name = "webpki" -version = "0.21.4" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" dependencies = [ "ring", "untrusted", @@ -12060,9 +12678,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.21.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" +checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf" dependencies = [ "webpki", ] @@ -12076,95 +12694,11 @@ dependencies = [ "cc", ] -[[package]] -name = "westend-runtime" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" -dependencies = [ - "beefy-primitives", - "bitvec", - "frame-benchmarking", - "frame-election-provider-support", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "frame-try-runtime", - "hex-literal", - "log", - "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", - "pallet-bags-list", - "pallet-balances", - "pallet-collective", - "pallet-democracy", - "pallet-election-provider-multi-phase", - "pallet-elections-phragmen", - "pallet-grandpa", - "pallet-identity", - "pallet-im-online", - "pallet-indices", - "pallet-membership", - "pallet-mmr-primitives", - "pallet-multisig", - "pallet-nicks", - "pallet-offences", - "pallet-offences-benchmarking", - "pallet-proxy", - "pallet-recovery", - "pallet-scheduler", - "pallet-session", - "pallet-session-benchmarking", - "pallet-society", - "pallet-staking", - "pallet-staking-reward-curve", - "pallet-sudo", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-treasury", - "pallet-utility", - "pallet-vesting", - "pallet-xcm", - "pallet-xcm-benchmarks", - "parity-scale-codec", - "polkadot-parachain", - "polkadot-primitives", - "polkadot-runtime-common", - "polkadot-runtime-parachains", - "rustc-hex", - "scale-info", - "serde", - "serde_derive", - "smallvec", - "sp-api", - "sp-authority-discovery", - "sp-block-builder", - "sp-consensus-babe", - "sp-core", - "sp-inherents", - "sp-io", - "sp-npos-elections", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "sp-transaction-pool", - "sp-version", - "substrate-wasm-builder", - "xcm", - "xcm-builder", - "xcm-executor", -] - [[package]] name = "which" -version = "4.2.2" +version = "4.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea187a8ef279bc014ec368c27a920da2024d2a711109bfbe3440585d5cf27ad9" +checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" dependencies = [ "either", "lazy_static", @@ -12173,15 +12707,9 @@ dependencies = [ [[package]] name = "widestring" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" - -[[package]] -name = "winapi" -version = "0.2.8" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" +checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" [[package]] name = "winapi" @@ -12193,12 +12721,6 @@ dependencies = [ "winapi-x86_64-pc-windows-gnu", ] -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" @@ -12211,7 +12733,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -12221,29 +12743,108 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "winreg" -version = "0.6.2" +name = "windows" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" +checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" dependencies = [ - "winapi 0.3.9", + "windows_aarch64_msvc 0.34.0", + "windows_i686_gnu 0.34.0", + "windows_i686_msvc 0.34.0", + "windows_x86_64_gnu 0.34.0", + "windows_x86_64_msvc 0.34.0", ] [[package]] -name = "ws2_32-sys" -version = "0.2.1" +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", +] + +[[package]] +name = "windows_aarch64_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[package]] +name = "windows_i686_gnu" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[package]] +name = "windows_i686_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + +[[package]] +name = "winreg" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" dependencies = [ - "winapi 0.2.8", - "winapi-build", + "winapi", ] [[package]] name = "wyz" -version = "0.2.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" +checksum = "30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e" +dependencies = [ + "tap", +] [[package]] name = "x25519-dalek" @@ -12258,21 +12859,22 @@ dependencies = [ [[package]] name = "xcm" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "derivative", "impl-trait-for-tuples", "log", "parity-scale-codec", "scale-info", + "sp-runtime", "xcm-procedural", ] [[package]] name = "xcm-builder" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "frame-support", "frame-system", @@ -12318,14 +12920,14 @@ dependencies = [ [[package]] name = "xcm-emulator" version = "0.1.0" -source = "git+https://github.com/shaunxw/xcm-simulator.git?branch=master#4d3bb9dd4fa2cd554a9970ffff816d9346269eaa" +source = "git+https://github.com/shaunxw/xcm-simulator.git?rev=ab5cd6c5fabe6ddda52ed6803ee1bf54c258fefe#ab5cd6c5fabe6ddda52ed6803ee1bf54c258fefe" dependencies = [ "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-xcmp-queue", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", - "cumulus-test-relay-sproof-builder 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.11)", + "cumulus-test-relay-sproof-builder 0.1.0 (git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.26)", "frame-support", "frame-system", "parachain-info", @@ -12333,6 +12935,7 @@ dependencies = [ "paste", "polkadot-primitives", "polkadot-runtime-parachains", + "quote", "sp-io", "sp-std", "xcm", @@ -12341,10 +12944,9 @@ dependencies = [ [[package]] name = "xcm-executor" -version = "0.9.13" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ - "frame-benchmarking", "frame-support", "impl-trait-for-tuples", "log", @@ -12360,8 +12962,9 @@ dependencies = [ [[package]] name = "xcm-procedural" version = "0.1.0" -source = "git+https://github.com/paritytech//polkadot?rev=7d8f00b90cd6d87780123b3e08ca120cfb0c6e50#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +source = "git+https://github.com/paritytech//polkadot?rev=d8785970175dce344f2a6ad1cd88297529a6dd59#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ + "Inflector", "proc-macro2", "quote", "syn", @@ -12369,8 +12972,8 @@ dependencies = [ [[package]] name = "xcm-simulator" -version = "0.9.13" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.13#7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" +version = "0.9.26" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.26#d8785970175dce344f2a6ad1cd88297529a6dd59" dependencies = [ "frame-support", "parity-scale-codec", @@ -12386,32 +12989,32 @@ dependencies = [ [[package]] name = "yamux" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d9028f208dd5e63c614be69f115c1b53cacc1111437d4c765185856666c107" +checksum = "0c0608f53c1dc0bad505d03a34bbd49fbf2ad7b51eb036123e896365532745a1" dependencies = [ - "futures 0.3.18", + "futures 0.3.21", "log", "nohash-hasher", - "parking_lot 0.11.2", - "rand 0.8.4", + "parking_lot 0.12.1", + "rand 0.8.5", "static_assertions", ] [[package]] name = "zeroize" -version = "1.4.3" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d68d9dcec5f9b43a30d38c49f91dfedfaac384cb8f085faca366c26207dd1619" +checksum = "20b578acffd8516a6c3f2a1bdefc1ec37e547bb4e0fb8b6b01a4cafc886b4442" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.2.2" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65f1a51723ec88c66d5d1fe80c841f17f63587d6691901d66be9bec6c3b51f73" +checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" dependencies = [ "proc-macro2", "quote", @@ -12421,18 +13024,18 @@ dependencies = [ [[package]] name = "zstd" -version = "0.9.0+zstd.1.5.0" +version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07749a5dc2cb6b36661290245e350f15ec3bbb304e493db54a1d354480522ccd" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "4.1.1+zstd.1.5.0" +version = "5.0.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c91c90f2c593b003603e5e0493c837088df4469da25aafff8bce42ba48caf079" +checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" dependencies = [ "libc", "zstd-sys", @@ -12440,9 +13043,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.6.1+zstd.1.5.0" +version = "2.0.1+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615120c7a2431d16cf1cf979e7fc31ba7a5b5e5707b29c8a99e5dbf8a8392a33" +checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" dependencies = [ "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml index 78b3e83d59..983f41b836 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,186 +15,184 @@ members = [ exclude = ["test-utils/xcm-test-support"] [patch."https://github.com/paritytech/substrate"] -frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -frame-benchmarking-cli = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -frame-election-provider-support = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -frame-executive = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -frame-support = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -frame-support-procedural = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -frame-support-procedural-tools = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -frame-support-procedural-tools-derive = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -frame-system = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -frame-try-runtime = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -#max-encoded-len = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -#max-encoded-len-derive = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-aura = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-bounties = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-collective = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-democracy = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-election-provider-multi-phase = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-grandpa = {git = 'https://github.com/paritytech//substrate', rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-identity = {git = 'https://github.com/paritytech//substrate', rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-im-online = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-indices = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-membership = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-mmr = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-mmr-primitives = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-mmr-rpc = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-multisig = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-nicks = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-offences = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-proxy = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-offences-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-randomness-collective-flip = {git = 'https://github.com/paritytech//substrate', rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-recovery = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-session-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-scheduler = {git = 'https://github.com/paritytech//substrate', rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-sudo = {git = 'https://github.com/paritytech//substrate', rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-session = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-society = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-staking-reward-curve = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-tips = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-utility = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -remote-externalities = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-basic-authorship = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-block-builder = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-chain-spec = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-cli = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-consensus = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-consensus-babe-rpc = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-consensus-epochs = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-consensus-manual-seal = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-executor = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-executor-wasmtime = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-finality-grandpa-rpc = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -#sc-finality-grandpa-warp-sync = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-informant = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-keystore = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-network = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-network-gossip = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-offchain = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-rpc = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-rpc-api = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-service = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-sync-state-rpc = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-telemetry = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-tracing = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sc-transaction-pool-api = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-api = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-block-builder = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-consensus-vrf = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-core = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-io = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-offchain = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-rpc = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-serializer = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-session = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-staking = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-std = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-storage = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-trie = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-version = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -substrate-build-script-utils = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -substrate-frame-rpc-system = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -substrate-prometheus-endpoint = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -try-runtime-cli = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} -substrate-wasm-builder = { git = "https://github.com/paritytech//substrate", rev = "fcc54a72973d03afe7bf9e3ef2736050b3f33465"} +frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +frame-benchmarking-cli = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +frame-election-provider-support = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +frame-executive = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +frame-support = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +frame-support-procedural = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +frame-support-procedural-tools = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +frame-support-procedural-tools-derive = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +frame-system = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +frame-try-runtime = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +#max-encoded-len = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +#max-encoded-len-derive = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-aura = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-babe = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-balances = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-bounties = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-collective = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-democracy = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-election-provider-multi-phase = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-grandpa = {git = 'https://github.com/paritytech//substrate', rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-identity = {git = 'https://github.com/paritytech//substrate', rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-im-online = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-indices = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-membership = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-mmr = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +#pallet-mmr-primitives = { git = "https://github.com/paritytech//substrate", rev = 'fcc54a72973d03afe7bf9e3ef2736050b3f33465'} +pallet-mmr-rpc = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-multisig = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-offences = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-proxy = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-randomness-collective-flip = {git = 'https://github.com/paritytech//substrate', rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-recovery = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-scheduler = {git = 'https://github.com/paritytech//substrate', rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-sudo = {git = 'https://github.com/paritytech//substrate', rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-session = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-society = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-staking = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-staking-reward-curve = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-tips = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-utility = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +remote-externalities = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-basic-authorship = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-block-builder = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-chain-spec = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-cli = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-client-api = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-client-db = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-consensus = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-consensus-babe-rpc = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-consensus-epochs = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-consensus-manual-seal = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-executor = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-executor-wasmtime = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-finality-grandpa-rpc = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +#sc-finality-grandpa-warp-sync = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-informant = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-keystore = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-network = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-network-gossip = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-offchain = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-rpc = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-rpc-api = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-service = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-sync-state-rpc = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-telemetry = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-tracing = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sc-transaction-pool-api = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-api = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-mmr-primitives = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-block-builder = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-consensus = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-consensus-vrf = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-core = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-externalities = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-inherents = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-io = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-keystore = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-offchain = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-rpc = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-runtime = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-serializer = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-session = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-staking = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-std = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-storage = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-tracing = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-trie = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-version = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +substrate-build-script-utils = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +substrate-frame-rpc-system = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +substrate-prometheus-endpoint = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +try-runtime-cli = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} +substrate-wasm-builder = { git = "https://github.com/paritytech//substrate", rev = 'e8a7d161f39db70cb27fdad6c6e215cf493ebc3b'} [patch."https://github.com/paritytech/polkadot"] -xcm = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } -xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } -xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } -pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } -polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } -polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } -polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } -polkadot-runtime = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } -polkadot-runtime-common = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } -rococo-runtime = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } -westend-runtime = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } -kusama-runtime = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } -polkadot-node-network-protocol = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } -polkadot-node-subsystem = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } -polkadot-statement-table = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } -# polkadot-test-service = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } -# polkadot-test-runtime = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } -polkadot-overseer = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } -polkadot-node-primitives = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } -polkadot-service = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } -polkadot-cli = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } -polkadot-node-core-pvf = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } -polkadot-client = { git = "https://github.com/paritytech//polkadot", rev = "7d8f00b90cd6d87780123b3e08ca120cfb0c6e50" } +xcm = { git = "https://github.com/paritytech//polkadot", rev = 'd8785970175dce344f2a6ad1cd88297529a6dd59'} +xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = 'd8785970175dce344f2a6ad1cd88297529a6dd59'} +xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = 'd8785970175dce344f2a6ad1cd88297529a6dd59'} +pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = 'd8785970175dce344f2a6ad1cd88297529a6dd59'} +polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = 'd8785970175dce344f2a6ad1cd88297529a6dd59'} +polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = 'd8785970175dce344f2a6ad1cd88297529a6dd59'} +polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = 'd8785970175dce344f2a6ad1cd88297529a6dd59'} +polkadot-runtime = { git = "https://github.com/paritytech//polkadot", rev = 'd8785970175dce344f2a6ad1cd88297529a6dd59'} +polkadot-runtime-common = { git = "https://github.com/paritytech//polkadot", rev = 'd8785970175dce344f2a6ad1cd88297529a6dd59'} +kusama-runtime = { git = "https://github.com/paritytech//polkadot", rev = 'd8785970175dce344f2a6ad1cd88297529a6dd59'} +polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = 'd8785970175dce344f2a6ad1cd88297529a6dd59'} +polkadot-node-network-protocol = { git = "https://github.com/paritytech//polkadot", rev = 'd8785970175dce344f2a6ad1cd88297529a6dd59'} +polkadot-node-subsystem = { git = "https://github.com/paritytech//polkadot", rev = 'd8785970175dce344f2a6ad1cd88297529a6dd59'} +polkadot-statement-table = { git = "https://github.com/paritytech//polkadot", rev = 'd8785970175dce344f2a6ad1cd88297529a6dd59'} +polkadot-overseer = { git = "https://github.com/paritytech//polkadot", rev = 'd8785970175dce344f2a6ad1cd88297529a6dd59'} +polkadot-node-primitives = { git = "https://github.com/paritytech//polkadot", rev = 'd8785970175dce344f2a6ad1cd88297529a6dd59'} +polkadot-service = { git = "https://github.com/paritytech//polkadot", rev = 'd8785970175dce344f2a6ad1cd88297529a6dd59'} +polkadot-cli = { git = "https://github.com/paritytech//polkadot", rev = 'd8785970175dce344f2a6ad1cd88297529a6dd59'} +polkadot-node-core-pvf = { git = "https://github.com/paritytech//polkadot", rev = 'd8785970175dce344f2a6ad1cd88297529a6dd59'} +polkadot-client = { git = "https://github.com/paritytech//polkadot", rev = 'd8785970175dce344f2a6ad1cd88297529a6dd59'} +polkadot-rpc = { git = "https://github.com/paritytech//polkadot", rev = 'd8785970175dce344f2a6ad1cd88297529a6dd59'} [patch."https://github.com/paritytech/cumulus"] -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech//cumulus", rev = "0be8e8fc214641e306e4f913dd64ff1913e46e95" } -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech//cumulus", rev = "0be8e8fc214641e306e4f913dd64ff1913e46e95" } -pallet-collator-selection = { git = "https://github.com/paritytech//cumulus", rev = "0be8e8fc214641e306e4f913dd64ff1913e46e95" } -parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "0be8e8fc214641e306e4f913dd64ff1913e46e95" } -cumulus-client-cli = { git = "https://github.com/paritytech//cumulus", rev = "0be8e8fc214641e306e4f913dd64ff1913e46e95" } -cumulus-client-collator = { git = "https://github.com/paritytech//cumulus", rev = "0be8e8fc214641e306e4f913dd64ff1913e46e95" } -cumulus-client-network = { git = "https://github.com/paritytech//cumulus", rev = "0be8e8fc214641e306e4f913dd64ff1913e46e95" } -cumulus-client-service = { git = "https://github.com/paritytech//cumulus", rev = "0be8e8fc214641e306e4f913dd64ff1913e46e95" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech//cumulus", rev = "0be8e8fc214641e306e4f913dd64ff1913e46e95" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech//cumulus", rev = "0be8e8fc214641e306e4f913dd64ff1913e46e95" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech//cumulus", rev = "0be8e8fc214641e306e4f913dd64ff1913e46e95" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "0be8e8fc214641e306e4f913dd64ff1913e46e95" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "0be8e8fc214641e306e4f913dd64ff1913e46e95" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "0be8e8fc214641e306e4f913dd64ff1913e46e95" } -cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "0be8e8fc214641e306e4f913dd64ff1913e46e95" } -cumulus-primitives-utility = { git = "https://github.com/paritytech//cumulus", rev = "0be8e8fc214641e306e4f913dd64ff1913e46e95" } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech//cumulus", rev = "0be8e8fc214641e306e4f913dd64ff1913e46e95" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech//cumulus", rev = "0be8e8fc214641e306e4f913dd64ff1913e46e95" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +pallet-collator-selection = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-client-cli = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-client-collator = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-client-network = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-client-service = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-primitives-utility = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech//cumulus", rev = "e43b8b878a6fd0ca8b5e88d19822c4d777d3c677" } [patch."https://github.com/open-web3-stack/open-runtime-module-library"] -orml-currencies = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "1f520348f31b5e94b8a5dd7f8e6b8ec359df4177" } -orml-tokens = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "1f520348f31b5e94b8a5dd7f8e6b8ec359df4177" } -orml-unknown-tokens = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "1f520348f31b5e94b8a5dd7f8e6b8ec359df4177" } -orml-xtokens = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "1f520348f31b5e94b8a5dd7f8e6b8ec359df4177" } -orml-xcm-support = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "1f520348f31b5e94b8a5dd7f8e6b8ec359df4177" } -orml-traits = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "1f520348f31b5e94b8a5dd7f8e6b8ec359df4177" } +orml-currencies = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "33dbc5e35305d0cf5937c896dae8655ca7da95d8" } +orml-tokens = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "33dbc5e35305d0cf5937c896dae8655ca7da95d8" } +orml-unknown-tokens = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "33dbc5e35305d0cf5937c896dae8655ca7da95d8" } +orml-xtokens = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "33dbc5e35305d0cf5937c896dae8655ca7da95d8" } +orml-xcm-support = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "33dbc5e35305d0cf5937c896dae8655ca7da95d8" } +orml-traits = { git = "https://github.com/open-web3-stack//open-runtime-module-library", rev = "33dbc5e35305d0cf5937c896dae8655ca7da95d8" } diff --git a/docs/usage/configuration.md b/docs/usage/configuration.md index 83824234dd..6378f312bb 100644 --- a/docs/usage/configuration.md +++ b/docs/usage/configuration.md @@ -32,7 +32,7 @@ GenesisConfig { committee: CommitteeConfig { council_members: council_members.clone(), ..Default::default () }, // all council members can create feeds and no feeds in genesis chainlink_feed: ChainlinkFeedConfig { feeds: Default::default(), pallet_admin: Some(root_key.clone()), feed_creators: council_members }, - sudo: SudoConfig { key: root_key }, + sudo: SudoConfig { key: Some(root_key) }, parachain_info: ParachainInfoConfig { parachain_id: id }, } ``` diff --git a/node/Cargo.toml b/node/Cargo.toml index 1666ff78c3..aa6537114a 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -3,17 +3,17 @@ name = 'pint' authors = ['ChainSafe Systems'] description = 'A new Cumulus FRAME-based Substrate node, ready for hacking.' license = 'Unlicense' -version = '3.0.0' +version = '4.0.0' homepage = 'https://substrate.dev' repository = 'https://github.com/substrate-developer-hub/substrate-parachain-template' -edition = '2018' +edition = '2021' build = 'build.rs' [package.metadata.docs.rs] targets = ['x86_64-unknown-linux-gnu'] [build-dependencies] -substrate-build-script-utils = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } +substrate-build-script-utils = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } [features] shot = [ 'shot-runtime' ] @@ -22,21 +22,23 @@ runtime-benchmarks = [ 'dev-runtime/runtime-benchmarks', 'shot-runtime/runtime-benchmarks', 'pint-runtime/runtime-benchmarks', - 'polkadot-service/runtime-benchmarks' +# 'polkadot-service/runtime-benchmarks' ] [dependencies] derive_more = "0.99.16" log = "0.4.14" -codec = { package = "parity-scale-codec", version = "2.3.1" } +codec = { package = "parity-scale-codec", version = "3.0.0" } structopt = "0.3.25" +clap = { version = "3.1.6", features = ["derive"] } serde = { version = "1.0.130", features = ['derive'] } hex-literal = "0.3.3" futures = { version = "0.3.17", features = ["compat"] } -async-trait = "0.1.51" +async-trait = "0.1.55" # RPC related Dependencies jsonrpc-core = "18.0.0" +jsonrpsee = { version = "0.13.0", features = ["server", "macros"] } # Local Dependencies dev-runtime = { path = '../runtime/dev' } @@ -49,69 +51,74 @@ pint-rpc = { path = '../rpc' } pallet-asset-index-rpc = { path = '../pallets/asset-index/rpc' } # Substrate Dependencies -frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -frame-benchmarking-cli = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } +frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +frame-benchmarking-cli = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } -pallet-transaction-payment-rpc = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } +pallet-transaction-payment-rpc = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } -substrate-frame-rpc-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.13'} +substrate-frame-rpc-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26'} ## Substrate Client Dependencies -sc-basic-authorship = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sc-chain-spec = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sc-cli = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sc-client-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } -sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } -sc-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sc-executor = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sc-network = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sc-keystore = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sc-rpc = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sc-rpc-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sc-service = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', features = ['wasmtime'] } -sc-telemetry = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sc-transaction-pool = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sc-tracing = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } +sc-basic-authorship = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sc-chain-spec = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sc-cli = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sc-client-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +sc-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sc-executor = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sc-network = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sc-keystore = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sc-rpc = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sc-rpc-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sc-service = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', features = ['wasmtime'] } +sc-telemetry = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sc-transaction-pool = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sc-tracing = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } ## Substrate Primitive Dependencies -sp-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sp-block-builder = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sp-blockchain = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sp-consensus = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sp-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sp-trie = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sp-inherents = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sp-keystore = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sp-offchain = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sp-session = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sp-storage = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sp-timestamp = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sp-transaction-pool = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } +sp-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sp-block-builder = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sp-blockchain = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sp-consensus = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sp-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sp-trie = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sp-io = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +sp-inherents = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sp-keystore = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sp-offchain = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sp-session = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sp-storage = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sp-timestamp = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sp-transaction-pool = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.26", optional = true } -# Cumulus dependencies -cumulus-client-consensus-aura = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13' } -cumulus-client-consensus-common = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13' } -cumulus-client-collator = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13' } -cumulus-client-cli = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13' } -cumulus-client-network = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13' } -cumulus-client-service = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13' } -cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13' } -cumulus-primitives-parachain-inherent = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13' } -cumulus-client-consensus-relay-chain = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13' } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.13" } +# Cumulus dependencies +cumulus-client-consensus-aura = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26' } +cumulus-client-consensus-common = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26' } +cumulus-client-collator = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26' } +cumulus-client-cli = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26' } +cumulus-client-network = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26' } +cumulus-client-service = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26' } +cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26' } +cumulus-primitives-parachain-inherent = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26' } +cumulus-client-consensus-relay-chain = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26' } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = 'polkadot-v0.9.26' } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = 'polkadot-v0.9.26' } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = 'polkadot-v0.9.26' } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = 'polkadot-v0.9.26' } # Polkadot dependencies -polkadot-primitives = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13'} -polkadot-service = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13'} -polkadot-cli = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13'} -polkadot-parachain = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13'} +polkadot-primitives = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26'} +polkadot-service = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26', default-features = false} +polkadot-cli = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26'} +polkadot-parachain = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26'} -node-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } +node-executor = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } diff --git a/node/src/chain_spec/dev.rs b/node/src/chain_spec/dev.rs index 1e32f861bf..5260bb10be 100644 --- a/node/src/chain_spec/dev.rs +++ b/node/src/chain_spec/dev.rs @@ -30,7 +30,7 @@ pub fn pint_development_config(id: ParaId) -> ChainSpec { // initial collators. vec![(get_account_id_from_seed::("Alice"), get_collator_keys_from_seed("Alice"))], vec![ - PalletId(*b"Treasury").into_account(), + PalletId(*b"Treasury").into_account_truncating(), get_account_id_from_seed::("Alice"), get_account_id_from_seed::("Bob"), get_account_id_from_seed::("Alice//stash"), @@ -49,6 +49,7 @@ pub fn pint_development_config(id: ParaId) -> ChainSpec { None, None, None, + None, Extensions { relay_chain: "rococo-local".into(), para_id: id.into() }, ) } @@ -95,6 +96,7 @@ pub fn pint_local_config(id: ParaId) -> ChainSpec { None, None, None, + None, Extensions { relay_chain: "rococo-local".into(), para_id: id.into() }, ) } @@ -111,12 +113,8 @@ fn pint_testnet_genesis( balances: BalancesConfig { balances: vec![(root_key.clone(), 1 << 60)] }, treasury: Default::default(), committee: CommitteeConfig { council_members: council_members.clone(), ..Default::default() }, - chainlink_feed: ChainlinkFeedConfig { - feeds: Default::default(), - pallet_admin: Some(root_key.clone()), - feed_creators: council_members, - }, - sudo: SudoConfig { key: root_key }, + sudo: SudoConfig { key: Some(root_key) }, + general_council: Default::default(), parachain_info: ParachainInfoConfig { parachain_id: id }, collator_selection: CollatorSelectionConfig { invulnerables: initial_authorities.iter().cloned().map(|(acc, _)| acc).collect(), @@ -167,5 +165,9 @@ fn pint_testnet_genesis( statemint_config: None, }, polkadot_xcm: PolkadotXcmConfig { safe_xcm_version: Some(2) }, + oracle_operator_membership: OracleOperatorMembershipConfig { + members: vec![].try_into().unwrap(), + phantom: Default::default(), + }, } } diff --git a/node/src/chain_spec/pint.rs b/node/src/chain_spec/pint.rs index 82e03399c7..ea68c20d5f 100644 --- a/node/src/chain_spec/pint.rs +++ b/node/src/chain_spec/pint.rs @@ -30,7 +30,7 @@ pub fn pint_development_config(id: ParaId) -> ChainSpec { // initial collators. vec![(get_account_id_from_seed::("Alice"), get_collator_keys_from_seed("Alice"))], vec![ - PalletId(*b"Treasury").into_account(), + PalletId(*b"Treasury").into_account_truncating(), get_account_id_from_seed::("Alice"), get_account_id_from_seed::("Bob"), get_account_id_from_seed::("Alice//stash"), @@ -49,6 +49,7 @@ pub fn pint_development_config(id: ParaId) -> ChainSpec { None, None, None, + None, Extensions { relay_chain: "rococo-local".into(), para_id: id.into() }, ) } @@ -95,6 +96,7 @@ pub fn pint_local_config(id: ParaId) -> ChainSpec { None, None, None, + None, Extensions { relay_chain: "rococo-local".into(), para_id: id.into() }, ) } @@ -111,12 +113,8 @@ fn pint_testnet_genesis( balances: BalancesConfig { balances: vec![(root_key.clone(), 1 << 60)] }, treasury: Default::default(), committee: CommitteeConfig { council_members: council_members.clone(), ..Default::default() }, - chainlink_feed: ChainlinkFeedConfig { - feeds: Default::default(), - pallet_admin: Some(root_key.clone()), - feed_creators: council_members, - }, - sudo: SudoConfig { key: root_key }, + sudo: SudoConfig { key: Some(root_key) }, + general_council: Default::default(), parachain_info: ParachainInfoConfig { parachain_id: id }, collator_selection: CollatorSelectionConfig { invulnerables: initial_authorities.iter().cloned().map(|(acc, _)| acc).collect(), @@ -167,5 +165,9 @@ fn pint_testnet_genesis( statemint_config: None, }, polkadot_xcm: PolkadotXcmConfig { safe_xcm_version: Some(2) }, + oracle_operator_membership: OracleOperatorMembershipConfig { + members: vec![].try_into().unwrap(), + phantom: Default::default(), + }, } } diff --git a/node/src/chain_spec/shot.rs b/node/src/chain_spec/shot.rs index c44dc0ac66..1b8adf8cd4 100644 --- a/node/src/chain_spec/shot.rs +++ b/node/src/chain_spec/shot.rs @@ -30,7 +30,7 @@ pub fn pint_development_config(id: ParaId) -> ChainSpec { // initial collators. vec![(get_account_id_from_seed::("Alice"), get_collator_keys_from_seed("Alice"))], vec![ - PalletId(*b"Treasury").into_account(), + PalletId(*b"Treasury").into_account_truncating(), get_account_id_from_seed::("Alice"), get_account_id_from_seed::("Bob"), get_account_id_from_seed::("Alice//stash"), @@ -49,6 +49,7 @@ pub fn pint_development_config(id: ParaId) -> ChainSpec { None, None, None, + None, Extensions { relay_chain: "rococo-local".into(), para_id: id.into() }, ) } @@ -95,6 +96,7 @@ pub fn pint_local_config(id: ParaId) -> ChainSpec { None, None, None, + None, Extensions { relay_chain: "rococo-local".into(), para_id: id.into() }, ) } @@ -111,12 +113,8 @@ fn pint_testnet_genesis( balances: BalancesConfig { balances: vec![(root_key.clone(), 1 << 60)] }, treasury: Default::default(), committee: CommitteeConfig { council_members: council_members.clone(), ..Default::default() }, - chainlink_feed: ChainlinkFeedConfig { - feeds: Default::default(), - pallet_admin: Some(root_key.clone()), - feed_creators: council_members, - }, - sudo: SudoConfig { key: root_key }, + sudo: SudoConfig { key: Some(root_key) }, + general_council: Default::default(), parachain_info: ParachainInfoConfig { parachain_id: id }, collator_selection: CollatorSelectionConfig { invulnerables: initial_authorities.iter().cloned().map(|(acc, _)| acc).collect(), @@ -167,5 +165,9 @@ fn pint_testnet_genesis( statemint_config: None, }, polkadot_xcm: PolkadotXcmConfig { safe_xcm_version: Some(2) }, + oracle_operator_membership: OracleOperatorMembershipConfig { + members: vec![].try_into().unwrap(), + phantom: Default::default(), + }, } } diff --git a/node/src/cli.rs b/node/src/cli.rs index 6714b54c78..7c2cbc37ca 100644 --- a/node/src/cli.rs +++ b/node/src/cli.rs @@ -5,18 +5,32 @@ use crate::chain_spec; use cumulus_client_cli; use sc_cli; use std::path::PathBuf; -use structopt::StructOpt; +use clap::Parser; /// Sub-commands supported by the collator. -#[derive(Debug, StructOpt)] +#[derive(Debug, Parser)] pub enum Subcommand { /// Export the genesis state of the parachain. - #[structopt(name = "export-genesis-state")] - ExportGenesisState(ExportGenesisStateCommand), + ExportGenesisState(cumulus_client_cli::ExportGenesisStateCommand), /// Export the genesis wasm of the parachain. - #[structopt(name = "export-genesis-wasm")] - ExportGenesisWasm(ExportGenesisWasmCommand), + ExportGenesisWasm(cumulus_client_cli::ExportGenesisWasmCommand), + + #[clap(subcommand)] + Key(sc_cli::KeySubcommand), + + #[cfg(feature = "try-runtime")] + TryRuntime(try_runtime_cli::TryRuntimeCmd), + + /// Verify a signature for a message, provided on STDIN, with a given + /// (public or secret) key. + Verify(sc_cli::VerifyCmd), + + /// Generate a seed that provides a vanity address. + Vanity(sc_cli::VanityCmd), + + /// Sign a message, with a given (secret) key. + Sign(sc_cli::SignCmd), /// Build a chain specification. BuildSpec(sc_cli::BuildSpecCmd), @@ -40,69 +54,32 @@ pub enum Subcommand { Revert(sc_cli::RevertCmd), /// The custom benchmark subcommmand benchmarking runtime pallets. - #[structopt(name = "benchmark", about = "Benchmark runtime pallets.")] + // #[clap(name = "benchmark", about = "Benchmark runtime pallets.")] + #[clap(subcommand)] Benchmark(frame_benchmarking_cli::BenchmarkCmd), } -/// Command for exporting the genesis state of the parachain -#[derive(Debug, StructOpt)] -pub struct ExportGenesisStateCommand { - /// Output file name or stdout if unspecified. - #[structopt(parse(from_os_str))] - pub output: Option, - - /// Id of the parachain this state is for. - /// - /// Default: 100 - #[structopt(long)] - pub parachain_id: Option, - - /// Write output in binary. Default is to write in hex. - #[structopt(short, long)] - pub raw: bool, - - /// The name of the chain for that the genesis state should be exported. - #[structopt(short, long)] - pub chain: Option, -} - -/// Command for exporting the genesis wasm file. -#[derive(Debug, StructOpt)] -pub struct ExportGenesisWasmCommand { - /// Output file name or stdout if unspecified. - #[structopt(parse(from_os_str))] - pub output: Option, - - /// Write output in binary. Default is to write in hex. - #[structopt(short, long)] - pub raw: bool, - - /// The name of the chain for that the genesis wasm file should be exported. - #[structopt(long)] - pub chain: Option, -} - -#[derive(Debug, StructOpt)] -#[structopt(settings = &[ - structopt::clap::AppSettings::GlobalVersion, - structopt::clap::AppSettings::ArgsNegateSubcommands, - structopt::clap::AppSettings::SubcommandsNegateReqs, -])] +#[derive(Debug, Parser)] +#[clap( + propagate_version = true, + args_conflicts_with_subcommands = true, + subcommand_negates_reqs = true +)] pub struct Cli { - #[structopt(subcommand)] + #[clap(subcommand)] pub subcommand: Option, - #[structopt(flatten)] + #[clap(flatten)] pub run: cumulus_client_cli::RunCmd, /// Relaychain arguments - #[structopt(raw = true)] + #[clap(raw = true)] pub relaychain_args: Vec, /// Instant block sealing /// /// Can only be used with `--dev` - #[structopt(long = "instant-sealing")] + #[clap(long = "instant-sealing")] pub instant_sealing: bool, } @@ -128,6 +105,6 @@ impl RelayChainCli { let extension = 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.as_ref().map(|x| x.path().join("polkadot")); - Self { base_path, chain_id, base: polkadot_cli::RunCmd::from_iter(relay_chain_args) } + Self { base_path, chain_id, base: polkadot_cli::RunCmd::parse_from(relay_chain_args) } } } diff --git a/node/src/client.rs b/node/src/client.rs index 5507230ac5..41fdfb314f 100644 --- a/node/src/client.rs +++ b/node/src/client.rs @@ -123,11 +123,11 @@ pub trait ClientHandle { /// A client instance of Polkadot. #[derive(Clone)] pub enum Client { - Dev(Arc>), + Dev(Arc>), #[cfg(feature = "shot")] - Shot(Arc>), + Shot(Arc>), #[cfg(feature = "pint")] - Pint(Arc>), + Pint(Arc>), } impl ClientHandle for Client { @@ -234,6 +234,16 @@ impl sc_client_api::BlockBackend for Client { Self::Pint(client) => client.block_indexed_body(id), } } + + fn requires_full_sync(&self) -> bool { + match self { + Self::Dev(client) => client.requires_full_sync(), + #[cfg(feature = "shot")] + Self::Shot(client) => client.requires_full_sync(), + #[cfg(feature = "pint")] + Self::Pint(client) => client.requires_full_sync(), + } + } } impl sc_client_api::StorageProvider for Client { diff --git a/node/src/command.rs b/node/src/command.rs index f5f11258d0..e4c782d6ad 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -4,22 +4,18 @@ use crate::{ chain_spec, cli::{Cli, RelayChainCli, Subcommand}, - service::{self, IdentifyVariant}, + service::{self, IdentifyVariant, new_partial}, }; -use codec::Encode; -use cumulus_client_service::genesis::generate_genesis_block; use cumulus_primitives_core::ParaId; use log::info; -use polkadot_parachain::primitives::AccountIdConversion; -use primitives::Block; +// use polkadot_parachain::primitives::AccountIdConversion; use sc_cli::{ ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli, }; use sc_service::config::{BasePath, PrometheusConfig}; -use sp_core::hexdisplay::HexDisplay; -use sp_runtime::traits::Block as BlockT; -use std::{io::Write, net::SocketAddr}; +use std::{net::SocketAddr}; +use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE}; fn load_spec(id: &str, para_id: ParaId) -> std::result::Result, String> { Ok(match id { @@ -167,15 +163,6 @@ fn set_default_ss58_version(spec: &Box) { sp_core::crypto::set_default_ss58_version(ss58_version.into()); } -fn extract_genesis_wasm(chain_spec: &Box) -> Result> { - let mut storage = chain_spec.build_storage()?; - - storage - .top - .remove(sp_core::storage::well_known_keys::CODE) - .ok_or_else(|| "Could not find wasm file in genesis state!".into()) -} - macro_rules! with_runtime { ($chain_spec:expr, { $( $code:tt )* }) => { if $chain_spec.is_shot() { @@ -252,52 +239,27 @@ pub fn run() -> Result<()> { } Some(Subcommand::Revert(cmd)) => cli.create_runner(cmd)?.async_run(|mut config| { let (client, backend, _, task_manager) = service::new_chain_ops(&mut config)?; - Ok((cmd.run(client, backend), task_manager)) + Ok((cmd.run(client, backend, None), task_manager)) }), - Some(Subcommand::ExportGenesisState(params)) => { - let mut builder = sc_cli::LoggerBuilder::new(""); - builder.with_profiling(sc_tracing::TracingReceiver::Log, ""); - let _ = builder.init(); - - let block: Block = generate_genesis_block(&load_spec( - ¶ms.chain.clone().unwrap_or_default(), - params.parachain_id.unwrap_or(200).into(), - )?)?; - let raw_header = block.header().encode(); - let output_buf = if params.raw { - raw_header - } else { - format!("0x{:?}", HexDisplay::from(&block.header().encode())).into_bytes() - }; - - if let Some(output) = ¶ms.output { - std::fs::write(output, output_buf)?; - } else { - std::io::stdout().write_all(&output_buf)?; - } + Some(Subcommand::ExportGenesisState(cmd)) => { + let runner = cli.create_runner(cmd)?; + let chain_spec = &runner.config().chain_spec; - Ok(()) + with_runtime!(chain_spec, { + return runner.sync_run(|_config| { + let spec = cli.load_spec(&cmd.shared_params.chain.clone().unwrap_or_default())?; + let state_version = Cli::native_runtime_version(&spec).state_version(); + cmd.run::(&*spec, state_version) + }); + }) } - Some(Subcommand::ExportGenesisWasm(params)) => { - let mut builder = sc_cli::LoggerBuilder::new(""); - builder.with_profiling(sc_tracing::TracingReceiver::Log, ""); - let _ = builder.init(); - - let raw_wasm_blob = extract_genesis_wasm(&cli.load_spec(¶ms.chain.clone().unwrap_or_default())?)?; - let output_buf = if params.raw { - raw_wasm_blob - } else { - format!("0x{:?}", HexDisplay::from(&raw_wasm_blob)).into_bytes() - }; - - if let Some(output) = ¶ms.output { - std::fs::write(output, output_buf)?; - } else { - std::io::stdout().write_all(&output_buf)?; - } - - Ok(()) + Some(Subcommand::ExportGenesisWasm(cmd)) => { + let runner = cli.create_runner(cmd)?; + runner.sync_run(|_config| { + let spec = cli.load_spec(&cmd.shared_params.chain.clone().unwrap_or_default())?; + cmd.run(&*spec) + }) } Some(Subcommand::Benchmark(cmd)) => { if cfg!(feature = "runtime-benchmarks") { @@ -307,7 +269,32 @@ pub fn run() -> Result<()> { set_default_ss58_version(chain_spec); with_runtime!(chain_spec, { - return runner.sync_run(|config| cmd.run::(config)); + match cmd { + BenchmarkCmd::Pallet(cmd) => { + if cfg!(feature = "runtime-benchmarks") { + runner.sync_run(|config| cmd.run::(config)) + } 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, true, false)?; + cmd.run(partials.client) + }), + BenchmarkCmd::Storage(cmd) => runner.sync_run(|config| { + let partials = new_partial::(&config, true, false)?; + let db = partials.backend.expose_db(); + let storage = partials.backend.expose_storage(); + + cmd.run(config, partials.client.clone(), db, storage) + }), + BenchmarkCmd::Overhead(_) => Err("Unsupported benchmarking command".into()), + BenchmarkCmd::Machine(cmd) => { + runner.sync_run(|config| cmd.run(&config, SUBSTRATE_REFERENCE_HARDWARE.clone())) + } + } }) } else { Err("Benchmarking wasn't enabled when building the node. \ @@ -315,16 +302,22 @@ pub fn run() -> Result<()> { .into()) } } + Some(Subcommand::Key(cmd)) => cmd.run(&cli), + Some(Subcommand::Sign(cmd)) => cmd.run(), + Some(Subcommand::Verify(cmd)) => cmd.run(), + Some(Subcommand::Vanity(cmd)) => cmd.run(), None => { let runner = cli.create_runner(&cli.run.normalize())?; let chain_spec = &runner.config().chain_spec; let is_pint_dev = cli.run.base.shared_params.dev || cli.instant_sealing; + let collator_options = cli.run.collator_options(); set_default_ss58_version(chain_spec); runner.run_node_until_exit(|config| async move { - let para_id = chain_spec::Extensions::try_get(&*config.chain_spec).map(|e| e.para_id); - let id = ParaId::from(para_id.unwrap_or(200)); + let para_id = chain_spec::Extensions::try_get(&*config.chain_spec).map(|e| e.para_id) + .ok_or("Could not find parachain extension for chain-spec.")?; + let id = ParaId::from(para_id); if is_pint_dev { return service::pint_dev(config, cli.instant_sealing).map_err(Into::into); @@ -337,23 +330,24 @@ pub fn run() -> Result<()> { [RelayChainCli::executable_name()].iter().chain(cli.relaychain_args.iter()), ); - let parachain_account = AccountIdConversion::::into_account(&id); + // let parachain_account = AccountIdConversion::::into_account_truncating(&id); - let block: Block = generate_genesis_block(&config.chain_spec).map_err(|e| format!("{:?}", e))?; - let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode())); + // let block: Block = + // generate_genesis_block(&config.chain_spec, state_version).map_err(|e| format!("{:?}", e))?; + // let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode())); let polkadot_config = SubstrateCli::create_configuration(&polkadot_cli, &polkadot_cli, config.tokio_handle.clone()) .map_err(|err| format!("Relay chain argument error: {}", err))?; info!("Parachain id: {:?}", id); - info!("Parachain Account: {}", parachain_account); - info!("Parachain genesis state: {}", genesis_state); - info!("Is collating: {}", if config.role.is_authority() { "yes" } else { "no" }); + // info!("Parachain Account: {}", parachain_account); + // info!("Parachain genesis state: {}", genesis_state); + // info!("Is collating: {}", if config.role.is_authority() { "yes" } else { "no" }); with_runtime!(config.chain_spec, { { - service::start_node::(config, polkadot_config, id) + service::start_node::(config, polkadot_config, collator_options, id) .await .map(|r| r.0) .map_err(Into::into) @@ -415,11 +409,24 @@ impl CliConfiguration for RelayChainCli { self.base.base.rpc_ws(default_listen_port) } - fn prometheus_config(&self, default_listen_port: u16) -> Result> { - self.base.base.prometheus_config(default_listen_port) - } - - fn init(&self) -> Result<()> { + fn prometheus_config( + &self, + default_listen_port: u16, + chain_spec: &Box, + ) -> Result> { + self.base.base.prometheus_config(default_listen_port, chain_spec) + } + + fn init( + &self, + _support_url: &String, + _impl_version: &String, + _logger_hook: F, + _config: &sc_service::Configuration, + ) -> Result<()> + where + F: FnOnce(&mut sc_cli::LoggerBuilder, &sc_service::Configuration), + { unreachable!("PolkadotCli is never initialized; qed"); } diff --git a/node/src/service.rs b/node/src/service.rs index ed37f91566..e5c143c808 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -1,45 +1,73 @@ // Copyright 2021 ChainSafe Systems // SPDX-License-Identifier: LGPL-3.0-only // Cumulus Imports -use cumulus_client_consensus_aura::{build_aura_consensus, BuildAuraConsensusParams, SlotProportion}; +use cumulus_relay_chain_interface::{RelayChainInterface, RelayChainResult, RelayChainError}; +use cumulus_relay_chain_rpc_interface::RelayChainRPCInterface; +use cumulus_relay_chain_inprocess_interface::build_inprocess_relay_chain; +use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion}; use cumulus_client_consensus_common::ParachainConsensus; -use cumulus_client_network::build_block_announce_validator; +use cumulus_client_network::BlockAnnounceValidator; +use std::time::Duration; use cumulus_client_service::{ prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams, }; +use cumulus_client_cli::CollatorOptions; use cumulus_primitives_core::ParaId; use sc_consensus_aura::StartAuraParams; // Substrate Imports -use cumulus_primitives_parachain_inherent::MockValidationDataInherentDataProvider; +use cumulus_primitives_parachain_inherent::{MockValidationDataInherentDataProvider, MockXcmConfig}; use sc_chain_spec::ChainSpec; -use sc_client_api::ExecutorProvider; use sc_consensus::LongestChain; use sc_consensus_aura::ImportQueueParams; -use sc_executor::NativeElseWasmExecutor; +use sc_executor::{WasmExecutor}; use sc_network::NetworkService; use sc_service::{error::Error as ServiceError, Configuration, PartialComponents, Role, TFullBackend, TaskManager}; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; use sp_api::ConstructRuntimeApi; -use sp_consensus::SlotData; use sp_consensus_aura::sr25519::{AuthorityId as AuraId, AuthorityPair as AuraPair}; use sp_keystore::SyncCryptoStorePtr; use sp_runtime::traits::BlakeTwo256; use sp_trie::PrefixedMemoryDB; +use sp_blockchain::HeaderBackend; use substrate_prometheus_endpoint::Registry; use std::sync::Arc; use crate::client::*; +use polkadot_service::CollatorPair; +use jsonrpsee::RpcModule; + // Runtime type overrides type BlockNumber = u32; type Header = sp_runtime::generic::Header; pub type Block = sp_runtime::generic::Block; type Hash = sp_core::H256; -pub fn default_mock_parachain_inherent_data_provider() -> MockValidationDataInherentDataProvider { - MockValidationDataInherentDataProvider { current_para_block: 0, relay_offset: 1000, relay_blocks_per_para_block: 2 } -} +#[cfg(not(feature = "runtime-benchmarks"))] +type HostFunctions = sp_io::SubstrateHostFunctions; + +#[cfg(feature = "runtime-benchmarks")] +type HostFunctions = ( + sp_io::SubstrateHostFunctions, + frame_benchmarking::benchmarking::HostFunctions, +); + +// pub fn default_mock_parachain_inherent_data_provider() -> MockValidationDataInherentDataProvider { +// MockValidationDataInherentDataProvider { +// current_para_block: 0, +// relay_offset: 1000, +// relay_blocks_per_para_block: 2, +// xcm_config: MockXcmConfig::new( +// &*client, +// block, +// Default::default(), +// Default::default(), +// ), +// raw_downward_messages: vec![], +// raw_horizontal_messages: vec![], +// } +// } pub struct DevExecutorDispatch; impl sc_executor::NativeExecutionDispatch for DevExecutorDispatch { @@ -119,32 +147,31 @@ impl IdentifyVariant for Box { pub type FullBackend = TFullBackend; /// PINT's full client. -pub type FullClient = - sc_service::TFullClient>; +pub type FullClient = + sc_service::TFullClient>; /// Maybe PINT Dev full select chain. type MaybeFullSelectChain = Option>; -pub fn new_partial( +pub fn new_partial( config: &Configuration, dev: bool, instant_sealing: bool, ) -> Result< PartialComponents< - FullClient, + FullClient, FullBackend, MaybeFullSelectChain, sc_consensus::import_queue::BasicQueue>, - sc_transaction_pool::FullPool>, + sc_transaction_pool::FullPool>, (Option, Option), >, sc_service::Error, > where - RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, RuntimeApi::RuntimeApi: RuntimeApiCollection>, RuntimeApi::RuntimeApi: sp_consensus_aura::AuraApi, - Executor: sc_executor::NativeExecutionDispatch + 'static, { let telemetry = config .telemetry_endpoints @@ -157,14 +184,16 @@ where }) .transpose()?; - let executor = NativeElseWasmExecutor::::new( + let executor = WasmExecutor::::new( config.wasm_method, config.default_heap_pages, config.max_runtime_instances, + None, + config.runtime_cache_size, ); let (client, backend, keystore_container, task_manager) = - sc_service::new_full_parts::>( + sc_service::new_full_parts::( config, telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()), executor, @@ -200,25 +229,47 @@ where ) } else { // aura import queue - let slot_duration = sc_consensus_aura::slot_duration(&*client)?.slot_duration(); + let slot_duration = sc_consensus_aura::slot_duration(&*client)?; + let client_for_cidp = client.clone(); sc_consensus_aura::import_queue::(ImportQueueParams { block_import: client.clone(), justification_import: None, client: client.clone(), - create_inherent_data_providers: move |_, ()| async move { - let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); - - let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( - *timestamp, - slot_duration, - ); + create_inherent_data_providers: move |block: Hash, ()| { + let current_para_block = client_for_cidp + .number(block) + .expect("Header lookup should succeed") + .expect("Header passed in as parent should be present in backend."); + let client_for_xcm = client_for_cidp.clone(); + async move { + let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); - Ok((timestamp, slot, default_mock_parachain_inherent_data_provider())) + let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( + *timestamp, + slot_duration, + ); + let mocked_parachain = MockValidationDataInherentDataProvider { + current_para_block, + relay_offset: 1000, + relay_blocks_per_para_block: 2, + xcm_config: MockXcmConfig::new( + &*client_for_xcm, + block, + Default::default(), + Default::default(), + ), + raw_downward_messages: vec![], + raw_horizontal_messages: vec![], + }; + + Ok((timestamp, slot, mocked_parachain)) + } }, spawner: &task_manager.spawn_essential_handle(), registry, - can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()), + // can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()), + can_author_with: sp_consensus::AlwaysCanAuthor, check_for_equivocation: Default::default(), telemetry: telemetry.as_ref().map(|x| x.handle()), })? @@ -233,15 +284,16 @@ where create_inherent_data_providers: move |_, _| async move { let time = sp_timestamp::InherentDataProvider::from_system_time(); - let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( *time, - slot_duration.slot_duration(), + slot_duration, ); Ok((time, slot)) }, registry, - can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()), + // can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()), + can_author_with: sp_consensus::AlwaysCanAuthor, spawner: &task_manager.spawn_essential_handle(), telemetry: telemetry.as_ref().map(|telemetry| telemetry.handle()), }, @@ -260,36 +312,59 @@ where }) } +async fn build_relay_chain_interface( + polkadot_config: Configuration, + parachain_config: &Configuration, + telemetry_worker_handle: Option, + task_manager: &mut TaskManager, + collator_options: CollatorOptions, +) -> RelayChainResult<(Arc<(dyn RelayChainInterface + 'static)>, Option)> { + match collator_options.relay_chain_rpc_url { + Some(relay_chain_url) => Ok(( + Arc::new(RelayChainRPCInterface::new(relay_chain_url).await?) as Arc<_>, + None, + )), + None => build_inprocess_relay_chain( + polkadot_config, + parachain_config, + telemetry_worker_handle, + task_manager, + None, + ), + } +} + /// 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( +async fn start_node_impl( parachain_config: Configuration, polkadot_config: Configuration, + collator_options: CollatorOptions, id: ParaId, _rpc_ext_builder: RB, build_consensus: BIC, -) -> sc_service::error::Result<(TaskManager, Arc>)> +) -> sc_service::error::Result<(TaskManager, Arc>)> where RB: Fn( - Arc>, - ) -> Result, sc_service::Error> + Arc>, + // ) -> Result, sc_service::Error> + ) -> Result, sc_service::Error> + Send + 'static, - RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, RuntimeApi::RuntimeApi: RuntimeApiCollection>, RuntimeApi::RuntimeApi: sp_consensus_aura::AuraApi, - Executor: sc_executor::NativeExecutionDispatch + 'static, BIC: FnOnce( - Arc>, + Arc>, Option<&Registry>, Option, &TaskManager, - &polkadot_service::NewFull, - Arc>>, + Arc, + Arc>>, Arc>, SyncCryptoStorePtr, bool, @@ -303,29 +378,40 @@ where let params = new_partial(¶chain_config, false, false)?; let (mut telemetry, telemetry_worker_handle) = params.other; + let mut task_manager = params.task_manager; - let relay_chain_full_node = - cumulus_client_service::build_polkadot_full_node(polkadot_config, telemetry_worker_handle).map_err( - |e| match e { - polkadot_service::Error::Sub(x) => x, - s => format!("{}", s).into(), - }, - )?; + // let relay_chain_full_node = + // cumulus_client_service::build_polkadot_full_node(polkadot_config, telemetry_worker_handle).map_err( + // |e| match e { + // polkadot_service::Error::Sub(x) => x, + // s => format!("{}", s).into(), + // }, + // )?; + let (relay_chain_interface, collator_key) = build_relay_chain_interface( + polkadot_config, + ¶chain_config, + telemetry_worker_handle, + &mut task_manager, + collator_options.clone(), + ) + .await + .map_err(|e| match e { + RelayChainError::ServiceError(polkadot_service::Error::Sub(x)) => x, + s => s.to_string().into(), + })?; let client = params.client.clone(); let backend = params.backend.clone(); - let block_announce_validator = build_block_announce_validator( - relay_chain_full_node.client.clone(), + let block_announce_validator = BlockAnnounceValidator::new( + relay_chain_interface.clone(), id, - Box::new(relay_chain_full_node.network.clone()), - relay_chain_full_node.backend.clone(), ); let force_authoring = parachain_config.force_authoring; let validator = parachain_config.role.is_authority(); let prometheus_registry = parachain_config.prometheus_registry().cloned(); let transaction_pool = params.transaction_pool.clone(); - let mut task_manager = params.task_manager; + // let mut task_manager = params.task_manager; let import_queue = cumulus_client_service::SharedImportQueue::new(params.import_queue); let (network, system_rpc_tx, start_network) = sc_service::build_network(sc_service::BuildNetworkParams { config: ¶chain_config, @@ -333,7 +419,7 @@ where transaction_pool: transaction_pool.clone(), spawn_handle: task_manager.spawn_handle(), import_queue: import_queue.clone(), - block_announce_validator_builder: Some(Box::new(|_| block_announce_validator)), + block_announce_validator_builder: Some(Box::new(|_| Box::new(block_announce_validator))), warp_sync: None, })?; @@ -344,7 +430,7 @@ where Box::new(move |deny_unsafe, _| { let deps = pint_rpc::FullDeps { client: client.clone(), pool: transaction_pool.clone(), deny_unsafe }; - Ok(pint_rpc::create_full(deps)) + pint_rpc::create_full(deps).map_err(Into::into) }) }; @@ -358,7 +444,7 @@ where }; sc_service::spawn_tasks(sc_service::SpawnTasksParams { - rpc_extensions_builder, + rpc_builder: Box::new(rpc_extensions_builder), client: client.clone(), transaction_pool: transaction_pool.clone(), task_manager: &mut task_manager, @@ -381,7 +467,7 @@ where prometheus_registry.as_ref(), telemetry.as_ref().map(|t| t.handle()), &task_manager, - &relay_chain_full_node, + relay_chain_interface.clone(), transaction_pool, network, params.keystore_container.sync_keystore(), @@ -396,10 +482,12 @@ where announce_block, client: client.clone(), task_manager: &mut task_manager, - relay_chain_full_node, + relay_chain_interface, spawner, parachain_consensus, import_queue, + collator_key: collator_key.expect("Command line arguments do not allow this. qed"), + relay_chain_slot_duration: Duration::from_secs(6), }; start_collator(params).await?; @@ -409,7 +497,11 @@ where announce_block, task_manager: &mut task_manager, para_id: id, - relay_chain_full_node, + relay_chain_interface, + import_queue, + collator_options, + // relay_chain_slot_duration: Duration::from_millis(6), + relay_chain_slot_duration: Duration::from_secs(6), }; start_full_node(params)?; @@ -421,27 +513,28 @@ where } /// Start a normal parachain node. -pub async fn start_node( +pub async fn start_node( parachain_config: Configuration, polkadot_config: Configuration, + collator_options: CollatorOptions, id: ParaId, -) -> sc_service::error::Result<(TaskManager, Arc>)> +) -> sc_service::error::Result<(TaskManager, Arc>)> where - RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, RuntimeApi::RuntimeApi: RuntimeApiCollection>, RuntimeApi::RuntimeApi: sp_consensus_aura::AuraApi, - Executor: sc_executor::NativeExecutionDispatch + 'static, { start_node_impl( parachain_config, polkadot_config, + collator_options, id, - |_| Ok(Default::default()), + |_| Ok(RpcModule::new(())), |client, prometheus_registry, telemetry, task_manager, - relay_chain_node, + relay_chain_interface, transaction_pool, sync_oracle, keystore, @@ -456,25 +549,28 @@ where telemetry.clone(), ); - let relay_chain_backend = relay_chain_node.backend.clone(); - let relay_chain_client = relay_chain_node.client.clone(); - Ok(build_aura_consensus::(BuildAuraConsensusParams { + // let relay_chain_backend = relay_chain_node.backend.clone(); + // let relay_chain_client = relay_chain_node.client.clone(); + Ok(AuraConsensus::build::< + AuraPair, _, _, _, _, _, _ + >(BuildAuraConsensusParams { proposer_factory, create_inherent_data_providers: move |_, (relay_parent, validation_data)| { - let parachain_inherent = - cumulus_primitives_parachain_inherent::ParachainInherentData::create_at_with_client( - relay_parent, - &relay_chain_client, - &*relay_chain_backend, - &validation_data, - id, - ); + let relay_chain_interface = relay_chain_interface.clone(); async move { + let parachain_inherent = + cumulus_primitives_parachain_inherent::ParachainInherentData::create_at( + relay_parent, + &relay_chain_interface, + &validation_data, + id, + ).await; + let time = sp_timestamp::InherentDataProvider::from_system_time(); - let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( *time, - slot_duration.slot_duration(), + slot_duration, ); let parachain_inherent = parachain_inherent.ok_or_else(|| { @@ -484,8 +580,8 @@ where } }, block_import: client.clone(), - relay_chain_client: relay_chain_node.client.clone(), - relay_chain_backend: relay_chain_node.backend.clone(), + // relay_chain_client: relay_chain_node.client.clone(), + // relay_chain_backend: relay_chain_node.backend.clone(), para_client: client, backoff_authoring_blocks: Option::<()>::None, sync_oracle, @@ -527,7 +623,7 @@ pub fn new_chain_ops( #[cfg(feature = "shot")] { let PartialComponents { client, backend, import_queue, task_manager, .. } = - new_partial::(config, false, false)?; + new_partial::(config, false, false)?; Ok((Arc::new(Client::Shot(client)), backend, import_queue, task_manager)) } @@ -537,7 +633,7 @@ pub fn new_chain_ops( #[cfg(feature = "pint")] { let PartialComponents { client, backend, import_queue, task_manager, .. } = - new_partial::(config, false, false)?; + new_partial::(config, false, false)?; Ok((Arc::new(Client::Pint(client)), backend, import_queue, task_manager)) } @@ -562,7 +658,7 @@ fn inner_pint_dev(config: Configuration, instant_sealing: bool) -> Result(&config, true, instant_sealing)?; + } = new_partial::(&config, true, instant_sealing)?; let (network, system_rpc_tx, network_starter) = sc_service::build_network(sc_service::BuildNetworkParams { config: &config, @@ -587,7 +683,7 @@ fn inner_pint_dev(config: Configuration, instant_sealing: bool) -> Result Result Result(StartAuraParams { slot_duration: sc_consensus_aura::slot_duration(&*client)?, client: client.clone(), select_chain, block_import: crate::instant_finalize::InstantFinalizeBlockImport::new(client.clone()), proposer_factory, - create_inherent_data_providers: move |_, ()| async move { - let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); + create_inherent_data_providers: move |block: Hash, ()| { + let current_para_block = client_for_cidp + .number(block) + .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 slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( - *timestamp, - slot_duration, - ); + async move { + let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); - Ok((timestamp, slot, default_mock_parachain_inherent_data_provider())) + let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( + *timestamp, + slot_duration, + ); + let mocked_parachain = MockValidationDataInherentDataProvider { + current_para_block, + relay_offset: 1000, + relay_blocks_per_para_block: 2, + xcm_config: MockXcmConfig::new( + &*client_for_xcm, + block, + Default::default(), + Default::default(), + ), + raw_downward_messages: vec![], + raw_horizontal_messages: vec![], + }; + + Ok((timestamp, slot, mocked_parachain)) + } }, force_authoring, backoff_authoring_blocks, @@ -661,8 +806,11 @@ fn inner_pint_dev(config: Configuration, instant_sealing: bool) -> Result Result::assets(asset_id), Some(AssetAvailability::Liquid(location)) ); assert_eq!( - T::Currency::total_balance(asset_id, &T::TreasuryPalletId::get().into_account()), + T::Currency::total_balance(asset_id, &T::TreasuryPalletId::get().into_account_truncating()), million + balance ); } diff --git a/pallets/asset-index/src/lib.rs b/pallets/asset-index/src/lib.rs index 883d597edd..fd90315f6f 100644 --- a/pallets/asset-index/src/lib.rs +++ b/pallets/asset-index/src/lib.rs @@ -152,6 +152,7 @@ pub mod pallet { } #[pallet::pallet] + #[pallet::without_storage_info] #[pallet::generate_store(pub (super) trait Store)] pub struct Pallet(_); @@ -710,8 +711,8 @@ pub mod pallet { .into_iter() .filter_map(|mut redemption| { // only try to close if the lockup period is over - if redemption.end_block >= current_block && - Self::do_complete_redemption(&caller, &mut redemption.assets) + if redemption.end_block >= current_block + && Self::do_complete_redemption(&caller, &mut redemption.assets) { // all individual redemptions withdrawn, can remove them from storage Self::deposit_event(Event::WithdrawalCompleted(caller.clone(), redemption.assets)); @@ -746,7 +747,7 @@ pub mod pallet { /// The account of the treausry that keeps track of all the assets /// contributed to the index pub fn treasury_account() -> AccountIdFor { - T::TreasuryPalletId::get().into_account() + T::TreasuryPalletId::get().into_account_truncating() } /// The amount of index tokens held by the given user @@ -1110,7 +1111,7 @@ pub mod pallet { asset_id: T::AssetId, units: T::Balance, nav: T::Balance, - ) -> DispatchResult { + ) -> Result<(), DispatchError> { if units.is_zero() { return Ok(()); } @@ -1128,7 +1129,7 @@ pub mod pallet { asset_id: T::AssetId, units: T::Balance, saft_nav: T::Balance, - ) -> DispatchResult { + ) -> Result<(), DispatchError> { if units.is_zero() { return Ok(()); } @@ -1167,7 +1168,7 @@ pub mod pallet { units: T::Balance, nav: T::Balance, recipient: Option, - ) -> DispatchResult { + ) -> Result<(), DispatchError> { if units.is_zero() { return Ok(()); } @@ -1190,7 +1191,7 @@ pub mod pallet { asset_id: T::AssetId, units: T::Balance, saft_nav: T::Balance, - ) -> DispatchResult { + ) -> Result<(), DispatchError> { if units.is_zero() { return Ok(()); } diff --git a/pallets/asset-index/src/mock.rs b/pallets/asset-index/src/mock.rs index 9d39af4043..b1d80e077c 100644 --- a/pallets/asset-index/src/mock.rs +++ b/pallets/asset-index/src/mock.rs @@ -18,7 +18,7 @@ use frame_support::{ DispatchError, }, sp_std::{cell::RefCell, marker::PhantomData, ops::Range}, - traits::{Everything, GenesisBuild, LockIdentifier}, + traits::{ConstU32, Everything, GenesisBuild, LockIdentifier}, PalletId, }; use frame_system as system; @@ -61,6 +61,7 @@ pub(crate) type Amount = i128; pub(crate) type AccountId = u64; pub(crate) type AssetId = u32; pub(crate) type BlockNumber = u64; +pub(crate) type ReserveIdentifier = [u8; 8]; impl system::Config for Test { type BaseCallFilter = Everything; @@ -86,6 +87,7 @@ impl system::Config for Test { type SystemWeightInfo = (); type SS58Prefix = SS58Prefix; type OnSetCode = (); + type MaxConsumers = ConstU32<16>; } pub(crate) const ACCOUNT_ID: AccountId = 0; @@ -133,6 +135,10 @@ impl orml_tokens::Config for Test { type OnDust = (); type MaxLocks = MaxLocks; type DustRemovalWhitelist = Everything; + type MaxReserves = ConstU32<2>; + type OnKilledTokenAccount = (); + type OnNewTokenAccount = (); + type ReserveIdentifier = ReserveIdentifier; } impl pallet_saft_registry::Config for Test { diff --git a/pallets/committee/Cargo.toml b/pallets/committee/Cargo.toml index 74f727fd5c..408ebe3235 100644 --- a/pallets/committee/Cargo.toml +++ b/pallets/committee/Cargo.toml @@ -1,34 +1,37 @@ [package] authors = ['ChainSafe Systems'] description = 'FRAME pallet to implement PINT committee.' -edition = '2018' +edition = '2021' license = 'LGPL-3.0-only' name = 'pallet-committee' readme = 'README.md' repository = 'https://github.com/ChainSafe/PINT/' -version = '0.0.1' +version = '0.0.2' [dependencies] -log = { version = "0.4.14", default-features = false } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } + +log = { version = "0.4.1", default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ['derive', 'max-encoded-len'] } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } # Substrate Dependencies -frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false, optional = true } +frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false, optional = true } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } -frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } +sp-core = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26', default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +sp-api = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } [features] default = ['std'] std = [ 'log/std', 'codec/std', + 'scale-info/std', + 'sp-core/std', 'frame-support/std', 'frame-system/std', ] diff --git a/pallets/committee/src/lib.rs b/pallets/committee/src/lib.rs index dc9fe39804..f18e9b36eb 100644 --- a/pallets/committee/src/lib.rs +++ b/pallets/committee/src/lib.rs @@ -107,6 +107,7 @@ pub mod pallet { pub type Origin = CommitteeOrigin, BlockNumberFor>; #[pallet::pallet] + #[pallet::without_storage_info] #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); diff --git a/pallets/committee/src/mock.rs b/pallets/committee/src/mock.rs index 1c53c58b93..bf19e44447 100644 --- a/pallets/committee/src/mock.rs +++ b/pallets/committee/src/mock.rs @@ -23,6 +23,7 @@ use sp_core::H256; type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; +use frame_support::traits::EitherOfDiverse; // Configure a mock runtime to test the pallet. frame_support::construct_runtime!( @@ -67,6 +68,7 @@ impl system::Config for Test { type SystemWeightInfo = (); type SS58Prefix = SS58Prefix; type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } pub(crate) const PROPOSAL_SUBMISSION_PERIOD: ::BlockNumber = 10; @@ -91,7 +93,7 @@ ord_parameter_types! { } type EnsureApprovedByCommittee = - frame_system::EnsureOneOf, crate::EnsureApprovedByCommittee>; + EitherOfDiverse, crate::EnsureApprovedByCommittee>; pub struct VotingPeriodRange(PhantomData); diff --git a/pallets/committee/src/types.rs b/pallets/committee/src/types.rs index 98f77e64df..e0b0dad8b2 100644 --- a/pallets/committee/src/types.rs +++ b/pallets/committee/src/types.rs @@ -4,9 +4,10 @@ use crate::{Config, Members, Origin}; use frame_support::{ pallet_prelude::*, - sp_runtime::traits::Hash, + sp_runtime::{traits::{Hash, ConstU32}, BoundedVec}, sp_std::{self, prelude::Vec}, traits::EnsureOrigin, + sp_runtime }; use frame_system::RawOrigin; @@ -45,14 +46,15 @@ impl Proposal { /// Council members are fixed in number and can vote on proposals /// Constituent members are unbounded in number but can only veto council /// proposals -#[derive(PartialEq, Eq, Clone, RuntimeDebug, Encode, Decode, scale_info::TypeInfo)] +#[derive(PartialEq, Eq, Clone, RuntimeDebug, MaxEncodedLen, Encode, Decode, scale_info::TypeInfo)] pub enum MemberType { Council, Constituent, } /// Assignment of a member type to an accountId -#[derive(PartialEq, Eq, Clone, RuntimeDebug, Encode, Decode, scale_info::TypeInfo)] +#[derive(PartialEq, Eq, Clone, RuntimeDebug, MaxEncodedLen, Encode, Decode, scale_info::TypeInfo)] +#[codec(mel_bound(AccountId: MaxEncodedLen))] pub struct CommitteeMember { pub account_id: AccountId, pub member_type: MemberType, @@ -69,7 +71,8 @@ impl CommitteeMember { } /// A committee member together with their cast vote. -#[derive(PartialEq, Eq, Clone, RuntimeDebug, Encode, Decode, scale_info::TypeInfo)] +#[derive(PartialEq, Eq, Clone, RuntimeDebug, MaxEncodedLen, Encode, Decode, scale_info::TypeInfo)] +#[codec(mel_bound(AccountId: MaxEncodedLen))] pub struct MemberVote { pub member: CommitteeMember, pub vote: VoteKind, @@ -82,7 +85,8 @@ impl MemberVote { } /// Origin for the committee pallet. -#[derive(PartialEq, Eq, Clone, RuntimeDebug, Encode, Decode, scale_info::TypeInfo)] +#[derive(PartialEq, Eq, Clone, RuntimeDebug, Encode, Decode, MaxEncodedLen, scale_info::TypeInfo)] +#[codec(mel_bound(AccountId: MaxEncodedLen, BlockNumber: MaxEncodedLen))] pub enum CommitteeOrigin { /// Action is executed by the committee. Contains the closer account and the /// members that voted Aye @@ -93,10 +97,11 @@ pub enum CommitteeOrigin { /// Info for keeping track of a motion being voted on. /// Default is empty vectors for all votes -#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, Default, scale_info::TypeInfo)] +#[derive(PartialEq, Eq, Clone, Encode, Decode, MaxEncodedLen, RuntimeDebug, Default, scale_info::TypeInfo)] +#[codec(mel_bound(AccountId: MaxEncodedLen, BlockNumber: MaxEncodedLen))] pub struct VoteAggregate { /// The current set of votes. - pub votes: Vec>, + pub votes: BoundedVec, ConstU32<320>>, /// The hard end time of this vote. pub end: BlockNumber, } @@ -107,29 +112,30 @@ pub enum VoteRejectionReason { CouncilDeny, } -impl VoteAggregate { +impl VoteAggregate { pub fn new( ayes: Vec>, nays: Vec>, abstentions: Vec>, end: BlockNumber, ) -> Self { - let votes = sp_std::iter::empty() + let v_votes: Vec> = sp_std::iter::empty() .chain(ayes.into_iter().map(|x| x.into_vote(VoteKind::Aye))) .chain(nays.into_iter().map(|x| x.into_vote(VoteKind::Nay))) .chain(abstentions.into_iter().map(|x| x.into_vote(VoteKind::Abstain))) .collect(); + let votes= v_votes.try_into().unwrap(); Self { votes, end } } pub fn new_with_end(end: BlockNumber) -> Self { - Self { end, ..Default::default() } + Self { end, votes: Vec::new().try_into().unwrap() } } // This does not check if a vote is a duplicate, This must be done before // calling this function pub fn cast_vote(&mut self, vote: MemberVote) { - self.votes.push(vote) + self.votes.try_push(vote).unwrap() } pub fn remove_voters(&mut self, voters: &[AccountId]) { @@ -174,7 +180,7 @@ impl VoteAggregate, O>> + From> + Clone, T: Config> EnsureO fn successful_origin() -> O { use frame_benchmarking::vec; O::from(CommitteeOrigin::ApprovedByCommittee( - Default::default(), + CustomDefault::c_default(), VoteAggregate { votes: vec![ MemberVote { - member: CommitteeMember { account_id: Default::default(), member_type: MemberType::Council }, + member: CommitteeMember { account_id: CustomDefault::c_default(), member_type: MemberType::Council }, vote: VoteKind::Aye }; T::MinCouncilVotes::get() + 1 @@ -247,6 +253,17 @@ impl< #[cfg(feature = "runtime-benchmarks")] fn successful_origin() -> O { - O::from(RawOrigin::Signed(Default::default())) + O::from(RawOrigin::Signed(CustomDefault::c_default())) } } +pub trait CustomDefault { + fn c_default() -> Self; +} + +impl CustomDefault for T { + fn c_default() -> Self { + let default_value = T::decode(&mut sp_runtime::traits::TrailingZeroInput::zeroes()) + .expect("infinite length input; no invalid inputs for type; qed"); + return default_value; + } +} \ No newline at end of file diff --git a/pallets/local-treasury/Cargo.toml b/pallets/local-treasury/Cargo.toml index 4437d94303..de188e575b 100644 --- a/pallets/local-treasury/Cargo.toml +++ b/pallets/local-treasury/Cargo.toml @@ -1,37 +1,40 @@ [package] authors = ['ChainSafe Systems'] description = 'FRAME pallet to implement PINT local treasury.' -edition = '2018' +edition = '2021' license = 'LGPL-3.0-only' name = 'pallet-local-treasury' readme = 'README.md' repository = 'https://github.com/ChainSafe/PINT/' -version = '0.0.1' +version = '0.0.2' [dependencies] -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } + +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } # Substrate Dependencies -frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false, optional = true } +frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false, optional = true } [dev-dependencies] -serde = "1.0.130" -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } -frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } +serde = "1.0.132" +sp-core = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26', default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +sp-api = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } -pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } +pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } [features] default = ['std'] std = [ 'codec/std', + 'scale-info/std', + 'sp-core/std', 'frame-support/std', 'frame-system/std', ] diff --git a/pallets/local-treasury/src/benchmarking.rs b/pallets/local-treasury/src/benchmarking.rs index 7732e76c5a..31c136ce32 100644 --- a/pallets/local-treasury/src/benchmarking.rs +++ b/pallets/local-treasury/src/benchmarking.rs @@ -7,7 +7,7 @@ use frame_system::Origin; benchmarks! { withdraw { - let local_treasury: ::AccountId = PalletId(*b"Treasury").into_account(); + let local_treasury: ::AccountId = PalletId(*b"Treasury").into_account_truncating(); T::Currency::deposit_creating(&local_treasury, 10_000_000_u32.into()); let admin: ::AccountId = account("admin", 0, 0); }: _( diff --git a/pallets/local-treasury/src/lib.rs b/pallets/local-treasury/src/lib.rs index c3d1d1119e..ea4f0445f5 100644 --- a/pallets/local-treasury/src/lib.rs +++ b/pallets/local-treasury/src/lib.rs @@ -72,7 +72,7 @@ pub mod pallet { impl Pallet { /// Returns the `AccountId` of the treasury account. pub fn treasury_account() -> T::AccountId { - T::PalletId::get().into_account() + T::PalletId::get().into_account_truncating() } } diff --git a/pallets/local-treasury/src/mock.rs b/pallets/local-treasury/src/mock.rs index b27e1e12d8..27bac62c6e 100644 --- a/pallets/local-treasury/src/mock.rs +++ b/pallets/local-treasury/src/mock.rs @@ -63,6 +63,7 @@ impl system::Config for Test { type SystemWeightInfo = (); type SS58Prefix = SS58Prefix; type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } // param types for balances @@ -107,7 +108,7 @@ impl pallet_local_treasury::Config for Test { } pub fn local_treasury_account_id() -> AccountId { - LOCAL_TREASURE_PALLET_ID.into_account() + LOCAL_TREASURE_PALLET_ID.into_account_truncating() } // Build genesis storage according to the mock runtime. diff --git a/pallets/price-feed/Cargo.toml b/pallets/price-feed/Cargo.toml index 4183550056..bb76e61dd7 100644 --- a/pallets/price-feed/Cargo.toml +++ b/pallets/price-feed/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ['ChainSafe Systems'] description = 'FRAME pallet to implement PINT price feeds.' -edition = '2018' +edition = '2021' license = 'LGPL-3.0-only' name = 'pallet-price-feed' readme = 'README.md' @@ -9,42 +9,48 @@ repository = 'https://github.com/ChainSafe/PINT/' version = '0.0.1' [dependencies] + serde = { version = "1.0.130", optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } # Substrate Dependencies -frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false, optional = true } +frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false, optional = true } # PINT dependencies -pallet-chainlink-feed = { git = 'https://github.com/smartcontractkit/chainlink-polkadot', branch = 'polkadot-v0.9.13', default-features = false } primitives = { path = "../../primitives/primitives", default-features = false } +orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } +orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } [dev-dependencies] serde = "1.0.130" -sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-io = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } +sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-io = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } -pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.13' } +pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26' } [features] default = ['std'] std = [ 'serde', 'codec/std', + 'scale-info/std', 'frame-support/std', 'frame-system/std', - 'pallet-chainlink-feed/std', 'primitives/std', + 'sp-core/std', + 'sp-io/std', + 'sp-runtime/std', + 'orml-oracle/std', ] runtime-benchmarks = [ 'frame-benchmarking', 'frame-support/runtime-benchmarks', - 'pallet-chainlink-feed/runtime-benchmarks', 'primitives/runtime-benchmarks', ] diff --git a/pallets/price-feed/src/lib.rs b/pallets/price-feed/src/lib.rs index 93f259dd9b..59f0eadf42 100644 --- a/pallets/price-feed/src/lib.rs +++ b/pallets/price-feed/src/lib.rs @@ -22,8 +22,8 @@ pub use pallet::*; #[cfg(test)] mod mock; -#[cfg(test)] -pub use mock::FeedBuilder; +// #[cfg(test)] +// pub use mock::FeedBuilder; #[cfg(feature = "runtime-benchmarks")] mod benchmarking; @@ -43,24 +43,20 @@ pub mod pallet { pub use crate::traits::PriceFeedBenchmarks; #[cfg(feature = "runtime-benchmarks")] use frame_benchmarking::Zero; - #[cfg(feature = "std")] - use frame_support::traits::GenesisBuild; + pub use crate::{traits::PriceFeed, types::TimestampedValue}; use frame_support::{ pallet_prelude::*, - sp_runtime::{traits::CheckedDiv, FixedPointNumber, FixedPointOperand}, + sp_runtime::{traits::CheckedDiv}, traits::{Get, Time}, }; use frame_system::pallet_prelude::*; - use pallet_chainlink_feed::{FeedInterface, FeedOracle, RoundData}; - use primitives::traits::MaybeAssetIdConvert; + use orml_traits::{DataProvider}; pub use primitives::{AssetPricePair, Price}; + pub use primitives::traits::{MaybeAssetIdConvert}; - pub type FeedIdFor = ::FeedId; pub type MomentOf = <::Time as Time>::Moment; - pub type FeedValueFor = ::Value; - pub type TimestampedFeedValue = TimestampedValue<(FeedValueFor, u8), MomentOf>; /// Provides access to all the price feeds /// This is used to determine the equivalent amount of PINT for assets @@ -74,7 +70,7 @@ pub mod pallet { /// means of the asset pair `(base / quote)`. (e.g. DOT/PINT) #[pallet::config] pub trait Config: - frame_system::Config + pallet_chainlink_feed::Config + MaybeAssetIdConvert + frame_system::Config + MaybeAssetIdConvert { /// The origin that is allowed to insert asset -> feed mappings type AdminOrigin: EnsureOrigin; @@ -93,115 +89,44 @@ pub mod pallet { /// The weight for this pallet's extrinsics. type WeightInfo: WeightInfo; + + type DataProvider: DataProvider; } #[pallet::pallet] + #[pallet::without_storage_info] #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); - /// Store a mapping (AssetId) -> FeedId for all active assets - #[pallet::storage] - #[pallet::getter(fn asset_feed)] - pub type AssetFeeds = StorageMap<_, Blake2_128Concat, T::AssetId, FeedIdFor, OptionQuery>; - - #[pallet::storage] - #[pallet::getter(fn latest_answer_timestamp)] - /// Stores the timestamp of the latest answer of each feed (feed) -> - /// Timestamp - pub type LatestAnswerTimestamp = StorageMap<_, Twox64Concat, FeedIdFor, MomentOf, ValueQuery>; - - #[pallet::genesis_config] - pub struct GenesisConfig - where - ::FeedId: MaybeSerializeDeserialize, - { - /// The mappings to insert at genesis - pub asset_feeds: Vec<(T::AssetId, FeedIdFor)>, - } - - #[cfg(feature = "std")] - impl Default for GenesisConfig - where - ::FeedId: MaybeSerializeDeserialize, - { - fn default() -> Self { - Self { asset_feeds: Default::default() } - } - } - - #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig - where - ::FeedId: MaybeSerializeDeserialize, - { - fn build(&self) { - for (asset, feed) in &self.asset_feeds { - AssetFeeds::::insert(asset.clone(), *feed) - } - } - } - #[cfg(feature = "std")] - impl GenesisConfig - where - ::FeedId: MaybeSerializeDeserialize, - { - /// Direct implementation of `GenesisBuild::build_storage`. - /// - /// Kept in order not to break dependency. - pub fn build_storage(&self) -> Result { - >::build_storage(self) - } - - /// Direct implementation of `GenesisBuild::assimilate_storage`. - /// - /// Kept in order not to break dependency. - pub fn assimilate_storage(&self, storage: &mut frame_support::sp_runtime::Storage) -> Result<(), String> { - >::assimilate_storage(self, storage) - } - } + // #[cfg(feature = "std")] + // impl GenesisConfig + // where + // ::FeedId: MaybeSerializeDeserialize, + // { + // /// Direct implementation of `GenesisBuild::build_storage`. + // /// + // /// Kept in order not to break dependency. + // pub fn build_storage(&self) -> Result { + // >::build_storage(self) + // } + + // /// Direct implementation of `GenesisBuild::assimilate_storage`. + // /// + // /// Kept in order not to break dependency. + // pub fn assimilate_storage(&self, storage: &mut frame_support::sp_runtime::Storage) -> Result<(), String> { + // >::assimilate_storage(self, storage) + // } + // } #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] pub enum Event { - /// A new assetId -> feedId mapping was inserted - /// \[AssetId, NewFeedId, OldFeedId\] - UpdateAssetPriceFeed(T::AssetId, FeedIdFor, Option>), - /// An assetId -> feedId was removed - /// \[AssetId, FeedId\] - RemoveAssetPriceFeed(T::AssetId, FeedIdFor), } #[pallet::call] impl Pallet { - /// Maps the given asset to an existing price feed. - /// If the asset was already mapped to a price feed this will update the mapping - /// - /// Callable by the governance committee. - #[pallet::weight(::WeightInfo::map_asset_price_feed())] - pub fn map_asset_price_feed( - origin: OriginFor, - asset_id: T::AssetId, - feed_id: FeedIdFor, - ) -> DispatchResult { - T::AdminOrigin::ensure_origin(origin)?; - let old_feed_id = AssetFeeds::::mutate(&asset_id, |maybe_feed_id| maybe_feed_id.replace(feed_id)); - Self::deposit_event(Event::UpdateAssetPriceFeed(asset_id, feed_id, old_feed_id)); - Ok(()) - } - - /// Removes the the `asset` -> `feed` mapping if it exists. - /// This is a noop if the asset is not tracked. - /// - /// Callable by the governance committee. - #[pallet::weight(::WeightInfo::unmap_asset_price_feed())] - pub fn unmap_asset_price_feed(origin: OriginFor, asset_id: T::AssetId) -> DispatchResult { - T::AdminOrigin::ensure_origin(origin)?; - if let Some(feed_id) = AssetFeeds::::take(&asset_id) { - Self::deposit_event(Event::RemoveAssetPriceFeed(asset_id, feed_id)); - } - Ok(()) - } + // } #[pallet::error] @@ -216,44 +141,15 @@ pub mod pallet { ExceededAccuracy, } - #[pallet::hooks] - impl Hooks> for Pallet {} - - impl Pallet { - /// Returns the corresponding identifier for the asset's price feed - /// according to the internal mapping - pub fn asset_feed_id(asset_id: &T::AssetId) -> Option> { - AssetFeeds::::get(asset_id) - } - - /// Returns the latest value in the feed together with the feed's - /// decimals (the feed's precision) or an error if no feed was found for the given - /// or the feed doesn't contain any valid round yet. - pub fn latest_valid_value(feed_id: FeedIdFor) -> Result<(FeedValueFor, u8), DispatchError> { - let feed = pallet_chainlink_feed::Pallet::::feed(feed_id).ok_or(Error::::AssetPriceFeedNotFound)?; - ensure!(feed.first_valid_round().is_some(), Error::::InvalidFeedValue); - Ok((feed.latest_data().answer, feed.decimals())) - } - - /// Same as `latest_value` but with the time the answer was emitted - pub fn latest_timestamped_value(feed_id: FeedIdFor) -> Result, DispatchError> { - let moment = LatestAnswerTimestamp::::get(&feed_id); - let value = Self::latest_valid_value(feed_id)?; - Ok(TimestampedValue { value, moment }) - } - } - - impl PriceFeed for Pallet - where - FeedValueFor: FixedPointOperand, - { + impl PriceFeed for Pallet { fn get_price(base: T::AssetId) -> Result { - let feed = Self::asset_feed_id(&base).ok_or(Error::::AssetPriceFeedNotFound)?; + // let feed = Self::asset_feed_id(&base).ok_or(Error::::AssetPriceFeedNotFound)?; - let (value, precision) = Self::latest_valid_value(feed)?; - let multiplier = 10u128.checked_pow(precision.into()).ok_or(Error::::ExceededAccuracy)?; + // let (value, precision) = Self::latest_valid_value(feed)?; + // let multiplier = 10u128.checked_pow(precision.into()).ok_or(Error::::ExceededAccuracy)?; - Price::checked_from_rational(value, multiplier).ok_or_else(|| Error::::ExceededAccuracy.into()) + // Price::checked_from_rational(value, multiplier).ok_or_else(|| Error::::ExceededAccuracy.into()) + T::DataProvider::get(&base).ok_or_else(|| Error::::ExceededAccuracy.into()) } fn get_relative_price_pair( @@ -267,52 +163,6 @@ pub mod pallet { } } - #[cfg(feature = "runtime-benchmarks")] - impl PriceFeedBenchmarks for Pallet { - fn create_feed( - caller: ::AccountId, - asset_id: T::AssetId, - ) -> DispatchResultWithPostInfo { - use frame_benchmarking::vec; - - pallet_chainlink_feed::Pallet::::set_feed_creator( - >::Signed(pallet_chainlink_feed::Pallet::::pallet_admin()).into(), - caller.clone(), - )?; - - pallet_chainlink_feed::Pallet::::create_feed( - >::Signed(caller.clone()).into(), - 100u32.into(), - Zero::zero(), - (1u8.into(), 100u8.into()), - 1u8.into(), - 0u8, - vec![1; T::StringLimit::get() as usize], - Zero::zero(), - vec![(caller.clone(), caller.clone())], - None, - None, - )?; - - let feed_id = >::get() - 1.into(); - AssetFeeds::::insert(&asset_id, feed_id); - pallet_chainlink_feed::Pallet::::submit( - >::Signed(caller.clone()).into(), - feed_id, - 1_u32.into(), - 1.into(), - )?; - - Ok(().into()) - } - } - - impl pallet_chainlink_feed::traits::OnAnswerHandler for Pallet { - fn on_answer(feed_id: FeedIdFor, _: RoundData>) { - LatestAnswerTimestamp::::insert(feed_id, T::Time::now()); - } - } - /// Trait for the asset-index pallet extrinsic weights. pub trait WeightInfo { fn map_asset_price_feed() -> Weight; diff --git a/pallets/price-feed/src/mock.rs b/pallets/price-feed/src/mock.rs index 1ee0e1d91b..dd75dcbcfa 100644 --- a/pallets/price-feed/src/mock.rs +++ b/pallets/price-feed/src/mock.rs @@ -1,24 +1,27 @@ -// Copyright 2021 ChainSafe Systems -// SPDX-License-Identifier: LGPL-3.0-only - +// // Copyright 2021 ChainSafe Systems +// // SPDX-License-Identifier: LGPL-3.0-only +// // Required as construct_runtime! produces code that violates this lint #![allow(clippy::from_over_into)] use crate as pallet_price_feed; use frame_support::{ - dispatch::DispatchResultWithPostInfo, ord_parameter_types, parameter_types, traits::Everything, PalletId, + ord_parameter_types, parameter_types, + traits::{Everything, ConstU32, SortedMembers} }; +use frame_system::EnsureSignedBy; use frame_system as system; -use pallet_chainlink_feed::RoundId; +// use pallet_chainlink_feed::RoundId; use sp_core::H256; use sp_runtime::{ testing::Header, traits::{BlakeTwo256, IdentityLookup}, }; - +use primitives::Price; +// type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; - +// // Configure a mock runtime to test the pallet. frame_support::construct_runtime!( pub enum Test where @@ -30,7 +33,7 @@ frame_support::construct_runtime!( PriceFeed: pallet_price_feed::{Pallet, Call, Storage, Event}, Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, - ChainlinkFeed: pallet_chainlink_feed::{Pallet, Call, Storage, Event}, + OrmlOracle: orml_oracle::{Pallet, Call, Event, Storage}, } ); @@ -67,6 +70,7 @@ impl system::Config for Test { type SystemWeightInfo = (); type SS58Prefix = SS58Prefix; type OnSetCode = (); + type MaxConsumers = ConstU32<16>; } parameter_types! { @@ -74,15 +78,15 @@ parameter_types! { } impl pallet_balances::Config for Test { - type MaxLocks = (); type Balance = Balance; - type Event = Event; type DustRemoval = (); + type Event = Event; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; + type WeightInfo = (); + type MaxLocks = (); type MaxReserves = (); type ReserveIdentifier = [u8; 8]; - type WeightInfo = (); } parameter_types! { @@ -98,31 +102,6 @@ impl pallet_timestamp::Config for Test { pub(crate) const MIN_RESERVE: u64 = 100; -parameter_types! { - pub const FeedPalletId: PalletId = PalletId(*b"linkfeed"); - pub const MinimumReserve: u64 = MIN_RESERVE; - pub const StringLimit: u32 = 15; - pub const OracleLimit: u32 = 10; - pub const FeedLimit: u16 = 10; - pub const PruningWindow: u32 = 3; -} - -pub(crate) type FeedId = u16; -pub(crate) type Value = u128; -impl pallet_chainlink_feed::Config for Test { - type Event = Event; - type FeedId = FeedId; - type Value = Value; - type Currency = Balances; - type PalletId = FeedPalletId; - type MinimumReserve = MinimumReserve; - type StringLimit = StringLimit; - type OracleCountLimit = OracleLimit; - type FeedLimit = FeedLimit; - type OnAnswerHandler = PriceFeed; - type WeightInfo = (); -} - pub(crate) type AssetId = u32; pub(crate) const ADMIN_ACCOUNT_ID: AccountId = 88; @@ -135,102 +114,40 @@ ord_parameter_types! { } impl pallet_price_feed::Config for Test { - type AdminOrigin = frame_system::EnsureSignedBy; + type AdminOrigin = EnsureSignedBy; type SelfAssetId = PINTAssetId; type AssetId = AssetId; type Time = Timestamp; type Event = Event; type WeightInfo = (); + type DataProvider = OrmlOracle; } -#[derive(Debug, Clone, Default)] -pub struct FeedBuilder { - owner: Option, - payment: Option, - timeout: Option, - value_bounds: Option<(Value, Value)>, - min_submissions: Option, - description: Option>, - decimals: Option, - restart_delay: Option, - oracles: Option>, +parameter_types! { + pub const MinimumCount: u32 = 1; + pub const ExpiresIn: u64 = 1000 * 60 * 60; // 1 hours + pub static OracleMembers: Vec = vec![1, 2, 3]; } -/// Helper implementation -impl FeedBuilder { - pub fn new() -> Self { - Self::default() - } +pub struct Members; - pub fn owner(mut self, o: AccountId) -> Self { - self.owner = Some(o); - self - } - - pub fn payment(mut self, p: Balance) -> Self { - self.payment = Some(p); - self - } - - pub fn timeout(mut self, t: BlockNumber) -> Self { - self.timeout = Some(t); - self - } - - pub fn value_bounds(mut self, min: Value, max: Value) -> Self { - self.value_bounds = Some((min, max)); - self - } - - pub fn min_submissions(mut self, m: u32) -> Self { - self.min_submissions = Some(m); - self - } - - pub fn description(mut self, d: Vec) -> Self { - self.description = Some(d); - self - } - - pub fn decimals(mut self, d: u8) -> Self { - self.decimals = Some(d); - self - } - - pub fn restart_delay(mut self, d: RoundId) -> Self { - self.restart_delay = Some(d); - self - } - - pub fn oracles(mut self, o: Vec<(AccountId, AccountId)>) -> Self { - self.oracles = Some(o); - self +impl SortedMembers for Members { + fn sorted_members() -> Vec { + OracleMembers::get() } +} - pub fn build_and_store(self) -> DispatchResultWithPostInfo { - let owner = Origin::signed(self.owner.unwrap_or(1)); - let payment = self.payment.unwrap_or(20); - let timeout = self.timeout.unwrap_or(1); - let value_bounds = self.value_bounds.unwrap_or((1, 1_000)); - let min_submissions = self.min_submissions.unwrap_or(2); - let decimals = self.decimals.unwrap_or(5); - let description = self.description.unwrap_or_else(|| b"desc".to_vec()); - let oracles = self.oracles.unwrap_or_else(|| vec![(2, 4), (3, 4), (4, 4)]); - let restart_delay = self.restart_delay.unwrap_or(oracles.len().saturating_sub(1) as u32); - ChainlinkFeed::create_feed( - owner, - payment, - timeout, - value_bounds, - min_submissions, - decimals, - description, - restart_delay, - oracles, - None, - None, - ) - } +impl orml_oracle::Config for Test { + type Event = Event; + type OnNewData = (); + type CombineData = orml_oracle::DefaultCombineData; + type Time = Timestamp; + type OracleKey = AssetId; + type OracleValue = Price; + type RootOperatorAccountId = AdminAccountId; + type Members = Members; + type WeightInfo = (); + type MaxHasDispatchedSize = ConstU32<40>; } // Build genesis storage according to the mock runtime. @@ -241,13 +158,5 @@ pub fn new_test_ext() -> sp_io::TestExternalities { .assimilate_storage(&mut t) .unwrap(); - pallet_chainlink_feed::GenesisConfig:: { - feeds: Default::default(), - pallet_admin: Some(ADMIN_ACCOUNT_ID), - feed_creators: vec![1], - } - .assimilate_storage(&mut t) - .unwrap(); - t.into() } diff --git a/pallets/price-feed/src/tests.rs b/pallets/price-feed/src/tests.rs index 7069c2fcad..95d4949f9e 100644 --- a/pallets/price-feed/src/tests.rs +++ b/pallets/price-feed/src/tests.rs @@ -1,55 +1,26 @@ -// Copyright 2021 ChainSafe Systems -// SPDX-License-Identifier: LGPL-3.0-only - +// // Copyright 2021 ChainSafe Systems +// // SPDX-License-Identifier: LGPL-3.0-only +// use crate as pallet; -use crate::{mock::*, Error}; -use frame_support::{assert_noop, assert_ok}; +use crate::{mock::*, Error, mock}; +use frame_support::{assert_noop, assert_ok, traits::Hooks}; +use sp_runtime::FixedPointNumber; use pallet::PriceFeed as _; use primitives::Price; -use sp_runtime::{traits::BadOrigin, FixedPointNumber}; const ASSET_X_ID: AssetId = 2; const ASSET_Y_ID: AssetId = 3; +const ASSET_Z_ID: AssetId = 4; +const FLOAT_Y_VALUE: f64 = 4.0; +const FLOAT_Z_VALUE: f64 = 2.0; +const ASSET_X_VALUE: Price = Price::from_u32(1); #[test] -fn feed_creation_and_mapping_should_work() { +fn get_price_should_work() { new_test_ext().execute_with(|| { - // insert two feeds - assert_ok!(FeedBuilder::new().description(b"X".to_vec()).build_and_store()); - assert_ok!(FeedBuilder::new().description(b"Y".to_vec()).build_and_store()); - - // PINT asset id is not tracked yet - assert_noop!(PriceFeed::get_price(ASSET_X_ID), Error::::AssetPriceFeedNotFound); - - // map feed 0 to PINT - assert_ok!(PriceFeed::map_asset_price_feed(Origin::signed(ADMIN_ACCOUNT_ID), ASSET_X_ID, 0)); - - // map feed 1 to assetId 2 - assert_ok!(PriceFeed::map_asset_price_feed(Origin::signed(ADMIN_ACCOUNT_ID), ASSET_Y_ID, 1)); - - assert_ok!(PriceFeed::unmap_asset_price_feed(Origin::signed(ADMIN_ACCOUNT_ID), ASSET_Y_ID)); - }); -} - -#[test] -fn non_admin_cannot_map_feeds() { - new_test_ext().execute_with(|| { - assert_ok!(FeedBuilder::new().description(b"PINT".to_vec()).build_and_store()); - - assert_noop!(PriceFeed::map_asset_price_feed(Origin::signed(1), PINTAssetId::get(), 0), BadOrigin); - }) -} - -#[test] -fn cannot_get_price_pair_for_feed_without_valid_round() { - new_test_ext().execute_with(|| { - // insert two feeds - assert_ok!(FeedBuilder::new().description(b"PINT".to_vec()).build_and_store()); - assert_ok!(FeedBuilder::new().description(b"X".to_vec()).build_and_store()); - - assert_ok!(PriceFeed::map_asset_price_feed(Origin::signed(ADMIN_ACCOUNT_ID), PINTAssetId::get(), 0)); - assert_ok!(PriceFeed::map_asset_price_feed(Origin::signed(ADMIN_ACCOUNT_ID), ASSET_X_ID, 1)); - assert_noop!(PriceFeed::get_price(ASSET_X_ID), Error::::InvalidFeedValue); + assert_ok!(OrmlOracle::feed_values(Origin::signed(1), vec![(ASSET_X_ID, ASSET_X_VALUE)])); + let value = PriceFeed::get_price(ASSET_X_ID).unwrap(); + assert_eq!(value, ASSET_X_VALUE); }) } @@ -57,44 +28,12 @@ fn cannot_get_price_pair_for_feed_without_valid_round() { fn price_pair_should_be_available() { new_test_ext().execute_with(|| { // insert two feeds - let decimals = 6; - assert_ok!(FeedBuilder::new() - .description(b"X".to_vec()) - .min_submissions(1) - .decimals(decimals as u8) - .value_bounds(0, 1_000_000_000_000) - .build_and_store()); - assert_ok!(FeedBuilder::new().description(b"Y".to_vec()).min_submissions(1).decimals(0).build_and_store()); - - assert_ok!(PriceFeed::map_asset_price_feed(Origin::signed(ADMIN_ACCOUNT_ID), ASSET_X_ID, 0)); - assert_ok!(PriceFeed::map_asset_price_feed(Origin::signed(ADMIN_ACCOUNT_ID), ASSET_Y_ID, 1)); - - // insert round feed 1 - let feed_id = 0; - let round_id = 1; - let oracle = 2; - let base_submission = 1_000_000_000; - let precision = 10u128.pow(decimals); - assert_ok!(ChainlinkFeed::submit(Origin::signed(oracle), feed_id, round_id, base_submission)); - - // insert round feed 2 - let feed_id = 1; - let round_id = 1; - let oracle = 2; - let quote_submission = 200; - assert_ok!(ChainlinkFeed::submit(Origin::signed(oracle), feed_id, round_id, quote_submission)); - - let base_price = PriceFeed::get_price(ASSET_X_ID).expect("price pair should be available"); - assert_eq!(base_price, Price::saturating_from_integer((base_submission as u128) / precision)); - - let quote_price = PriceFeed::get_price(ASSET_Y_ID).expect("price pair should be available"); - assert_eq!(quote_price, Price::saturating_from_integer(quote_submission as u128)); - - let pair = PriceFeed::get_relative_price_pair(ASSET_X_ID, ASSET_Y_ID).expect("relative price available"); - - assert_eq!( - pair.price, - Price::saturating_from_rational((base_submission as u128) / precision, quote_submission) + assert_ok!(OrmlOracle::feed_values( + Origin::signed(2), + vec![(ASSET_Y_ID, Price::from_float(FLOAT_Y_VALUE)), + (ASSET_Z_ID, Price::from_float(FLOAT_Z_VALUE))]) ); + let pair = PriceFeed::get_relative_price_pair(ASSET_Y_ID, ASSET_Z_ID).expect("relative price available"); + assert_eq!(pair.price, Price::from_float(FLOAT_Y_VALUE/FLOAT_Z_VALUE)); }) } diff --git a/pallets/remote-asset-manager/Cargo.toml b/pallets/remote-asset-manager/Cargo.toml index 83529508c1..eb853d8ae9 100644 --- a/pallets/remote-asset-manager/Cargo.toml +++ b/pallets/remote-asset-manager/Cargo.toml @@ -1,40 +1,41 @@ [package] authors = ['ChainSafe Systems'] description = 'FRAME pallet to bond/unbond and transfer assets on other chains.' -edition = '2018' +edition = '2021' license = 'LGPL-3.0-only' name = 'pallet-remote-asset-manager' readme = 'README.md' repository = 'https://github.com/ChainSafe/PINT/' -version = '0.0.1' +version = '0.0.2' [dependencies] + log = { version = "0.4.14", default-features = false } -serde = { version = "1.0.130", features = ["derive"], optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +serde = { version = "1.0.132", features = ["derive"], optional = true, default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } # Substrate Dependencies -frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false, optional = true } -pallet-staking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } +frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false, optional = true } +pallet-staking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } # Polkadot Dependencies -xcm = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13', default-features = false } -xcm-executor = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13', default-features = false } +xcm = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26', default-features = false } +xcm-executor = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26', default-features = false } # Cumulus dependencies -cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } +cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } +cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } # PINT dependencies xcm-calls = {path = "../../primitives/xcm-calls", default-features = false } primitives = { path = "../../primitives/primitives", default-features = false } # orml Dependencies -orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master', default-features = false } -orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master', default-features = false } +orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } +orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } [features] @@ -42,6 +43,7 @@ default = ['std'] std = [ 'serde', 'codec/std', + 'scale-info/std', 'log/std', 'frame-support/std', 'frame-system/std', diff --git a/pallets/remote-asset-manager/src/lib.rs b/pallets/remote-asset-manager/src/lib.rs index a19df56cc1..0efd75932f 100644 --- a/pallets/remote-asset-manager/src/lib.rs +++ b/pallets/remote-asset-manager/src/lib.rs @@ -70,6 +70,8 @@ pub mod pallet { // expects a `ProxyType` of u8 and blocknumber of u32 type PalletProxyCall = ProxyCall, ProxyType, ::BlockNumber>; + pub const MAX_UNLOCKING_CHUNKS: usize = 32; + #[pallet::config] pub trait Config: frame_system::Config + MaybeAssetIdConvert { /// The balance type for cross chain transfers @@ -159,6 +161,7 @@ pub mod pallet { } #[pallet::pallet] + #[pallet::without_storage_info] #[pallet::generate_store(pub (super) trait Store)] pub struct Pallet(_); @@ -434,7 +437,7 @@ pub mod pallet { // check if we need and able to unbond funds: only with we currently have enough active funds // and room for 1 more unlocking chunk if balances.pending_redemption < ledger.active.saturating_sub(config.minimum_balance) && - ledger.unlocking.len() < pallet_staking::MAX_UNLOCKING_CHUNKS + ledger.unlocking.len() < MAX_UNLOCKING_CHUNKS { // attempt to send unbond match Self::do_transact_unbond(&config, asset, balances.pending_redemption, dest) { @@ -839,7 +842,7 @@ pub mod pallet { ensure!(amount < ledger.active.saturating_sub(config.minimum_balance), Error::::InsufficientBond); // Can't schedule unbond before withdrawing the unlocked funds first - ensure!(ledger.unlocking.len() < pallet_staking::MAX_UNLOCKING_CHUNKS, Error::::NoMoreUnbondingChunks); + ensure!(ledger.unlocking.len() < MAX_UNLOCKING_CHUNKS, Error::::NoMoreUnbondingChunks); // ensure that the PINT parachain account is the controller, because unbond // requires controller origin @@ -928,7 +931,7 @@ pub mod pallet { /// Ensures that the controller account of fn ensure_staking_controller(controller: LookupSourceFor) -> DispatchResult { ensure!( - ::Lookup::lookup(controller)? == T::SelfParaId::get().into_account(), + ::Lookup::lookup(controller)? == T::SelfParaId::get().into_account_truncating(), Error::::NoControllerPermission ); Ok(()) diff --git a/pallets/remote-treasury/Cargo.toml b/pallets/remote-treasury/Cargo.toml index a9b6a70a50..5930608da1 100644 --- a/pallets/remote-treasury/Cargo.toml +++ b/pallets/remote-treasury/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ['ChainSafe Systems'] description = 'FRAME pallet to implement PINT remote treasury.' -edition = '2018' +edition = '2021' license = 'LGPL-3.0-only' name = 'pallet-remote-treasury' readme = 'README.md' @@ -10,45 +10,46 @@ version = '0.0.1' [dependencies] log = { version = "0.4.14", default-features = false } -serde = { version = "1.0.130", features = ["derive"], optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +serde = { version = "1.0.130", features = ["derive"], optional = true, default-features = false } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } # Substrate Dependencies -frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false, optional = true } +frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false, optional = true } # Polkadot Dependencies -xcm = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13', default-features = false } -xcm-executor = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13', default-features = false } +xcm = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26', default-features = false } +xcm-executor = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26', default-features = false } # PINT dependencies primitives = { path = "../../primitives/primitives", default-features = false } # orml Dependencies -orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master', default-features = false } -orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master', default-features = false } +orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } +orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } [dev-dependencies] serde = "1.0.130" -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } -frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } +sp-core = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26', default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +sp-api = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } -pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } +pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } [features] default = ['std'] std = [ 'serde', 'codec/std', + 'scale-info/std', 'log/std', 'frame-support/std', 'frame-system/std', - + 'sp-core/std', 'xcm/std', 'xcm-executor/std', diff --git a/pallets/remote-treasury/src/lib.rs b/pallets/remote-treasury/src/lib.rs index b1f0518b39..7e61ddca4c 100644 --- a/pallets/remote-treasury/src/lib.rs +++ b/pallets/remote-treasury/src/lib.rs @@ -92,7 +92,7 @@ pub mod pallet { impl Pallet { /// Returns the `AccountId` of the treasury account. pub fn treasury_account() -> T::AccountId { - T::PalletId::get().into_account() + T::PalletId::get().into_account_truncating() } } diff --git a/pallets/saft-registry/Cargo.toml b/pallets/saft-registry/Cargo.toml index cac76588b2..bdcf272599 100644 --- a/pallets/saft-registry/Cargo.toml +++ b/pallets/saft-registry/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ['ChainSafe Systems'] description = 'FRAME pallet to implement PINT SAFT registry.' -edition = '2018' +edition = '2021' license = 'LGPL-3.0-only' name = 'pallet-saft-registry' readme = 'README.md' @@ -9,16 +9,17 @@ repository = 'https://github.com/ChainSafe/PINT/' version = '0.0.1' [dependencies] -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } + +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } # Substrate Dependencies -frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false, optional = true } +frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false, optional = true } # polkadot -xcm = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13', default-features = false } +xcm = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26', default-features = false } # PINT dependencies pallet-asset-index = {path = "../asset-index", default-features = false } @@ -28,19 +29,19 @@ primitives = { path = "../../primitives/primitives", default-features = false } serde = "1.0.130" # substrate -sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-io = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } +sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-io = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } -pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } +pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } pallet-asset-index= { path = "../asset-index" } pallet-remote-asset-manager = { path = "../remote-asset-manager" } pallet-price-feed = { path = "../price-feed" } # ORML Dependencies -orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master' } -orml-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master' } +orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26' } +orml-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26' } [package.metadata.docs.rs] targets = ['x86_64-unknown-linux-gnu'] @@ -49,12 +50,15 @@ targets = ['x86_64-unknown-linux-gnu'] default = ['std'] std = [ 'codec/std', + 'scale-info/std', 'frame-support/std', 'frame-system/std', 'xcm/std', - - 'primitives/std' + 'pallet-asset-index/std', + 'primitives/std', + 'sp-core/std', + 'sp-io/std', ] runtime-benchmarks = [ 'frame-benchmarking', diff --git a/pallets/saft-registry/src/lib.rs b/pallets/saft-registry/src/lib.rs index 9eb7f6f467..a19303c231 100644 --- a/pallets/saft-registry/src/lib.rs +++ b/pallets/saft-registry/src/lib.rs @@ -79,6 +79,7 @@ pub mod pallet { } #[pallet::pallet] + #[pallet::without_storage_info] #[pallet::generate_store(pub(super) trait Store)] pub struct Pallet(_); diff --git a/pallets/saft-registry/src/mock.rs b/pallets/saft-registry/src/mock.rs index 42f175fbca..420cbc3a6c 100644 --- a/pallets/saft-registry/src/mock.rs +++ b/pallets/saft-registry/src/mock.rs @@ -14,7 +14,7 @@ use core::cell::RefCell; use frame_support::{ assert_ok, ord_parameter_types, parameter_types, sp_std::marker::PhantomData, - traits::{Everything, LockIdentifier, StorageMapShim}, + traits::{ConstU32, Everything, LockIdentifier, StorageMapShim}, PalletId, }; use frame_system as system; @@ -62,6 +62,7 @@ pub(crate) type Amount = i128; pub(crate) type AccountId = u64; pub(crate) type AssetId = u32; pub(crate) type BlockNumber = u64; +pub(crate) type ReserveIdentifier = [u8; 8]; impl system::Config for Test { type BaseCallFilter = Everything; @@ -87,6 +88,7 @@ impl system::Config for Test { type SystemWeightInfo = (); type SS58Prefix = SS58Prefix; type OnSetCode = (); + type MaxConsumers = ConstU32<16>; } // param types for balances @@ -221,6 +223,10 @@ impl orml_tokens::Config for Test { type MaxLocks = MaxLocks; type OnDust = (); type DustRemovalWhitelist = Everything; + type MaxReserves = ConstU32<2>; + type OnKilledTokenAccount = (); + type OnNewTokenAccount = (); + type ReserveIdentifier = ReserveIdentifier; } pub(crate) const ADMIN_ACCOUNT_ID: AccountId = 1337; diff --git a/primitives/primitives/Cargo.toml b/primitives/primitives/Cargo.toml index 2c1a7d2437..4400581c91 100644 --- a/primitives/primitives/Cargo.toml +++ b/primitives/primitives/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ['ChainSafe Systems'] description = 'Primitive types and traits for PINT.' -edition = '2018' +edition = '2021' license = 'LGPL-3.0-only' name = 'primitives' readme = 'README.md' @@ -9,20 +9,22 @@ repository = 'https://github.com/ChainSafe/PINT/' version = '0.0.1' [dependencies] + serde = { version = "1.0.130", features = ["derive"], optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ['derive'] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } +codec = { package = "parity-scale-codec", version = "3.1.3", default-features = false, features = ['derive'] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } +frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } # Polkadot Dependencies -xcm = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13', default-features = false } +xcm = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26', default-features = false } [features] default = ['std'] std = [ 'serde', 'codec/std', + 'scale-info/std', 'frame-support/std', 'frame-system/std', 'xcm/std', diff --git a/primitives/xcm-calls/Cargo.toml b/primitives/xcm-calls/Cargo.toml index 4d54c5acc9..0798bd7e4b 100644 --- a/primitives/xcm-calls/Cargo.toml +++ b/primitives/xcm-calls/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ['ChainSafe Systems'] description = 'FRAME pallet with XCM bindings to FRAME pallets.' -edition = '2018' +edition = '2021' license = 'LGPL-3.0-only' name = 'xcm-calls' readme = 'README.md' @@ -10,40 +10,43 @@ version = '0.0.1' [dependencies] serde = { version = "1.0.130", features = ["derive"], optional = true } -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ['derive'] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } -frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } +codec = { package = "parity-scale-codec", version = "3.1.3", default-features = false, features = ['derive'] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } +frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } [dev-dependencies] -sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sp-staking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -frame-election-provider-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } +sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sp-staking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +frame-election-provider-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } ## Substrate Pallet Dependencies -pallet-assets = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -pallet-staking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -pallet-proxy = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -pallet-utility = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13'} -pallet-staking-reward-curve = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -pallet-timestamp = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -pallet-session = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -pallet-bags-list = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sp-npos-elections = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } +pallet-assets = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +pallet-staking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +pallet-proxy = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +pallet-utility = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26'} +pallet-staking-reward-curve = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +pallet-timestamp = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +pallet-session = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +pallet-bags-list = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sp-npos-elections = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } # Polkadot Dependencies -xcm = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13' } +xcm = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26' } [features] default = ['std'] std = [ 'serde', 'codec/std', + 'scale-info/std', + 'sp-core/std', 'frame-support/std', - 'frame-system/std' + 'frame-system/std', + "sp-npos-elections/std" ] # this feature is only for compilation now runtime-benchmarks = [] diff --git a/primitives/xcm-calls/src/lib.rs b/primitives/xcm-calls/src/lib.rs index 3ce53bcc3b..fece438c7a 100644 --- a/primitives/xcm-calls/src/lib.rs +++ b/primitives/xcm-calls/src/lib.rs @@ -75,6 +75,7 @@ use codec::{Encode, Output}; use frame_support::sp_std::marker::PhantomData; +use crate::staking::EraIndex; pub use encode_with::*; @@ -159,7 +160,7 @@ mod tests { use std::{cell::RefCell, collections::HashSet}; use codec::{Decode, Encode, MaxEncodedLen}; - use frame_election_provider_support::onchain; + use frame_election_provider_support::{onchain, SequentialPhragmen}; use frame_support::{ parameter_types, sp_runtime::traits::BlakeTwo256, @@ -281,8 +282,9 @@ mod tests { impl pallet_bags_list::Config for Test { type Event = Event; type WeightInfo = (); - type VoteWeightProvider = Staking; type BagThresholds = BagThresholds; + type Score = sp_npos_elections::VoteWeight; + type ScoreProvider = Staking; } /// Author of block is always 11 @@ -334,6 +336,7 @@ mod tests { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } impl pallet_balances::Config for Test { type MaxLocks = MaxLocks; @@ -390,11 +393,13 @@ mod tests { test_precision: 0_005_000, ); } + parameter_types! { pub const BondingDuration: EraIndex = 3; pub const RewardCurve: &'static PiecewiseLinear<'static> = &I_NPOS; pub const MaxNominatorRewardedPerValidator: u32 = 64; pub const OffendingValidatorsThreshold: Perbill = Perbill::from_percent(75); + pub const MaxNominations: u32 = 32; } thread_local! { @@ -411,13 +416,15 @@ mod tests { drop(amount); } } - - impl onchain::Config for Test { - type Accuracy = Perbill; + pub struct OnChainSequentialPhragmen; + impl onchain::Config for OnChainSequentialPhragmen { type DataProvider = Staking; + type System = Test; + type WeightInfo = (); + type Solver = SequentialPhragmen; } impl staking::Config for Test { - const MAX_NOMINATIONS: u32 = 16; + // const MAX_NOMINATIONS: u32 = 16; type Currency = Balances; type UnixTime = Timestamp; type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote; @@ -433,11 +440,17 @@ mod tests { type EraPayout = ConvertCurve; type NextNewSession = Session; type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator; - type ElectionProvider = onchain::OnChainSequentialPhragmen; + type ElectionProvider = onchain::UnboundedExecution; type GenesisElectionProvider = Self::ElectionProvider; type WeightInfo = (); type OffendingValidatorsThreshold = OffendingValidatorsThreshold; - type SortedListProvider = BagsList; + // type SortedListProvider = BagsList; + type MaxUnlockingChunks = frame_support::traits::ConstU32<32>; + type CurrencyBalance = Balance; + type MaxNominations = MaxNominations; + type VoterList = UseNominatorsAndValidatorsMap; + type BenchmarkingConfig = TestBenchmarkingConfig; + type OnStakerSlash = (); } parameter_types! { @@ -487,6 +500,7 @@ mod tests { type CallHasher = BlakeTwo256; type AnnouncementDepositBase = AnnouncementDepositBase; type AnnouncementDepositFactor = AnnouncementDepositFactor; + } impl frame_system::offchain::SendTransactionTypes for Test @@ -521,6 +535,7 @@ mod tests { type Freezer = (); type WeightInfo = (); type Extra = (); + type AssetAccountDeposit = (); } struct PalletUtilityEncoder; diff --git a/resources/pint-dev-with-chainlink-feed.json b/resources/pint-dev-with-chainlink-feed.json index c20f9b250c..36b52b2881 100644 --- a/resources/pint-dev-with-chainlink-feed.json +++ b/resources/pint-dev-with-chainlink-feed.json @@ -163,55 +163,6 @@ ] ], "statemintConfig": null - }, - "chainlinkFeed": { - "feeds": [ - { - "owner": "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY", - "payment": 1000, - "timeout": 10, - "value_bounds": [ - 1, - 1000 - ], - "min_submissions": 2, - "description": [ - 76, - 73, - 78, - 75 - ], - "decimals": 8, - "restart_delay": 0, - "oracles": [ - [ - "5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty", - "5CiPPseXPECbkjWCa6MnjNokrgYjMqmKndv2rSnekmSK2DjL" - ], - [ - "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y", - "5CiPPseXPECbkjWCa6MnjNokrgYjMqmKndv2rSnekmSK2DjL" - ], - [ - "5DAAnrj7VHTznn2AWBemMuyBwZWs6FNFjdyVXUeYum3PTXFy", - "5CiPPseXPECbkjWCa6MnjNokrgYjMqmKndv2rSnekmSK2DjL" - ], - [ - "5HGjWAeFDfFCWPsjFQdVV2Msvz2XtMktvgocEZcCj68kUMaw", - "5CiPPseXPECbkjWCa6MnjNokrgYjMqmKndv2rSnekmSK2DjL" - ] - ], - "pruning_window": null, - "max_debt": null - } - ], - "palletAdmin": "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY", - "feedCreators": [ - "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY", - "5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty", - "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y", - "5DAAnrj7VHTznn2AWBemMuyBwZWs6FNFjdyVXUeYum3PTXFy" - ] } } } diff --git a/resources/pint-dev.json b/resources/pint-dev.json index 457f493589..36b52b2881 100644 --- a/resources/pint-dev.json +++ b/resources/pint-dev.json @@ -163,16 +163,6 @@ ] ], "statemintConfig": null - }, - "chainlinkFeed": { - "feeds": [], - "palletAdmin": "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY", - "feedCreators": [ - "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY", - "5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty", - "5FLSigC9HGRKVhB9FiEo4Y3koPsNmBmLJbpXg2mp1hXcS59Y", - "5DAAnrj7VHTznn2AWBemMuyBwZWs6FNFjdyVXUeYum3PTXFy" - ] } } } diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 40881934e3..b84d0e53bb 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -1,26 +1,28 @@ [package] authors = ['ChainSafe Systems'] description = 'PINT specific RPC.' -edition = '2018' +edition = '2021' license = 'LGPL-3.0-only' name = 'pint-rpc' repository = 'https://github.com/ChainSafe/PINT/' version = '0.0.1' [dependencies] + +jsonrpsee = { version = "0.14.0", features = ["server", "macros"] } jsonrpc-core = "18.0.0" -codec = { package = "parity-scale-codec", version = "2.3.1" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } -#sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" } +codec = { package = "parity-scale-codec", version = "3.0.0" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +#sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +pallet-transaction-payment-rpc = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } # PINT dependencies pallet-asset-index-rpc= { path = "../pallets/asset-index/rpc" } diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs index d9c8d31593..727f0b2846 100644 --- a/rpc/src/lib.rs +++ b/rpc/src/lib.rs @@ -12,11 +12,12 @@ use sp_api::ProvideRuntimeApi; use sp_block_builder::BlockBuilder; use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata}; use std::sync::Arc; +use jsonrpsee::RpcModule; pub use sc_rpc::SubscriptionTaskExecutor; -/// A type representing all RPC extensions. -pub type RpcExtension = jsonrpc_core::IoHandler; +// /// A type representing all RPC extensions. +// pub type RpcExtension = jsonrpc_core::IoHandler; /// Full client dependencies. pub struct FullDeps { @@ -29,7 +30,8 @@ pub struct FullDeps { } /// Instantiate all Full RPC extensions. -pub fn create_full(deps: FullDeps) -> RpcExtension +pub fn create_full(deps: FullDeps +) -> Result, Box> where C: ProvideRuntimeApi, C: HeaderBackend + HeaderMetadata, @@ -40,18 +42,29 @@ where C::Api: BlockBuilder, P: TransactionPool + Sync + Send + 'static, { - use pallet_asset_index_rpc::{AssetIndexApi, AssetIndexBackend}; - use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi}; - use substrate_frame_rpc_system::{FullSystem, SystemApi}; + use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer}; + use substrate_frame_rpc_system::{System, SystemApiServer}; - let mut io = jsonrpc_core::IoHandler::default(); + // use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi}; + // use pallet_asset_index_rpc::{AssetIndexApi, AssetIndexBackend}; + // use substrate_frame_rpc_system::{FullSystem, SystemApi}; + // let mut io = jsonrpc_core::IoHandler::default(); + // let FullDeps { client, pool, deny_unsafe } = deps; + // + // io.extend_with(SystemApi::to_delegate(FullSystem::new(client.clone(), pool, deny_unsafe))); + // io.extend_with(TransactionPaymentApi::to_delegate(TransactionPayment::new(client.clone()))); + // // Making synchronous calls in light client freezes the browser currently, + // // more context: https://github.com/paritytech/substrate/pull/3480 + // // These RPCs should use an asynchronous caller instead. + // io.extend_with(AssetIndexApi::to_delegate(AssetIndexBackend::new(client))); + // io + + let mut module = RpcModule::new(()); let FullDeps { client, pool, deny_unsafe } = deps; - io.extend_with(SystemApi::to_delegate(FullSystem::new(client.clone(), pool, deny_unsafe))); - io.extend_with(TransactionPaymentApi::to_delegate(TransactionPayment::new(client.clone()))); - // Making synchronous calls in light client freezes the browser currently, - // more context: https://github.com/paritytech/substrate/pull/3480 - // These RPCs should use an asynchronous caller instead. - io.extend_with(AssetIndexApi::to_delegate(AssetIndexBackend::new(client))); - io + module.merge(System::new(client.clone(), pool.clone(), deny_unsafe).into_rpc())?; + module.merge(TransactionPayment::new(client.clone()).into_rpc())?; + + + Ok(module) } diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 11f6dec440..9ec421207f 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -1,6 +1,6 @@ [package] authors = ['ChainSafe Systems'] -edition = '2018' +edition = '2021' homepage = 'https://github.com/ChainSafe/PINT' license = 'LGPL-3.0-only' name = 'runtime-common' @@ -8,23 +8,21 @@ repository = 'https://github.com/substrate-developer-hub/substrate-parachain-tem version = '0.0.1' [dependencies] -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ['derive'] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ['derive'] } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } -frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-std = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } +frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-std = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } # xcm -xcm = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13', default-features = false } +xcm = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26', default-features = false } xcm-calls = { path = "../../primitives/xcm-calls", default-features = false } -cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } +cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } # orml -orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master', default-features = false } - -# chainlink -pallet-chainlink-feed = { git = 'https://github.com/smartcontractkit/chainlink-polkadot', branch = 'polkadot-v0.9.13', default-features = false } +orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } +orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } # pint primitives = { path = '../../primitives/primitives', default-features = false } @@ -40,7 +38,8 @@ pallet-remote-asset-manager = { path = '../../pallets/remote-asset-manager', def default = ['std'] std = [ 'codec/std', - "frame-support/std", + 'scale-info/std', + 'frame-support/std', 'frame-system/std', 'sp-std/std', 'scale-info/std', @@ -57,6 +56,5 @@ std = [ 'pallet-price-feed/std', 'pallet-remote-asset-manager/std', 'pallet-saft-registry/std', - 'pallet-chainlink-feed/std', "primitives/std", ] diff --git a/runtime/common/src/constants.rs b/runtime/common/src/constants.rs index 9e6e8c73c5..57d962234c 100644 --- a/runtime/common/src/constants.rs +++ b/runtime/common/src/constants.rs @@ -116,7 +116,7 @@ parameter_types! { pub const PalletIndexStringLimit: u32 = 50; pub const Period: u32 = 6 * HOURS; pub const PINTAssetId: AssetId = 1; - pub PintTreasuryAccount: AccountId = TreasuryPalletId::get().into_account(); + pub PintTreasuryAccount: AccountId = TreasuryPalletId::get().into_account_truncating(); pub const PotId: PalletId = PalletId(*b"PotStake"); pub const RedemptionFee: RedemptionFeeRange = RedemptionFeeRange { range: [(DAYS * 7, FeeRate { numerator: 1, denominator: 10 }), (DAYS * 30, FeeRate{ numerator: 3, denominator: 100 })], @@ -180,13 +180,21 @@ parameter_types! { pub const TreasuryPalletId: PalletId = PalletId(*b"Treasury"); pub const ProposalBond: Permill = Permill::from_percent(3); pub const ProposalBondMinimum: Balance = 5 * DOLLARS; + pub const ProposalBondMaximum: Balance = 50 * DOLLARS; pub const SpendPeriod: BlockNumber = 7 * DAYS; pub const Burn: Permill = Permill::from_percent(0); pub const MaxApprovals: u32 = 100; + + // orml_xtokens + pub const MaxAssetsForTransfer: usize = 2; + pub const MaxReserves: u32 = 8; + + // pallet_scheduler + pub const NoPreimagePostponement: Option = Some(5 * MINUTES); } pub fn get_all_pallet_accounts() -> Vec { - vec![TreasuryPalletId::get().into_account()] + vec![TreasuryPalletId::get().into_account_truncating()] } pub struct DustRemovalWhitelist; @@ -203,6 +211,12 @@ parameter_type_with_key! { }; } +parameter_type_with_key! { + pub ParachainZeroFee: |_location: MultiLocation| -> Option { + Some(0) + }; +} + // The minimum amount of assets that should remain unbonded. parameter_type_with_key! { pub MinimumRemoteReserveBalance: |_asset_id: AssetId| -> Balance { diff --git a/runtime/common/src/types.rs b/runtime/common/src/types.rs index 74a391c2cd..6513ba80a5 100644 --- a/runtime/common/src/types.rs +++ b/runtime/common/src/types.rs @@ -1,10 +1,13 @@ // Copyright 2021 ChainSafe Systems // SPDX-License-Identifier: LGPL-3.0-only use sp_std::marker::PhantomData; +use frame_support::{sp_runtime, traits::EitherOfDiverse, weights::{WeightToFee, Weight}}; +use primitives::Balance; +use crate::constants::TransactionByteFee; +use sp_runtime::SaturatedConversion; /// Origin either `Root` or `CommitteeOrigin` -pub type GovernanceOrigin = frame_system::EnsureOneOf< - AccountId, +pub type GovernanceOrigin = EitherOfDiverse< pallet_committee::EnsureApprovedByCommittee, frame_system::EnsureRoot, >; @@ -37,3 +40,18 @@ impl pallet_asset_index::traits::LockupPeriodRange Self::Balance { + Self::Balance::saturated_from(*weight) + .saturating_mul(CustomLengthToFee::LENGTH_FEE) + } +} \ No newline at end of file diff --git a/runtime/common/src/weights/mod.rs b/runtime/common/src/weights/mod.rs index 95c501bf02..d25fea5f67 100644 --- a/runtime/common/src/weights/mod.rs +++ b/runtime/common/src/weights/mod.rs @@ -1,12 +1,12 @@ // Copyright 2021 ChainSafe Systems // SPDX-License-Identifier: LGPL-3.0-only pub mod pallet_asset_index; -pub mod pallet_chainlink_feed; pub mod pallet_committee; pub mod pallet_local_treasury; pub mod pallet_price_feed; pub mod pallet_remote_asset_manager; pub mod pallet_saft_registry; +pub mod orml_oracle; use crate::traits::XcmRuntimeCallWeights; use frame_support::weights::{constants::RocksDbWeight, Weight}; diff --git a/runtime/common/src/weights/orml_oracle.rs b/runtime/common/src/weights/orml_oracle.rs new file mode 100644 index 0000000000..3c19256680 --- /dev/null +++ b/runtime/common/src/weights/orml_oracle.rs @@ -0,0 +1,66 @@ +// This file is part of Acala. + +// Copyright (C) 2020-2022 Acala Foundation. +// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0 + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +//! Autogenerated weights for orml_oracle +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-03-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 + +// Executed Command: +// target/production/acala +// benchmark +// --chain=dev +// --steps=50 +// --repeat=20 +// --pallet=* +// --extrinsic=* +// --execution=wasm +// --wasm-execution=compiled +// --heap-pages=4096 +// --template=./templates/runtime-weight-template.hbs +// --output=./runtime/mandala/src/weights/ + +#![cfg_attr(rustfmt, rustfmt_skip)] +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::Weight}; +use sp_std::marker::PhantomData; + +/// Weight functions for orml_oracle. +pub struct WeightInfo(PhantomData); +impl orml_oracle::WeightInfo for WeightInfo { + // Storage: AcalaOracle HasDispatched (r:1 w:1) + // Storage: Timestamp Now (r:1 w:0) + // Storage: AcalaOracle RawValues (r:0 w:1) + // Storage: AcalaOracle IsUpdated (r:0 w:1) + fn feed_values(c: u32, ) -> Weight { + (12_541_000 as Weight) + // Standard Error: 39_000 + .saturating_add((1_866_000 as Weight).saturating_mul(c as Weight)) + .saturating_add(T::DbWeight::get().reads(2 as Weight)) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(c as Weight))) + } + // Storage: AcalaOracle HasDispatched (r:0 w:1) + fn on_finalize() -> Weight { + (2_862_000 as Weight) + .saturating_add(T::DbWeight::get().writes(1 as Weight)) + } +} diff --git a/runtime/common/src/weights/pallet_chainlink_feed.rs b/runtime/common/src/weights/pallet_chainlink_feed.rs deleted file mode 100644 index 48f3c44e83..0000000000 --- a/runtime/common/src/weights/pallet_chainlink_feed.rs +++ /dev/null @@ -1,170 +0,0 @@ -// Copyright 2021 ChainSafe Systems -// SPDX-License-Identifier: LGPL-3.0-only - -//! Autogenerated weights for pallet_chainlink_feed -//! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 -//! DATE: 2021-05-20, STEPS: `[20, ]`, REPEAT: 10, LOW RANGE: `[]`, HIGH RANGE: -//! `[]` EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: -//! 128 - -// Executed Command: -// ./target/release/pint -// benchmark -// --execution -// wasm -// --wasm-execution -// compiled -// --pallet -// pallet_chainlink_feed -// -e -// * -// -s -// 20 -// -r -// 10 -// --raw -// --output -// ./runtime/src/weights - -#![allow(unused_parens)] -#![allow(unused_imports)] - -use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; - -/// Weight functions for pallet_chainlink_feed. -pub struct WeightInfo(PhantomData); -impl pallet_chainlink_feed::WeightInfo for WeightInfo { - fn create_feed(o: u32) -> Weight { - (38_850_000 as Weight) - // Standard Error: 66_000 - .saturating_add((15_164_000 as Weight).saturating_mul(o as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(o as Weight))) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(o as Weight))) - } - fn transfer_ownership() -> Weight { - (21_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - - fn cancel_ownership_transfer() -> Weight { - Default::default() - } - - fn accept_ownership() -> Weight { - (20_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - fn set_pruning_window(o: u32) -> Weight { - (1_727_000 as Weight) - // Standard Error: 14_000 - .saturating_add((3_253_000 as Weight).saturating_mul(o as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(o as Weight))) - } - fn submit_opening_round_answers() -> Weight { - (90_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(6 as Weight)) - .saturating_add(T::DbWeight::get().writes(6 as Weight)) - } - fn submit_closing_answer(o: u32) -> Weight { - (72_296_000 as Weight) - // Standard Error: 18_000 - .saturating_add((211_000 as Weight).saturating_mul(o as Weight)) - .saturating_add(T::DbWeight::get().reads(7 as Weight)) - .saturating_add(T::DbWeight::get().writes(6 as Weight)) - } - fn change_oracles(d: u32, n: u32) -> Weight { - (0 as Weight) - // Standard Error: 81_000 - .saturating_add((14_745_000 as Weight).saturating_mul(d as Weight)) - // Standard Error: 81_000 - .saturating_add((17_320_000 as Weight).saturating_mul(n as Weight)) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(d as Weight))) - .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(n as Weight))) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(d as Weight))) - .saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(n as Weight))) - } - fn update_future_rounds() -> Weight { - (22_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - fn set_requester() -> Weight { - (25_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - fn remove_requester() -> Weight { - (23_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - fn request_new_round() -> Weight { - (48_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(4 as Weight)) - .saturating_add(T::DbWeight::get().writes(4 as Weight)) - } - fn withdraw_payment() -> Weight { - (53_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(3 as Weight)) - } - fn transfer_admin() -> Weight { - (19_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - - fn cancel_admin_transfer() -> Weight { - Default::default() - } - - fn accept_admin() -> Weight { - (19_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - fn withdraw_funds() -> Weight { - (50_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(3 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn reduce_debt() -> Weight { - (31_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn transfer_pallet_admin() -> Weight { - (17_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - - fn cancel_pallet_admin_transfer() -> Weight { - Default::default() - } - - fn accept_pallet_admin() -> Weight { - (18_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(2 as Weight)) - } - fn set_feed_creator() -> Weight { - (17_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } - fn remove_feed_creator() -> Weight { - (17_000_000 as Weight) - .saturating_add(T::DbWeight::get().reads(1 as Weight)) - .saturating_add(T::DbWeight::get().writes(1 as Weight)) - } -} diff --git a/runtime/dev/Cargo.toml b/runtime/dev/Cargo.toml index ef82cb13fe..6887f6c6b9 100644 --- a/runtime/dev/Cargo.toml +++ b/runtime/dev/Cargo.toml @@ -1,93 +1,94 @@ [package] authors = ['ChainSafe Systems'] -edition = '2018' +edition = '2021' homepage = 'https://substrate.dev' license = 'LGPL-3.0-only' name = 'dev-runtime' repository = 'https://github.com/substrate-developer-hub/substrate-parachain-template' -version = '2.0.0' +version = '4.0.0' [package.metadata.docs.rs] targets = ['x86_64-unknown-linux-gnu'] [build-dependencies] -substrate-wasm-builder = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } +substrate-wasm-builder = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } [dependencies] -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ['derive', 'max-encoded-len'] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ['derive', 'max-encoded-len'] } +scale-info = { version = "2.1", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } -serde = { version = "1.0.130", optional = true, features = ['derive'] } -hex-literal = { version = "0.3.3", optional = true } +serde = { version = "1.0.136", optional = true, features = ['derive'] } +hex-literal = { version = "0.3.1", optional = true } # Substrate Dependencies ## Substrate Primitive Dependencies -sp-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-block-builder = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-inherents = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-io = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-offchain = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-session = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-std = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-transaction-pool = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-try-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false, optional = true } -sp-version = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } +sp-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-block-builder = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-inherents = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-io = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-offchain = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-session = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-std = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-transaction-pool = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-try-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false, optional = true } +sp-version = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } ## Substrate FRAME Dependencies -frame-executive = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false, optional = true } -frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-system-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false, optional = true } -frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } +frame-executive = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false, optional = true } +frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-system-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false, optional = true } +frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } ## Substrate Pallet Dependencies -pallet-aura = { git = 'https://github.com/paritytech/substrate', default-features = false, branch = 'polkadot-v0.9.13' } -pallet-authorship = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false} -pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } -pallet-randomness-collective-flip = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -pallet-session = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false, features = ['historical'] } -pallet-sudo = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -pallet-timestamp = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -pallet-transaction-payment = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -pallet-utility = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -pallet-scheduler = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -pallet-treasury = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } +pallet-aura = { git = 'https://github.com/paritytech/substrate', default-features = false, branch = 'polkadot-v0.9.26' } +pallet-authorship = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false} +pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26', default-features = false } +pallet-randomness-collective-flip = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-session = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false, features = ['historical'] } +pallet-sudo = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-timestamp = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-transaction-payment = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-asset-tx-payment = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-utility = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-scheduler = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-treasury = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26', default-features = false } # Cumulus Dependencies -pallet-collator-selection = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -cumulus-pallet-aura-ext = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.13", default-features = false } -parachain-info = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -pallet-asset-tx-payment = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } - +pallet-collator-selection = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } +cumulus-pallet-aura-ext = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } +cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } +cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } +cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } +cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } +cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } +cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = 'polkadot-v0.9.26', default-features = false } +parachain-info = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } # Polkadot Dependencies -polkadot-parachain = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13', default-features = false } -xcm = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13', default-features = false } -xcm-builder = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13', default-features = false } -xcm-executor = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13', default-features = false } -pallet-xcm = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13', default-features = false } +polkadot-parachain = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26', default-features = false } +xcm = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26', default-features = false } +xcm-builder = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26', default-features = false } +xcm-executor = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26', default-features = false } +pallet-xcm = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26', default-features = false } # ORML Dependencies -orml-currencies = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master', default-features = false } -orml-unknown-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master', default-features = false } -orml-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master', default-features = false } -orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master', default-features = false } -orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master', default-features = false } -orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master', default-features = false } +orml-currencies = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } +orml-unknown-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } +orml-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } +orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } +orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } +orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } +orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } # PINT dependencies runtime-common = {path = '../common', default-features = false } @@ -102,11 +103,9 @@ primitives = { path = '../../primitives/primitives', default-features = false } xcm-calls = { path = '../../primitives/xcm-calls', default-features = false } pallet-asset-index-rpc-runtime-api = { path = '../../pallets/asset-index/rpc/runtime-api', default-features = false } -pallet-chainlink-feed = { git = 'https://github.com/smartcontractkit/chainlink-polkadot', branch = 'polkadot-v0.9.13', default-features = false } - [dev-dependencies] -hex-literal = "0.3.3" -hex = "0.4.3" +hex-literal = "0.3.1" +hex = "0.4" [features] default = ['std'] @@ -171,8 +170,8 @@ std = [ 'pallet-sudo/std', 'pallet-session/std', 'pallet-transaction-payment/std', - 'pallet-xcm/std', 'pallet-asset-tx-payment/std', + 'pallet-xcm/std', 'pallet-utility/std', 'pallet-scheduler/std', 'pallet-treasury/std', @@ -190,7 +189,7 @@ std = [ 'xcm-builder/std', 'xcm-executor/std', - 'runtime-common/std', + 'runtime-common/std', 'pallet-asset-index/std', "pallet-collator-selection/std", 'pallet-committee/std', @@ -202,7 +201,6 @@ std = [ 'xcm-calls/std', 'primitives/std', 'pallet-asset-index-rpc-runtime-api/std', - 'pallet-chainlink-feed/std', 'orml-currencies/std', 'orml-unknown-tokens/std', @@ -210,4 +208,7 @@ std = [ 'orml-xtokens/std', 'orml-xcm-support/std', 'orml-traits/std', + 'orml-oracle/std', + + 'polkadot-parachain/std', ] diff --git a/runtime/dev/src/lib.rs b/runtime/dev/src/lib.rs index f5ee049062..96d92a4847 100644 --- a/runtime/dev/src/lib.rs +++ b/runtime/dev/src/lib.rs @@ -12,18 +12,19 @@ use codec::Decode; // Polkadot imports use cumulus_primitives_core::ParaId; pub use frame_support::{ - construct_runtime, match_type, ord_parameter_types, parameter_types, - traits::{EqualPrivilegeOnly, IsInVec, Randomness}, + construct_runtime, ord_parameter_types, match_types, parameter_types, + traits::{EqualPrivilegeOnly, IsInVec, Randomness, ConstU32}, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, - DispatchClass, IdentityFee, Weight, + DispatchClass, IdentityFee, Weight }, PalletId, StorageValue, }; +pub use orml_traits::{location::AbsoluteReserveProvider}; // orml imports use orml_currencies::BasicCurrencyAdapter; -use orml_xcm_support::{IsNativeConcrete, MultiCurrencyAdapter, MultiNativeAsset}; +use orml_xcm_support::{IsNativeConcrete, MultiCurrencyAdapter, MultiNativeAsset, DepositToAlternative}; pub use pallet_balances::Call as BalancesCall; pub use pallet_timestamp::Call as TimestampCall; use pallet_xcm::XcmPassthrough; @@ -49,7 +50,7 @@ use xcm::v1::{ }; use xcm_builder::{ AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, - EnsureXcmOrigin, FixedRateOfFungible, FixedWeightBounds, LocationInverter, ParentIsDefault, RelayChainAsNative, + EnsureXcmOrigin, FixedRateOfFungible, FixedWeightBounds, LocationInverter, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeRevenue, TakeWeightCredit, }; @@ -58,11 +59,9 @@ use xcm_executor::XcmExecutor; use frame_support::traits::{Everything, Nothing}; use frame_system::EnsureRoot; use pallet_committee::EnsureMember; - use primitives::traits::MultiAssetRegistry; pub use primitives::*; -use runtime_common::payment::BalanceToAssetBalance; -pub use runtime_common::{constants::*, types::*, weights}; +pub use runtime_common::{constants::*, types::*, weights, payment::BalanceToAssetBalance}; use xcm_calls::{ proxy::{ProxyCallEncoder, ProxyType}, staking::StakingCallEncoder, @@ -103,6 +102,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 1, + state_version: 1, }; /// The version information used to identify this runtime when compiled @@ -180,6 +180,8 @@ impl frame_system::Config for Runtime { type SS58Prefix = SS58Prefix; /// The set code logic of the parachain. type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode; + + type MaxConsumers = ConstU32<16>; } parameter_types! { @@ -209,8 +211,10 @@ impl pallet_balances::Config for Runtime { } impl pallet_transaction_payment::Config for Runtime { + type Event = Event; type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter; - type TransactionByteFee = TransactionByteFee; + // type TransactionByteFee = TransactionByteFee; + type LengthToFee = CustomLengthToFee; type OperationalFeeMultiplier = OperationalFeeMultiplier; type WeightToFee = IdentityFee; type FeeMultiplierUpdate = (); @@ -223,13 +227,15 @@ impl pallet_sudo::Config for Runtime { impl cumulus_pallet_parachain_system::Config for Runtime { type Event = Event; - type OnValidationData = (); + // type OnValidationData = (); + type OnSystemEvent = (); type SelfParaId = parachain_info::Pallet; type OutboundXcmpMessageSource = XcmpQueue; type DmpMessageHandler = DmpQueue; type ReservedDmpWeight = ReservedDmpWeight; type XcmpMessageHandler = XcmpQueue; type ReservedXcmpWeight = ReservedXcmpWeight; + type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; } impl parachain_info::Config for Runtime {} @@ -242,7 +248,7 @@ impl cumulus_pallet_aura_ext::Config for Runtime {} /// the dispatch Origin. pub type LocationToAccountId = ( // The parent (Relay-chain) origin converts to the default `AccountId`. - ParentIsDefault, + ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, // Straight up local `AccountId32` origins just alias directly to `AccountId`. @@ -261,6 +267,7 @@ pub type LocalAssetTransactor = MultiCurrencyAdapter< LocationToAccountId, AssetId, AssetIdConvert, + DepositToAlternative, >; /// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance, @@ -284,7 +291,7 @@ pub type XcmOriginToCallOrigin = ( XcmPassthrough, ); -match_type! { +match_types! { pub type ParentOrParentsUnitPlurality: impl Contains = { MultiLocation { parents: 1, interior: Here } | MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Unit, .. }) } @@ -326,7 +333,7 @@ impl xcm_executor::Config for XcmConfig { // How to withdraw and deposit an asset. type AssetTransactor = LocalAssetTransactor; type OriginConverter = XcmOriginToCallOrigin; - type IsReserve = MultiNativeAsset; + type IsReserve = MultiNativeAsset; type IsTeleporter = (); type LocationInverter = LocationInverter; type Barrier = Barrier; @@ -376,6 +383,10 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type XcmExecutor = XcmExecutor; type ChannelInfo = ParachainSystem; type VersionWrapper = PolkadotXcm; + type ExecuteOverweightOrigin = EnsureRoot; + type ControllerOrigin = EnsureRoot; + type ControllerOriginConverter = XcmOriginToCallOrigin; + type WeightInfo = cumulus_pallet_xcmp_queue::weights::SubstrateWeight; } impl cumulus_pallet_dmp_queue::Config for Runtime { @@ -497,23 +508,10 @@ impl pallet_price_feed::Config for Runtime { type AssetId = AssetId; type Time = Timestamp; type Event = Event; + type DataProvider = OrmlOracle; type WeightInfo = weights::pallet_price_feed::WeightInfo; } -impl pallet_chainlink_feed::Config for Runtime { - type Event = Event; - type FeedId = FeedId; - type Value = Value; - type Currency = Balances; - type PalletId = FeedPalletId; - type MinimumReserve = MinimumReserve; - type StringLimit = StringLimit; - type OracleCountLimit = OracleLimit; - type FeedLimit = FeedLimit; - type OnAnswerHandler = PriceFeed; - type WeightInfo = (); -} - /// Range of lockup period pub struct LockupPeriodRangeDev(sp_std::marker::PhantomData); @@ -530,7 +528,7 @@ impl pallet_asset_index::traits::LockupPeriodRange; + type AdminOrigin = EnsureMember;//CommitteeOrigin; type IndexToken = Balances; type Balance = Balance; type MaxActiveDeposits = MaxActiveDeposits; @@ -566,10 +564,14 @@ impl orml_tokens::Config for Runtime { type OnDust = orml_tokens::TransferDust; type MaxLocks = MaxLocks; type DustRemovalWhitelist = DustRemovalWhitelist; + type ReserveIdentifier = [u8; 8]; + type MaxReserves = (); + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } impl orml_currencies::Config for Runtime { - type Event = Event; + // type Event = Event; type MultiCurrency = Tokens; type NativeCurrency = BasicCurrencyAdapter; type GetNativeCurrencyId = PINTAssetId; @@ -587,6 +589,10 @@ impl orml_xtokens::Config for Runtime { type Weigher = FixedWeightBounds; type BaseXcmWeight = BaseXcmWeight; type LocationInverter = LocationInverter; + type MaxAssetsForTransfer = MaxAssetsForTransfer; + type ReserveProvider = AbsoluteReserveProvider; + type MinXcmFee = ParachainZeroFee; + type MultiLocationsFilter = Everything; } impl orml_unknown_tokens::Config for Runtime { @@ -730,6 +736,8 @@ impl pallet_scheduler::Config for Runtime { type MaxScheduledPerBlock = MaxScheduledPerBlock; type OriginPrivilegeCmp = EqualPrivilegeOnly; type WeightInfo = (); + type NoPreimagePostponement = NoPreimagePostponement; + type PreimageProvider = (); } impl pallet_treasury::Config for Runtime { @@ -747,6 +755,62 @@ impl pallet_treasury::Config for Runtime { type WeightInfo = (); type SpendFunds = (); type MaxApprovals = MaxApprovals; + type ProposalBondMaximum = ProposalBondMaximum; + type SpendOrigin = frame_support::traits::NeverEnsureOrigin; +} + +parameter_types! { + pub const GeneralCouncilMotionDuration: BlockNumber = 7 * DAYS; + pub const CouncilDefaultMaxProposals: u32 = 100; + pub const CouncilDefaultMaxMembers: u32 = 100; +} + +type GeneralCouncilInstance = pallet_collective::Instance1; + +impl pallet_collective::Config for Runtime { + type Origin = Origin; + type Proposal = Call; + type Event = Event; + type MotionDuration = GeneralCouncilMotionDuration; + type MaxProposals = CouncilDefaultMaxProposals; + type MaxMembers = CouncilDefaultMaxMembers; + type DefaultVote = pallet_collective::PrimeDefaultVote; + type WeightInfo = (); +} + +type OperatorMembershipInstancePINT = pallet_membership::Instance5; + +impl pallet_membership::Config for Runtime { + type Event = Event; + type AddOrigin = CommitteeOrigin; + type RemoveOrigin = CommitteeOrigin; + type SwapOrigin = CommitteeOrigin; + type ResetOrigin = CommitteeOrigin; + type PrimeOrigin = CommitteeOrigin; + type MembershipInitialized = GeneralCouncil; + type MembershipChanged = GeneralCouncil; + type MaxMembers = ConstU32<100>; + type WeightInfo = (); +} + +parameter_types! { + pub const MinimumCount: u32 = 1; + pub const ExpiresIn: u64 = 1000 * 60 * 60; // 1 hours + pub RootOperatorAccountId: AccountId = AccountId::from([0xffu8; 32]); +} +type PintDataProvider = orml_oracle::Instance1; + +impl orml_oracle::Config for Runtime { + type Event = Event; + type OnNewData = (); + type CombineData = orml_oracle::DefaultCombineData; + type Time = Timestamp; + type OracleKey = AssetId; + type OracleValue = Price; + type RootOperatorAccountId = RootOperatorAccountId; + type Members = OracleOperatorMembership; + type MaxHasDispatchedSize = ConstU32<40>; + type WeightInfo = weights::orml_oracle::WeightInfo; } // Create the runtime by composing the FRAME pallets that were previously @@ -760,11 +824,12 @@ construct_runtime!( System: frame_system::{Pallet, Call, Config, Storage, Event} = 0, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 1, Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 2, - TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 3, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event} = 3, Sudo: pallet_sudo::{Pallet, Call, Config, Storage, Event} = 4, Utility: pallet_utility::{Pallet, Call, Event} = 5, Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event} = 6, AssetTxPayment: pallet_asset_tx_payment::{Pallet} = 10, + GeneralCouncil: pallet_collective:: = 50, // Treasury Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event} = 15, @@ -782,7 +847,7 @@ construct_runtime!( // ORML related pallets Tokens: orml_tokens::{Pallet, Storage, Call, Event, Config} = 60, - Currencies: orml_currencies::{Pallet, Call, Event} = 61, + Currencies: orml_currencies::{Pallet, Call} = 61, XTokens: orml_xtokens::{Pallet, Storage, Call, Event} = 62, UnknownTokens: orml_unknown_tokens::{Pallet, Storage, Event} = 63, @@ -794,7 +859,8 @@ construct_runtime!( SaftRegistry: pallet_saft_registry::{Pallet, Call, Storage, Event} = 84, RemoteAssetManager: pallet_remote_asset_manager::{Pallet, Call, Storage, Event, Config} = 85, PriceFeed: pallet_price_feed::{Pallet, Call, Storage, Event} = 86, - ChainlinkFeed: pallet_chainlink_feed::{Pallet, Call, Storage, Event, Config} = 90, + OrmlOracle: orml_oracle:: = 91, + OracleOperatorMembership: pallet_membership:: = 92, // XCM XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event} = 100, @@ -832,7 +898,7 @@ pub type SignedPayload = generic::SignedPayload; pub type CheckedExtrinsic = generic::CheckedExtrinsic; /// Executive: handles dispatch to the various pallets. pub type Executive = - frame_executive::Executive, Runtime, AllPallets, ()>; + frame_executive::Executive, Runtime, AllPalletsWithSystem, ()>; impl_runtime_apis! { impl sp_api::Core for Runtime { @@ -915,8 +981,8 @@ impl_runtime_apis! { } impl cumulus_primitives_core::CollectCollationInfo for Runtime { - fn collect_collation_info() -> cumulus_primitives_core::CollationInfo { - ParachainSystem::collect_collation_info() + fn collect_collation_info(header: &::Header) -> cumulus_primitives_core::CollationInfo { + ParachainSystem::collect_collation_info(header) } } diff --git a/runtime/integration-tests/Cargo.toml b/runtime/integration-tests/Cargo.toml index b7bc2672ce..4986880334 100644 --- a/runtime/integration-tests/Cargo.toml +++ b/runtime/integration-tests/Cargo.toml @@ -2,60 +2,58 @@ authors = ['ChainSafe Systems'] name = "runtime-integration-tests" version = "0.1.0" -edition = "2018" +edition = "2021" [dependencies] -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ['derive', 'max-encoded-len'] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0", features = ['derive', 'max-encoded-len'] } +scale-info = { version = "2.0.1", features = ["derive"] } # substrate -frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -pallet-assets = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -pallet-bags-list = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -pallet-proxy = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -pallet-staking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -pallet-session = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -pallet-timestamp = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -frame-election-provider-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -pallet-staking-reward-curve = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sp-io = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sp-staking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } -sp-npos-elections = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } +frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +pallet-assets = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +pallet-bags-list = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +pallet-proxy = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +pallet-staking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +pallet-session = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +pallet-timestamp = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +frame-election-provider-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +pallet-staking-reward-curve = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sp-io = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sp-staking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +sp-npos-elections = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } # polkadot -kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" } -xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" } +kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = 'release-v0.9.26' } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = 'release-v0.9.26' } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = 'release-v0.9.26' } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = 'release-v0.9.26' } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = 'release-v0.9.26' } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = 'release-v0.9.26' } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = 'release-v0.9.26' } +xcm = { git = "https://github.com/paritytech/polkadot", branch = 'release-v0.9.26' } +xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = 'release-v0.9.26' } # cumulus -cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13' } -cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13' } -cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13' } -cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13' } -cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13' } -cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13' } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.13" } +cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26' } +cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26' } +cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26' } +cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26' } +cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26' } +cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26' } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = 'polkadot-v0.9.26' } # orml -orml-currencies = { git = 'https://github.com/open-web3-stack/open-runtime-module-library' } -orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library' } -orml-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library' } -orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library' } -orml-unknown-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master' } -orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master' } - -# chainlink -pallet-chainlink-feed = { git = 'https://github.com/smartcontractkit/chainlink-polkadot', branch = 'polkadot-v0.9.13' } +orml-currencies = { git = 'https://github.com/open-web3-stack/open-runtime-module-library',branch = 'polkadot-v0.9.26' } +orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library',branch = 'polkadot-v0.9.26' } +orml-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library',branch = 'polkadot-v0.9.26' } +orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library',branch = 'polkadot-v0.9.26' } +orml-unknown-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26' } +orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26' } +orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26' } # pint pallet-remote-asset-manager = { path = "../../pallets/remote-asset-manager" } @@ -68,7 +66,7 @@ primitives = { path = "../../primitives/primitives" } xcm-calls = { path = "../../primitives/xcm-calls" } # others -xcm-emulator = { git = "https://github.com/shaunxw/xcm-simulator.git", branch = "master" } +xcm-emulator = { git = "https://github.com/shaunxw/xcm-simulator.git", rev = "ab5cd6c5fabe6ddda52ed6803ee1bf54c258fefe" } env_logger = "0.9" [features] diff --git a/runtime/integration-tests/src/ext.rs b/runtime/integration-tests/src/ext.rs index 8c1a6b8c30..5832a831e0 100644 --- a/runtime/integration-tests/src/ext.rs +++ b/runtime/integration-tests/src/ext.rs @@ -8,12 +8,12 @@ use xcm_calls::{ }; fn default_parachains_host_configuration( -) -> polkadot_runtime_parachains::configuration::HostConfiguration { - use polkadot_primitives::v1::{MAX_CODE_SIZE, MAX_POV_SIZE}; +) -> polkadot_runtime_parachains::configuration::HostConfiguration { + use polkadot_primitives::v2::{MAX_CODE_SIZE, MAX_POV_SIZE}; polkadot_runtime_parachains::configuration::HostConfiguration { - validation_upgrade_frequency: 1u32, - validation_upgrade_delay: 1, + validation_upgrade_cooldown: 1u32, + validation_upgrade_delay: 2, code_retention_period: 1200, max_code_size: MAX_CODE_SIZE, max_pov_size: MAX_POV_SIZE, @@ -25,7 +25,7 @@ fn default_parachains_host_configuration( max_upward_queue_size: 1024 * 1024, max_downward_message_size: 1024, ump_service_total_weight: 4 * 1_000_000_000, - max_upward_message_size: 1024 * 1024, + max_upward_message_size: 50 * 1024, max_upward_message_num_per_candidate: 5, hrmp_sender_deposit: 0, hrmp_recipient_deposit: 0, @@ -43,6 +43,7 @@ fn default_parachains_host_configuration( needed_approvals: 2, relay_vrf_modulo_samples: 2, zeroth_delay_tranche_width: 0, + minimum_validation_upgrade_delay: 5, ..Default::default() } } diff --git a/runtime/integration-tests/src/lib.rs b/runtime/integration-tests/src/lib.rs index 4ddda7a95d..db4c3e648a 100644 --- a/runtime/integration-tests/src/lib.rs +++ b/runtime/integration-tests/src/lib.rs @@ -18,7 +18,7 @@ use xcm_emulator::{decl_test_network, decl_test_parachain, decl_test_relay_chain decl_test_relay_chain! { pub struct Kusama { Runtime = kusama_runtime::Runtime, - XcmConfig = kusama_runtime::XcmConfig, + XcmConfig = kusama_runtime::xcm_config::XcmConfig, new_ext = kusama_ext(), } } @@ -27,6 +27,8 @@ decl_test_parachain! { pub struct Shot { Runtime = shot_runtime::Runtime, Origin = shot_runtime::Origin, + XcmpMessageHandler = shot_runtime::XcmpQueue, + DmpMessageHandler = shot_runtime::DmpQueue, new_ext = shot_ext(PARA_ID, vec![(ALICE, INITIAL_BALANCE)]), } } @@ -35,6 +37,8 @@ decl_test_parachain! { pub struct Statemint { Runtime = crate::statemint::Runtime, Origin = crate::statemint::Origin, + XcmpMessageHandler = crate::statemint::XcmpQueue, + DmpMessageHandler = crate::statemint::DmpQueue, new_ext = statemint_ext(STATEMINT_PARA_ID, vec![(ALICE, INITIAL_BALANCE), (sibling_sovereign_account(), INITIAL_BALANCE)]), } } diff --git a/runtime/integration-tests/src/statemint.rs b/runtime/integration-tests/src/statemint.rs index 7f9a5805bf..a83d68491a 100644 --- a/runtime/integration-tests/src/statemint.rs +++ b/runtime/integration-tests/src/statemint.rs @@ -16,9 +16,9 @@ pub use xcm::v1::{Junction, Junctions, MultiAsset, MultiLocation, NetworkId, Xcm pub use xcm_builder::{ AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, CurrencyAdapter as XcmCurrencyAdapter, EnsureXcmOrigin, FixedRateOfFungible, FixedWeightBounds, IsConcrete, - LocationInverter, NativeAsset, ParentAsSuperuser, ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, + LocationInverter, NativeAsset, ParentAsSuperuser, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, - TakeWeightCredit, + TakeWeightCredit, ParentIsPreset, }; use xcm_executor::{Config, XcmExecutor}; @@ -50,6 +50,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode; + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_types! { @@ -77,13 +78,14 @@ parameter_types! { impl cumulus_pallet_parachain_system::Config for Runtime { type Event = Event; - type OnValidationData = (); + type OnSystemEvent = (); type SelfParaId = ParachainInfo; type DmpMessageHandler = DmpQueue; type ReservedDmpWeight = ReservedDmpWeight; type OutboundXcmpMessageSource = XcmpQueue; type XcmpMessageHandler = XcmpQueue; type ReservedXcmpWeight = ReservedXcmpWeight; + type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::AnyRelayNumber; } impl parachain_info::Config for Runtime {} @@ -98,7 +100,7 @@ parameter_types! { } pub type LocationToAccountId = ( - ParentIsDefault, + ParentIsPreset, SiblingParachainConvertsVia, AccountId32Aliases, ); @@ -153,6 +155,10 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type XcmExecutor = XcmExecutor; type ChannelInfo = ParachainSystem; type VersionWrapper = PolkadotXcm; + type WeightInfo = cumulus_pallet_xcmp_queue::weights::SubstrateWeight; + type ControllerOrigin = EnsureRoot; + type ControllerOriginConverter = XcmOriginToCallOrigin; + type ExecuteOverweightOrigin = EnsureRoot; } impl cumulus_pallet_dmp_queue::Config for Runtime { @@ -207,6 +213,7 @@ impl pallet_assets::Config for Runtime { type Freezer = (); type Extra = (); type WeightInfo = (); + type AssetAccountDeposit = (); } type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; diff --git a/runtime/integration-tests/src/tests.rs b/runtime/integration-tests/src/tests.rs index 0ab7527cff..c5d84b999b 100644 --- a/runtime/integration-tests/src/tests.rs +++ b/runtime/integration-tests/src/tests.rs @@ -4,7 +4,6 @@ use crate::{prelude::*, statemint, util::*}; use frame_support::{ assert_noop, assert_ok, - sp_runtime::{traits::Zero, FixedPointNumber}, traits::tokens::fungibles::Inspect, }; use kusama_runtime::ProxyType as RelayProxyType; @@ -12,6 +11,8 @@ use orml_traits::MultiCurrency; use pallet_remote_asset_manager::types::StatemintConfig; use xcm_calls::proxy::ProxyType as ParaProxyType; use xcm_emulator::TestExt; +use sp_runtime::FixedPointNumber; +use sp_runtime::traits::Zero; #[test] fn para_account_funded_on_relay() { @@ -38,9 +39,9 @@ fn can_deposit_from_relay() { // create feed create_and_submit_feed(ADMIN_ACCOUNT, RELAY_CHAIN_ASSET, 1); - + let nav = pallet_asset_index::Pallet::::nav().unwrap(); - + // alice has 1000 units of relay chain currency in her account on the parachain assert_ok!(pallet_asset_index::Pallet::::deposit( committee_origin(ALICE).into(), @@ -49,7 +50,7 @@ fn can_deposit_from_relay() { )); // no more relay chain assets assert!(orml_tokens::Pallet::::balance(RELAY_CHAIN_ASSET, &ALICE).is_zero()); - + let deposit_value = pallet_price_feed::Pallet::::get_price(RELAY_CHAIN_ASSET) .unwrap() .checked_mul_int(deposit) @@ -223,8 +224,8 @@ fn can_transfer_to_statemint() { // shot_runtime::Origin::signed(ALICE), // transfer_amount // ); - - // transfer from pint -> statemint to mint SPINT + // + // // transfer from pint -> statemint to mint SPINT // assert_ok!(pallet_remote_asset_manager::Pallet::::transfer_to_statemint( // shot_runtime::Origin::signed(ALICE), // transfer_amount diff --git a/runtime/integration-tests/src/util.rs b/runtime/integration-tests/src/util.rs index 73daa699f5..28acaa95b1 100644 --- a/runtime/integration-tests/src/util.rs +++ b/runtime/integration-tests/src/util.rs @@ -8,12 +8,11 @@ use frame_support::{ traits::tokens::fungibles::Inspect, }; use orml_traits::MultiCurrency; -use pallet_committee::{ - types::{CommitteeMember, MemberType, MemberVote, VoteAggregate, VoteKind}, - CommitteeOrigin, -}; +use pallet_committee::{types::{CommitteeMember, MemberType, MemberVote, VoteAggregate, VoteKind}, CommitteeOrigin, CustomDefault}; use xcm_emulator::TestExt; use xcm_executor::traits::Convert; +pub use shot_runtime::{OrmlOracle, OracleOperatorMembership}; +pub use frame_system::RawOrigin; pub fn sibling_sovereign_account() -> AccountId { use crate::statemint::LocationToAccountId; @@ -23,7 +22,7 @@ pub fn sibling_sovereign_account() -> AccountId { pub fn relay_sovereign_account() -> AccountId { let para: ParaId = PARA_ID.into(); - para.into_account() + para.into_account_truncating() } /// registers the relay chain as liquid asset @@ -66,36 +65,8 @@ pub fn transfer_to_para(relay_deposit_amount: Balance, who: AccountId) { }); } -/// create and submit price feed pub fn create_and_submit_feed(caller: AccountId, asset_id: AssetId, price: u128) { - assert_ok!(pallet_chainlink_feed::Pallet::::set_feed_creator( - >::Signed(pallet_chainlink_feed::Pallet::::pallet_admin()) - .into(), - caller.clone(), - )); - - assert_ok!(pallet_chainlink_feed::Pallet::::create_feed( - >::Signed(caller.clone()).into(), - 100u32.into(), - Zero::zero(), - (1u8.into(), 100u8.into()), - 1u8.into(), - 0u8, - vec![1; ::StringLimit::get() as usize], - Zero::zero(), - vec![(caller.clone(), caller.clone())], - None, - None, - )); - - let feed_id = >::get() as u64 - 1; - pallet_price_feed::AssetFeeds::::insert(&asset_id, feed_id); - assert_ok!(pallet_chainlink_feed::Pallet::::submit( - >::Signed(caller.clone()).into(), - feed_id, - 1_u32.into(), - price.into(), - )); + assert_ok!(OrmlOracle::feed_values(RawOrigin::Root.into(), vec![(asset_id, price.into())])); } /// create an approved committe origin from account id @@ -105,11 +76,11 @@ pub fn committee_origin(origin: AccountId) -> CommitteeOrigin::MinCouncilVotes::get() + 1 - ], + ].try_into().unwrap(), end: >::block_number() + 1, }, ) diff --git a/runtime/pint/Cargo.toml b/runtime/pint/Cargo.toml index c350b62035..95f06c99cf 100644 --- a/runtime/pint/Cargo.toml +++ b/runtime/pint/Cargo.toml @@ -1,21 +1,21 @@ [package] authors = ['ChainSafe Systems'] -edition = '2018' +edition = '2021' homepage = 'https://substrate.dev' license = 'LGPL-3.0-only' name = 'pint-runtime' repository = 'https://github.com/substrate-developer-hub/substrate-parachain-template' -version = '2.0.0' +version = '4.0.0' [package.metadata.docs.rs] targets = ['x86_64-unknown-linux-gnu'] [build-dependencies] -substrate-wasm-builder = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } +substrate-wasm-builder = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } [dependencies] -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ['derive', 'max-encoded-len'] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ['derive', 'max-encoded-len'] } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } serde = { version = "1.0.130", optional = true, features = ['derive'] } @@ -23,70 +23,72 @@ hex-literal = { version = "0.3.3", optional = true } # Substrate Dependencies ## Substrate Primitive Dependencies -sp-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-block-builder = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-inherents = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-io = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-offchain = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-session = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-std = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-transaction-pool = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-try-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false, optional = true } -sp-version = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } +sp-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-block-builder = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-inherents = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-io = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-offchain = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-session = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-std = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-transaction-pool = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-try-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false, optional = true } +sp-version = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } ## Substrate FRAME Dependencies -frame-executive = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false, optional = true } -frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-system-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false, optional = true } -frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } +frame-executive = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false, optional = true } +frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-system-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false, optional = true } +frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } ## Substrate Pallet Dependencies -pallet-aura = { git = 'https://github.com/paritytech/substrate', default-features = false, branch = 'polkadot-v0.9.13' } -pallet-authorship = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false} -pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } -pallet-randomness-collective-flip = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -pallet-session = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false, features = ['historical'] } -pallet-sudo = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -pallet-timestamp = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -pallet-transaction-payment = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -pallet-utility = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -pallet-scheduler = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -pallet-treasury = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } +pallet-aura = { git = 'https://github.com/paritytech/substrate', default-features = false, branch = 'polkadot-v0.9.26' } +pallet-authorship = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false} +pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26', default-features = false } +pallet-randomness-collective-flip = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-session = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false, features = ['historical'] } +pallet-sudo = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-timestamp = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-transaction-payment = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-asset-tx-payment = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-utility = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-scheduler = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-treasury = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26', default-features = false } # Cumulus Dependencies -pallet-collator-selection = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -cumulus-pallet-aura-ext = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.13", default-features = false } -parachain-info = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -pallet-asset-tx-payment = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } +pallet-collator-selection = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } +cumulus-pallet-aura-ext = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } +cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } +cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } +cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } +cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } +cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } +cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = 'polkadot-v0.9.26', default-features = false } +parachain-info = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } # Polkadot Dependencies -polkadot-parachain = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13', default-features = false } -xcm = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13', default-features = false } -xcm-builder = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13', default-features = false } -xcm-executor = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13', default-features = false } -pallet-xcm = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13', default-features = false } +polkadot-parachain = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26', default-features = false } +xcm = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26', default-features = false } +xcm-builder = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26', default-features = false } +xcm-executor = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26', default-features = false } +pallet-xcm = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26', default-features = false } # ORML Dependencies -orml-currencies = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master', default-features = false } -orml-unknown-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master', default-features = false } -orml-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master', default-features = false } -orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master', default-features = false } -orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master', default-features = false } -orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master', default-features = false } +orml-currencies = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } +orml-unknown-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } +orml-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } +orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } +orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } +orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } +orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } # PINT dependencies runtime-common = {path = '../common', default-features = false } @@ -101,8 +103,6 @@ primitives = { path = '../../primitives/primitives', default-features = false } xcm-calls = { path = '../../primitives/xcm-calls', default-features = false } pallet-asset-index-rpc-runtime-api = { path = '../../pallets/asset-index/rpc/runtime-api', default-features = false } -pallet-chainlink-feed = { git = 'https://github.com/smartcontractkit/chainlink-polkadot', branch = 'polkadot-v0.9.13', default-features = false } - [dev-dependencies] hex-literal = "0.3.3" hex = "0.4.3" @@ -169,8 +169,8 @@ std = [ 'pallet-sudo/std', 'pallet-session/std', 'pallet-transaction-payment/std', - 'pallet-xcm/std', 'pallet-asset-tx-payment/std', + 'pallet-xcm/std', 'pallet-utility/std', 'pallet-scheduler/std', 'pallet-treasury/std', @@ -200,7 +200,6 @@ std = [ 'xcm-calls/std', 'primitives/std', 'pallet-asset-index-rpc-runtime-api/std', - 'pallet-chainlink-feed/std', 'orml-currencies/std', 'orml-unknown-tokens/std', @@ -208,4 +207,7 @@ std = [ 'orml-xtokens/std', 'orml-xcm-support/std', 'orml-traits/std', + 'orml-oracle/std', + + 'polkadot-parachain/std', ] diff --git a/runtime/pint/src/lib.rs b/runtime/pint/src/lib.rs index 93295dd8f4..5f786ff5b7 100644 --- a/runtime/pint/src/lib.rs +++ b/runtime/pint/src/lib.rs @@ -12,7 +12,7 @@ use codec::Decode; // Polkadot imports use cumulus_primitives_core::ParaId; pub use frame_support::{ - construct_runtime, match_type, ord_parameter_types, parameter_types, + construct_runtime, match_types, ord_parameter_types, parameter_types, traits::{IsInVec, Randomness}, weights::{ constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND}, @@ -20,10 +20,11 @@ pub use frame_support::{ }, PalletId, StorageValue, }; +pub use orml_traits::{location::AbsoluteReserveProvider}; // orml imports use orml_currencies::BasicCurrencyAdapter; -use orml_xcm_support::{IsNativeConcrete, MultiCurrencyAdapter, MultiNativeAsset}; +use orml_xcm_support::{IsNativeConcrete, MultiCurrencyAdapter, MultiNativeAsset, DepositToAlternative}; pub use pallet_balances::Call as BalancesCall; pub use pallet_timestamp::Call as TimestampCall; use pallet_xcm::XcmPassthrough; @@ -50,13 +51,13 @@ use xcm::v1::{ }; use xcm_builder::{ AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, - EnsureXcmOrigin, FixedRateOfFungible, FixedWeightBounds, LocationInverter, ParentIsDefault, RelayChainAsNative, + EnsureXcmOrigin, FixedRateOfFungible, FixedWeightBounds, LocationInverter, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeRevenue, TakeWeightCredit, }; use xcm_executor::XcmExecutor; -use frame_support::traits::{EqualPrivilegeOnly, Everything, Nothing}; +use frame_support::traits::{EqualPrivilegeOnly, Everything, Nothing, ConstU32}; use frame_system::EnsureRoot; use pallet_committee::EnsureMember; use primitives::traits::MultiAssetRegistry; @@ -102,6 +103,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 1, + state_version: 1, }; /// The version information used to identify this runtime when compiled @@ -178,6 +180,8 @@ impl frame_system::Config for Runtime { type SS58Prefix = SS58Prefix; /// The set code logic of the parachain. type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode; + + type MaxConsumers = ConstU32<16>; } impl pallet_timestamp::Config for Runtime { @@ -203,8 +207,10 @@ impl pallet_balances::Config for Runtime { } impl pallet_transaction_payment::Config for Runtime { + type Event = Event; type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter; - type TransactionByteFee = TransactionByteFee; + // type TransactionByteFee = TransactionByteFee; + type LengthToFee = CustomLengthToFee; type OperationalFeeMultiplier = OperationalFeeMultiplier; type WeightToFee = IdentityFee; type FeeMultiplierUpdate = (); @@ -217,13 +223,15 @@ impl pallet_sudo::Config for Runtime { impl cumulus_pallet_parachain_system::Config for Runtime { type Event = Event; - type OnValidationData = (); + // type OnValidationData = (); + type OnSystemEvent = (); type SelfParaId = parachain_info::Pallet; type OutboundXcmpMessageSource = XcmpQueue; type DmpMessageHandler = DmpQueue; type ReservedDmpWeight = ReservedDmpWeight; type XcmpMessageHandler = XcmpQueue; type ReservedXcmpWeight = ReservedXcmpWeight; + type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; } impl parachain_info::Config for Runtime {} @@ -236,7 +244,7 @@ impl cumulus_pallet_aura_ext::Config for Runtime {} /// the dispatch Origin. pub type LocationToAccountId = ( // The parent (Relay-chain) origin converts to the default `AccountId`. - ParentIsDefault, + ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, // Straight up local `AccountId32` origins just alias directly to `AccountId`. @@ -255,6 +263,7 @@ pub type LocalAssetTransactor = MultiCurrencyAdapter< LocationToAccountId, AssetId, AssetIdConvert, + DepositToAlternative, >; /// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance, @@ -278,7 +287,7 @@ pub type XcmOriginToCallOrigin = ( XcmPassthrough, ); -match_type! { +match_types! { pub type ParentOrParentsUnitPlurality: impl Contains = { MultiLocation { parents: 1, interior: Here } | MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Unit, .. }) } @@ -318,8 +327,7 @@ impl xcm_executor::Config for XcmConfig { // How to withdraw and deposit an asset. type AssetTransactor = LocalAssetTransactor; type OriginConverter = XcmOriginToCallOrigin; - type IsReserve = MultiNativeAsset; - // Teleporting is disabled. + type IsReserve = MultiNativeAsset; type IsTeleporter = (); type LocationInverter = LocationInverter; type Barrier = Barrier; @@ -369,6 +377,10 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type XcmExecutor = XcmExecutor; type ChannelInfo = ParachainSystem; type VersionWrapper = PolkadotXcm; + type ExecuteOverweightOrigin = EnsureRoot; + type ControllerOrigin = EnsureRoot; + type ControllerOriginConverter = XcmOriginToCallOrigin; + type WeightInfo = cumulus_pallet_xcmp_queue::weights::SubstrateWeight; } impl cumulus_pallet_dmp_queue::Config for Runtime { @@ -480,22 +492,10 @@ impl pallet_price_feed::Config for Runtime { type AssetId = AssetId; type Time = Timestamp; type Event = Event; + type DataProvider = OrmlOracle; type WeightInfo = weights::pallet_price_feed::WeightInfo; } -impl pallet_chainlink_feed::Config for Runtime { - type Event = Event; - type FeedId = FeedId; - type Value = Value; - type Currency = Balances; - type PalletId = FeedPalletId; - type MinimumReserve = MinimumReserve; - type StringLimit = StringLimit; - type OracleCountLimit = OracleLimit; - type FeedLimit = FeedLimit; - type OnAnswerHandler = PriceFeed; - type WeightInfo = (); -} impl pallet_asset_index::Config for Runtime { type AdminOrigin = CommitteeOrigin; @@ -534,10 +534,14 @@ impl orml_tokens::Config for Runtime { type OnDust = orml_tokens::TransferDust; type MaxLocks = MaxLocks; type DustRemovalWhitelist = DustRemovalWhitelist; + type ReserveIdentifier = [u8; 8]; + type MaxReserves = (); + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } impl orml_currencies::Config for Runtime { - type Event = Event; + // type Event = Event; type MultiCurrency = Tokens; type NativeCurrency = BasicCurrencyAdapter; type GetNativeCurrencyId = PINTAssetId; @@ -555,6 +559,10 @@ impl orml_xtokens::Config for Runtime { type Weigher = FixedWeightBounds; type BaseXcmWeight = BaseXcmWeight; type LocationInverter = LocationInverter; + type MaxAssetsForTransfer = MaxAssetsForTransfer; + type ReserveProvider = AbsoluteReserveProvider; + type MinXcmFee = ParachainZeroFee; + type MultiLocationsFilter = Everything; } impl orml_unknown_tokens::Config for Runtime { @@ -698,6 +706,8 @@ impl pallet_scheduler::Config for Runtime { type MaxScheduledPerBlock = MaxScheduledPerBlock; type OriginPrivilegeCmp = EqualPrivilegeOnly; type WeightInfo = (); + type NoPreimagePostponement = NoPreimagePostponement; + type PreimageProvider = (); } impl pallet_treasury::Config for Runtime { @@ -715,6 +725,62 @@ impl pallet_treasury::Config for Runtime { type WeightInfo = (); type SpendFunds = (); type MaxApprovals = MaxApprovals; + type ProposalBondMaximum = ProposalBondMaximum; + type SpendOrigin = frame_support::traits::NeverEnsureOrigin; +} + +parameter_types! { + pub const GeneralCouncilMotionDuration: BlockNumber = 7 * DAYS; + pub const CouncilDefaultMaxProposals: u32 = 100; + pub const CouncilDefaultMaxMembers: u32 = 100; +} + +type GeneralCouncilInstance = pallet_collective::Instance1; + +impl pallet_collective::Config for Runtime { + type Origin = Origin; + type Proposal = Call; + type Event = Event; + type MotionDuration = GeneralCouncilMotionDuration; + type MaxProposals = CouncilDefaultMaxProposals; + type MaxMembers = CouncilDefaultMaxMembers; + type DefaultVote = pallet_collective::PrimeDefaultVote; + type WeightInfo = (); +} + +type OperatorMembershipInstancePINT = pallet_membership::Instance5; + +impl pallet_membership::Config for Runtime { + type Event = Event; + type AddOrigin = CommitteeOrigin; + type RemoveOrigin = CommitteeOrigin; + type SwapOrigin = CommitteeOrigin; + type ResetOrigin = CommitteeOrigin; + type PrimeOrigin = CommitteeOrigin; + type MembershipInitialized = GeneralCouncil; + type MembershipChanged = GeneralCouncil; + type MaxMembers = ConstU32<100>; + type WeightInfo = (); +} + +parameter_types! { + pub const MinimumCount: u32 = 1; + pub const ExpiresIn: u64 = 1000 * 60 * 60; // 1 hours + pub RootOperatorAccountId: AccountId = AccountId::from([0xffu8; 32]); +} +type PintDataProvider = orml_oracle::Instance1; + +impl orml_oracle::Config for Runtime { + type Event = Event; + type OnNewData = (); + type CombineData = orml_oracle::DefaultCombineData; + type Time = Timestamp; + type OracleKey = AssetId; + type OracleValue = Price; + type RootOperatorAccountId = RootOperatorAccountId; + type Members = OracleOperatorMembership; + type MaxHasDispatchedSize = ConstU32<40>; + type WeightInfo = weights::orml_oracle::WeightInfo; } // Create the runtime by composing the FRAME pallets that were previously @@ -728,11 +794,12 @@ construct_runtime!( System: frame_system::{Pallet, Call, Config, Storage, Event} = 0, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 1, Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 2, - TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 3, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event} = 3, Sudo: pallet_sudo::{Pallet, Call, Config, Storage, Event} = 4, Utility: pallet_utility::{Pallet, Call, Event} = 5, Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event} = 6, AssetTxPayment: pallet_asset_tx_payment::{Pallet} = 10, + GeneralCouncil: pallet_collective:: = 50, // Treasury Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event} = 15, @@ -750,7 +817,7 @@ construct_runtime!( // ORML related pallets Tokens: orml_tokens::{Pallet, Storage, Call, Event, Config} = 60, - Currencies: orml_currencies::{Pallet, Call, Event} = 61, + Currencies: orml_currencies::{Pallet, Call} = 61, XTokens: orml_xtokens::{Pallet, Storage, Call, Event} = 62, UnknownTokens: orml_unknown_tokens::{Pallet, Storage, Event} = 63, @@ -762,7 +829,8 @@ construct_runtime!( SaftRegistry: pallet_saft_registry::{Pallet, Call, Storage, Event} = 84, RemoteAssetManager: pallet_remote_asset_manager::{Pallet, Call, Storage, Event, Config} = 85, PriceFeed: pallet_price_feed::{Pallet, Call, Storage, Event} = 86, - ChainlinkFeed: pallet_chainlink_feed::{Pallet, Call, Storage, Event, Config} = 90, + OrmlOracle: orml_oracle:: = 91, + OracleOperatorMembership: pallet_membership:: = 92, // XCM XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event} = 100, @@ -798,7 +866,7 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; /// Executive: handles dispatch to the various pallets. pub type Executive = - frame_executive::Executive, Runtime, AllPallets, ()>; + frame_executive::Executive, Runtime, AllPalletsWithSystem, ()>; impl_runtime_apis! { impl sp_api::Core for Runtime { @@ -881,8 +949,8 @@ impl_runtime_apis! { } impl cumulus_primitives_core::CollectCollationInfo for Runtime { - fn collect_collation_info() -> cumulus_primitives_core::CollationInfo { - ParachainSystem::collect_collation_info() + fn collect_collation_info(header: &::Header) -> cumulus_primitives_core::CollationInfo { + ParachainSystem::collect_collation_info(header) } } @@ -925,7 +993,7 @@ impl_runtime_apis! { Vec, Vec, ) { - use frame_benchmarking:: {BenchmarkList, list_benchmark, Benchmarking}; + use frame_benchmarking::{BenchmarkList, list_benchmark, Benchmarking}; use frame_support::traits::StorageInfoTrait; let mut list = Vec::::new(); diff --git a/runtime/shot/Cargo.toml b/runtime/shot/Cargo.toml index 2f705bb11d..263fdc5268 100644 --- a/runtime/shot/Cargo.toml +++ b/runtime/shot/Cargo.toml @@ -1,21 +1,21 @@ [package] authors = ['ChainSafe Systems'] -edition = '2018' +edition = '2021' homepage = 'https://substrate.dev' license = 'LGPL-3.0-only' name = 'shot-runtime' repository = 'https://github.com/substrate-developer-hub/substrate-parachain-template' -version = '2.0.0' +version = '4.0.0' [package.metadata.docs.rs] targets = ['x86_64-unknown-linux-gnu'] [build-dependencies] -substrate-wasm-builder = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13' } +substrate-wasm-builder = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } [dependencies] -codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false, features = ['derive', 'max-encoded-len'] } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ['derive', 'max-encoded-len'] } +scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } serde = { version = "1.0.130", optional = true, features = ['derive'] } @@ -23,70 +23,72 @@ hex-literal = { version = "0.3.3", optional = true } # Substrate Dependencies ## Substrate Primitive Dependencies -sp-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-block-builder = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-inherents = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-io = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-offchain = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-session = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-std = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -sp-transaction-pool = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-try-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false, optional = true } -sp-version = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } +sp-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-block-builder = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-inherents = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-io = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-offchain = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-session = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-std = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +sp-transaction-pool = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-try-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false, optional = true } +sp-version = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } ## Substrate FRAME Dependencies -frame-executive = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false, optional = true } -frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -frame-system-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false, optional = true } -frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } +frame-executive = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false, optional = true } +frame-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +frame-system-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false, optional = true } +frame-system-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } ## Substrate Pallet Dependencies -pallet-aura = { git = 'https://github.com/paritytech/substrate', default-features = false, branch = 'polkadot-v0.9.13' } -pallet-authorship = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false} -pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false } -pallet-randomness-collective-flip = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -pallet-session = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false, features = ['historical'] } -pallet-sudo = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -pallet-timestamp = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -pallet-transaction-payment = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -pallet-utility = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -pallet-scheduler = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } -pallet-treasury = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.13', default-features = false } +pallet-aura = { git = 'https://github.com/paritytech/substrate', default-features = false, branch = 'polkadot-v0.9.26' } +pallet-authorship = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false} +pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26', default-features = false } +pallet-randomness-collective-flip = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-session = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false, features = ['historical'] } +pallet-sudo = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-timestamp = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-transaction-payment = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-asset-tx-payment = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-utility = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-scheduler = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-treasury = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26', default-features = false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26', default-features = false } # Cumulus Dependencies -pallet-collator-selection = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -cumulus-pallet-aura-ext = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.13", default-features = false } -parachain-info = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } -pallet-asset-tx-payment = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.13', default-features = false } +pallet-collator-selection = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } +cumulus-pallet-aura-ext = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } +cumulus-pallet-parachain-system = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } +cumulus-pallet-dmp-queue = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } +cumulus-pallet-xcm = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } +cumulus-pallet-xcmp-queue = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } +cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } +cumulus-primitives-utility = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = 'polkadot-v0.9.26', default-features = false } +parachain-info = { git = 'https://github.com/paritytech/cumulus', branch = 'polkadot-v0.9.26', default-features = false } # Polkadot Dependencies -polkadot-parachain = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13', default-features = false } -xcm = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13', default-features = false } -xcm-builder = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13', default-features = false } -xcm-executor = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13', default-features = false } -pallet-xcm = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.13', default-features = false } +polkadot-parachain = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26', default-features = false } +xcm = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26', default-features = false } +xcm-builder = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26', default-features = false } +xcm-executor = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26', default-features = false } +pallet-xcm = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.26', default-features = false } # ORML Dependencies -orml-currencies = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master', default-features = false } -orml-unknown-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master', default-features = false } -orml-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master', default-features = false } -orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master', default-features = false } -orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master', default-features = false } -orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master', default-features = false } +orml-currencies = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } +orml-unknown-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } +orml-tokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } +orml-xtokens = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } +orml-xcm-support = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } +orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } +orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.26', default-features = false } # PINT dependencies runtime-common = {path = '../common', default-features = false } @@ -101,8 +103,6 @@ primitives = { path = '../../primitives/primitives', default-features = false } xcm-calls = { path = '../../primitives/xcm-calls', default-features = false } pallet-asset-index-rpc-runtime-api = { path = '../../pallets/asset-index/rpc/runtime-api', default-features = false } -pallet-chainlink-feed = { git = 'https://github.com/smartcontractkit/chainlink-polkadot', branch = 'polkadot-v0.9.13', default-features = false } - [dev-dependencies] hex-literal = "0.3.3" hex = "0.4.3" @@ -169,8 +169,8 @@ std = [ 'pallet-sudo/std', 'pallet-session/std', 'pallet-transaction-payment/std', - 'pallet-xcm/std', 'pallet-asset-tx-payment/std', + 'pallet-xcm/std', 'pallet-utility/std', 'pallet-scheduler/std', 'pallet-treasury/std', @@ -200,7 +200,6 @@ std = [ 'xcm-calls/std', 'primitives/std', 'pallet-asset-index-rpc-runtime-api/std', - 'pallet-chainlink-feed/std', 'orml-currencies/std', 'orml-unknown-tokens/std', @@ -208,4 +207,7 @@ std = [ 'orml-xtokens/std', 'orml-xcm-support/std', 'orml-traits/std', + 'orml-oracle/std', + + 'polkadot-parachain/std', ] diff --git a/runtime/shot/src/lib.rs b/runtime/shot/src/lib.rs index b1ff691e4e..e754ba59ab 100644 --- a/runtime/shot/src/lib.rs +++ b/runtime/shot/src/lib.rs @@ -12,7 +12,7 @@ use codec::Decode; // Polkadot imports use cumulus_primitives_core::ParaId; pub use frame_support::{ - construct_runtime, match_type, ord_parameter_types, + construct_runtime, match_types, ord_parameter_types, pallet_prelude::PhantomData, parameter_types, traits::{IsInVec, Randomness}, @@ -22,12 +22,13 @@ pub use frame_support::{ }, PalletId, StorageValue, }; +pub use orml_traits::{location::AbsoluteReserveProvider}; // orml imports -use frame_support::traits::{EqualPrivilegeOnly, Everything, Nothing}; +use frame_support::traits::{EqualPrivilegeOnly, Everything, Nothing, ConstU32}; use frame_system::EnsureRoot; use orml_currencies::BasicCurrencyAdapter; -use orml_xcm_support::{IsNativeConcrete, MultiCurrencyAdapter, MultiNativeAsset}; +use orml_xcm_support::{IsNativeConcrete, MultiCurrencyAdapter, MultiNativeAsset, DepositToAlternative}; pub use pallet_balances::Call as BalancesCall; use pallet_committee::EnsureMember; pub use pallet_timestamp::Call as TimestampCall; @@ -58,7 +59,7 @@ use xcm::v1::{ }; use xcm_builder::{ AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, - EnsureXcmOrigin, FixedRateOfFungible, FixedWeightBounds, LocationInverter, ParentIsDefault, RelayChainAsNative, + EnsureXcmOrigin, FixedRateOfFungible, FixedWeightBounds, LocationInverter, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeRevenue, TakeWeightCredit, }; @@ -103,6 +104,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 1, + state_version: 1, }; /// The version information used to identify this runtime when compiled @@ -175,6 +177,8 @@ impl frame_system::Config for Runtime { type SS58Prefix = SS58Prefix; /// The set code logic of the parachain. type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode; + + type MaxConsumers = ConstU32<16>; } impl pallet_timestamp::Config for Runtime { @@ -200,8 +204,10 @@ impl pallet_balances::Config for Runtime { } impl pallet_transaction_payment::Config for Runtime { + type Event = Event; type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter; - type TransactionByteFee = TransactionByteFee; + // type TransactionByteFee = TransactionByteFee; + type LengthToFee = CustomLengthToFee; type OperationalFeeMultiplier = OperationalFeeMultiplier; type WeightToFee = IdentityFee; type FeeMultiplierUpdate = (); @@ -214,13 +220,15 @@ impl pallet_sudo::Config for Runtime { impl cumulus_pallet_parachain_system::Config for Runtime { type Event = Event; - type OnValidationData = (); + // type OnValidationData = (); + type OnSystemEvent = (); type SelfParaId = ParachainInfo; type DmpMessageHandler = DmpQueue; type ReservedDmpWeight = ReservedDmpWeight; type OutboundXcmpMessageSource = XcmpQueue; type XcmpMessageHandler = XcmpQueue; type ReservedXcmpWeight = ReservedXcmpWeight; + type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::AnyRelayNumber; } impl parachain_info::Config for Runtime {} @@ -233,7 +241,7 @@ impl cumulus_pallet_aura_ext::Config for Runtime {} /// the dispatch Origin. pub type LocationToAccountId = ( // The parent (Relay-chain) origin converts to the default `AccountId`. - ParentIsDefault, + ParentIsPreset, // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, // Straight up local `AccountId32` origins just alias directly to `AccountId`. @@ -252,6 +260,7 @@ pub type LocalAssetTransactor = MultiCurrencyAdapter< LocationToAccountId, AssetId, AssetIdConvert, + DepositToAlternative, >; /// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance, @@ -275,7 +284,7 @@ pub type XcmOriginToCallOrigin = ( XcmPassthrough, ); -match_type! { +match_types! { pub type ParentOrParentsUnitPlurality: impl Contains = { MultiLocation { parents: 1, interior: Here } | MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Unit, .. }) } @@ -317,7 +326,7 @@ impl xcm_executor::Config for XcmConfig { // How to withdraw and deposit an asset. type AssetTransactor = LocalAssetTransactor; type OriginConverter = XcmOriginToCallOrigin; - type IsReserve = MultiNativeAsset; + type IsReserve = MultiNativeAsset; // Teleporting is disabled. type IsTeleporter = (); type LocationInverter = LocationInverter; @@ -368,6 +377,10 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type XcmExecutor = XcmExecutor; type ChannelInfo = ParachainSystem; type VersionWrapper = PolkadotXcm; + type ExecuteOverweightOrigin = EnsureRoot; + type ControllerOrigin = EnsureRoot; + type ControllerOriginConverter = XcmOriginToCallOrigin; + type WeightInfo = cumulus_pallet_xcmp_queue::weights::SubstrateWeight; } impl cumulus_pallet_dmp_queue::Config for Runtime { @@ -477,23 +490,10 @@ impl pallet_price_feed::Config for Runtime { type AssetId = AssetId; type Time = Timestamp; type Event = Event; + type DataProvider = OrmlOracle; type WeightInfo = weights::pallet_price_feed::WeightInfo; } -impl pallet_chainlink_feed::Config for Runtime { - type Event = Event; - type FeedId = FeedId; - type Value = Value; - type Currency = Balances; - type PalletId = FeedPalletId; - type MinimumReserve = MinimumReserve; - type StringLimit = StringLimit; - type OracleCountLimit = OracleLimit; - type FeedLimit = FeedLimit; - type OnAnswerHandler = PriceFeed; - type WeightInfo = (); -} - impl pallet_asset_index::Config for Runtime { type AdminOrigin = CommitteeOrigin; type IndexToken = Balances; @@ -531,10 +531,14 @@ impl orml_tokens::Config for Runtime { type OnDust = orml_tokens::TransferDust; type MaxLocks = MaxLocks; type DustRemovalWhitelist = DustRemovalWhitelist; + type ReserveIdentifier = [u8; 8]; + type MaxReserves = (); + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } impl orml_currencies::Config for Runtime { - type Event = Event; + // type Event = Event; type MultiCurrency = Tokens; type NativeCurrency = BasicCurrencyAdapter; type GetNativeCurrencyId = PINTAssetId; @@ -552,6 +556,10 @@ impl orml_xtokens::Config for Runtime { type Weigher = FixedWeightBounds; type BaseXcmWeight = BaseXcmWeight; type LocationInverter = LocationInverter; + type MaxAssetsForTransfer = MaxAssetsForTransfer; + type ReserveProvider = AbsoluteReserveProvider; + type MinXcmFee = ParachainZeroFee; + type MultiLocationsFilter = Everything; } impl orml_unknown_tokens::Config for Runtime { @@ -695,6 +703,8 @@ impl pallet_scheduler::Config for Runtime { type MaxScheduledPerBlock = MaxScheduledPerBlock; type OriginPrivilegeCmp = EqualPrivilegeOnly; type WeightInfo = (); + type NoPreimagePostponement = NoPreimagePostponement; + type PreimageProvider = (); } impl pallet_treasury::Config for Runtime { @@ -712,6 +722,62 @@ impl pallet_treasury::Config for Runtime { type WeightInfo = (); type SpendFunds = (); type MaxApprovals = MaxApprovals; + type ProposalBondMaximum = ProposalBondMaximum; + type SpendOrigin = frame_support::traits::NeverEnsureOrigin; +} + +parameter_types! { + pub const GeneralCouncilMotionDuration: BlockNumber = 7 * DAYS; + pub const CouncilDefaultMaxProposals: u32 = 100; + pub const CouncilDefaultMaxMembers: u32 = 100; +} + +type GeneralCouncilInstance = pallet_collective::Instance1; + +impl pallet_collective::Config for Runtime { + type Origin = Origin; + type Proposal = Call; + type Event = Event; + type MotionDuration = GeneralCouncilMotionDuration; + type MaxProposals = CouncilDefaultMaxProposals; + type MaxMembers = CouncilDefaultMaxMembers; + type DefaultVote = pallet_collective::PrimeDefaultVote; + type WeightInfo = (); +} + +type OperatorMembershipInstancePINT = pallet_membership::Instance5; + +impl pallet_membership::Config for Runtime { + type Event = Event; + type AddOrigin = CommitteeOrigin; + type RemoveOrigin = CommitteeOrigin; + type SwapOrigin = CommitteeOrigin; + type ResetOrigin = CommitteeOrigin; + type PrimeOrigin = CommitteeOrigin; + type MembershipInitialized = GeneralCouncil; + type MembershipChanged = GeneralCouncil; + type MaxMembers = ConstU32<100>; + type WeightInfo = (); +} + +parameter_types! { + pub const MinimumCount: u32 = 1; + pub const ExpiresIn: u64 = 1000 * 60 * 60; // 1 hours + pub RootOperatorAccountId: AccountId = AccountId::from([0xffu8; 32]); +} +type PintDataProvider = orml_oracle::Instance1; + +impl orml_oracle::Config for Runtime { + type Event = Event; + type OnNewData = (); + type CombineData = orml_oracle::DefaultCombineData; + type Time = Timestamp; + type OracleKey = AssetId; + type OracleValue = Price; + type RootOperatorAccountId = RootOperatorAccountId; + type Members = OracleOperatorMembership; + type MaxHasDispatchedSize = ConstU32<40>; + type WeightInfo = weights::orml_oracle::WeightInfo; } // Create the runtime by composing the FRAME pallets that were previously @@ -725,11 +791,12 @@ construct_runtime!( System: frame_system::{Pallet, Call, Config, Storage, Event} = 0, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 1, Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 2, - TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 3, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event} = 3, Sudo: pallet_sudo::{Pallet, Call, Config, Storage, Event} = 4, Utility: pallet_utility::{Pallet, Call, Event} = 5, Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event} = 6, AssetTxPayment: pallet_asset_tx_payment::{Pallet} = 10, + GeneralCouncil: pallet_collective:: = 50, // Treasury Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event} = 15, @@ -747,7 +814,7 @@ construct_runtime!( // ORML related pallets Tokens: orml_tokens::{Pallet, Storage, Call, Event, Config} = 60, - Currencies: orml_currencies::{Pallet, Call, Event} = 61, + Currencies: orml_currencies::{Pallet, Call} = 61, XTokens: orml_xtokens::{Pallet, Storage, Call, Event} = 62, UnknownTokens: orml_unknown_tokens::{Pallet, Storage, Event} = 63, @@ -759,7 +826,8 @@ construct_runtime!( SaftRegistry: pallet_saft_registry::{Pallet, Call, Storage, Event} = 84, RemoteAssetManager: pallet_remote_asset_manager::{Pallet, Call, Storage, Event, Config} = 85, PriceFeed: pallet_price_feed::{Pallet, Call, Storage, Event} = 86, - ChainlinkFeed: pallet_chainlink_feed::{Pallet, Call, Storage, Event, Config} = 90, + OrmlOracle: orml_oracle:: = 91, + OracleOperatorMembership: pallet_membership:: = 92, // XCM XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event} = 100, @@ -795,7 +863,7 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; /// Executive: handles dispatch to the various pallets. pub type Executive = - frame_executive::Executive, Runtime, AllPallets, ()>; + frame_executive::Executive, Runtime, AllPalletsWithSystem, ()>; impl_runtime_apis! { impl sp_api::Core for Runtime { @@ -878,8 +946,8 @@ impl_runtime_apis! { } impl cumulus_primitives_core::CollectCollationInfo for Runtime { - fn collect_collation_info() -> cumulus_primitives_core::CollationInfo { - ParachainSystem::collect_collation_info() + fn collect_collation_info(header: &::Header) -> cumulus_primitives_core::CollationInfo { + ParachainSystem::collect_collation_info(header) } } diff --git a/test-utils/xcm-test-support/Cargo.toml b/test-utils/xcm-test-support/Cargo.toml index 2aba88a355..adacff66a1 100644 --- a/test-utils/xcm-test-support/Cargo.toml +++ b/test-utils/xcm-test-support/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ['ChainSafe Systems'] description = 'Support for testing xcm within PINT.' -edition = '2018' +edition = '2021' license = 'LGPL-3.0-only' name = 'xcm-test-support' readme = 'README.md' @@ -9,43 +9,45 @@ repository = 'https://github.com/ChainSafe/PINT/' version = '0.0.1' [dependencies] + serde = { version = "1.0.124", features = ["derive"], optional = true } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" } -sp-staking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.8' } -frame-election-provider-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.8' } -max-encoded-len = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.8' } + +frame-system = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +frame-support = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +sp-std = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +sp-core = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +sp-io = { git = "https://github.com/paritytech/substrate", branch = 'polkadot-v0.9.26' } +sp-staking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +frame-election-provider-support = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +max-encoded-len = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } ## Substrate Pallet Dependencies -pallet-assets = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.8' } -pallet-staking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.8' } -pallet-proxy = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.8' } -pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.8'} -pallet-staking-reward-curve = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.8' } -pallet-timestamp = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.8' } -pallet-session = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.8' } +pallet-assets = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +pallet-staking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +pallet-proxy = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26'} +pallet-staking-reward-curve = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +pallet-timestamp = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } +pallet-session = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.26' } # cumulus -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.8" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.8" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.8" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.8" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.8" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.8" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = 'polkadot-v0.9.26' } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = 'polkadot-v0.9.26' } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = 'polkadot-v0.9.26' } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = 'polkadot-v0.9.26' } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = 'polkadot-v0.9.26' } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = 'polkadot-v0.9.26' } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.8" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.8" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.8" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.8" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.8" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.8" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = 'release-v0.9.26' } +xcm = { git = "https://github.com/paritytech/polkadot", branch = 'release-v0.9.26' } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = 'release-v0.9.26' } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = 'release-v0.9.26' } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = 'release-v0.9.26' } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = 'release-v0.9.26' } # orml orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'master' } @@ -54,4 +56,4 @@ orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-li xcm-calls = { path = "../../primitives/xcm-calls" } [package.metadata.docs.rs] -targets = ['x86_64-unknown-linux-gnu'] \ No newline at end of file +targets = ['x86_64-unknown-linux-gnu']