diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index bb243ca683..182958c5b8 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -75,7 +75,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly-2022-08-05 + toolchain: nightly-2022-10-30 components: rustfmt target: wasm32-unknown-unknown default: true diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index a9d5b95183..c05d6d9a73 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -40,7 +40,7 @@ jobs: - name: Install toolchain uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2022-08-05 + toolchain: nightly-2022-10-30 components: rustfmt target: wasm32-unknown-unknown - name: Setup cmake diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b6c3f8c70d..b7da28b21d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,7 +37,7 @@ jobs: - name: Install toolchain uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2022-08-05 + toolchain: nightly-2022-10-30 components: rustfmt target: wasm32-unknown-unknown - name: Setup cmake @@ -69,7 +69,7 @@ jobs: - name: Install toolchain uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2022-08-05 + toolchain: nightly-2022-10-30 components: rustfmt target: wasm32-unknown-unknown - name: Setup cmake @@ -89,7 +89,7 @@ jobs: - name: Install toolchain uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2022-08-05 + toolchain: nightly-2022-10-30 components: rustfmt target: wasm32-unknown-unknown - name: Setup cmake @@ -117,7 +117,7 @@ jobs: - name: Install toolchain uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2022-08-05 + toolchain: nightly-2022-10-30 components: rustfmt target: wasm32-unknown-unknown - name: Setup cmake diff --git a/.github/workflows/test.yml.src b/.github/workflows/test.yml.src index 9ba44aa367..e374ccbf5d 100644 --- a/.github/workflows/test.yml.src +++ b/.github/workflows/test.yml.src @@ -41,7 +41,7 @@ jobs: name: Install toolchain uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2022-08-05 + toolchain: nightly-2022-10-30 components: rustfmt target: wasm32-unknown-unknown - name: Check format diff --git a/.github/workflows/update-tokens.yml b/.github/workflows/update-tokens.yml index 85b2d4da2d..eda4384191 100644 --- a/.github/workflows/update-tokens.yml +++ b/.github/workflows/update-tokens.yml @@ -20,7 +20,7 @@ jobs: - name: Install toolchain uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2022-08-05 + toolchain: nightly-2022-10-30 components: rustfmt target: wasm32-unknown-unknown - name: update tokens diff --git a/Cargo.lock b/Cargo.lock index d483af9a0a..ee0d4c2d32 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18,8 +18,7 @@ version = "2.12.0" dependencies = [ "acala-cli", "acala-service", - "futures 0.3.24", - "parity-util-mem", + "futures 0.3.26", ] [[package]] @@ -28,7 +27,7 @@ version = "2.12.0" dependencies = [ "acala-inspect", "acala-service", - "clap 4.0.29", + "clap 4.1.4", "cumulus-client-cli", "cumulus-client-service", "cumulus-primitives-core", @@ -41,10 +40,12 @@ dependencies = [ "polkadot-primitives", "polkadot-service", "sc-cli", + "sc-executor", "sc-service", "sc-telemetry", "sc-tracing", "sp-core", + "sp-io", "sp-runtime", "substrate-build-script-utils", "try-runtime-cli", @@ -54,7 +55,7 @@ dependencies = [ name = "acala-inspect" version = "2.12.0" dependencies = [ - "clap 4.0.29", + "clap 4.1.4", "derive_more", "log", "parity-scale-codec", @@ -80,7 +81,6 @@ dependencies = [ "nutsfinance-stable-asset", "orml-traits", "parity-scale-codec", - "parity-util-mem", "paste", "scale-info", "serde", @@ -98,7 +98,7 @@ version = "2.12.0" dependencies = [ "acala-primitives", "evm-rpc", - "futures 0.3.24", + "futures 0.3.26", "jsonrpsee", "orml-oracle-rpc", "orml-tokens-rpc", @@ -257,7 +257,7 @@ dependencies = [ "cumulus-test-relay-sproof-builder", "frame-benchmarking", "frame-system-rpc-runtime-api", - "futures 0.3.24", + "futures 0.3.26", "hex", "hex-literal", "jsonrpsee", @@ -321,7 +321,16 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" dependencies = [ - "gimli", + "gimli 0.26.2", +] + +[[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli 0.27.1", ] [[package]] @@ -330,6 +339,15 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "aead" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" +dependencies = [ + "generic-array 0.14.6", +] + [[package]] name = "aead" version = "0.4.3" @@ -337,6 +355,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" dependencies = [ "generic-array 0.14.6", + "rand_core 0.6.4", +] + +[[package]] +name = "aes" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" +dependencies = [ + "aes-soft", + "aesni", + "cipher 0.2.5", ] [[package]] @@ -346,41 +376,75 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if", - "cipher", + "cipher 0.3.0", "cpufeatures", "opaque-debug 0.3.0", ] +[[package]] +name = "aes-gcm" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da" +dependencies = [ + "aead 0.3.2", + "aes 0.6.0", + "cipher 0.2.5", + "ctr 0.6.0", + "ghash 0.3.1", + "subtle", +] + [[package]] name = "aes-gcm" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", + "aead 0.4.3", + "aes 0.7.5", + "cipher 0.3.0", + "ctr 0.8.0", + "ghash 0.4.4", "subtle", ] +[[package]] +name = "aes-soft" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" +dependencies = [ + "cipher 0.2.5", + "opaque-debug 0.3.0", +] + +[[package]] +name = "aesni" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" +dependencies = [ + "cipher 0.2.5", + "opaque-debug 0.3.0", +] + [[package]] name = "ahash" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", "once_cell", "version_check", ] [[package]] name = "aho-corasick" -version = "0.7.19" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] @@ -411,9 +475,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.65" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" [[package]] name = "approx" @@ -424,11 +488,23 @@ dependencies = [ "num-traits", ] +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + [[package]] name = "array-bytes" -version = "4.1.0" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6" + +[[package]] +name = "array-bytes" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a913633b0c922e6b745072795f50d90ebea78ba31a57e2ac8c2fc7b50950949" +checksum = "22f72e9d6fac4bc80778ea470b20197b88d28c292bb7d60c3fb099280003cd19" [[package]] name = "arrayref" @@ -449,168 +525,119 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] -name = "asn1_der" -version = "0.7.5" +name = "asn1-rs" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22d1f4b888c298a027c99dc9048015fac177587de20fc30232a057dfbe24a21" +checksum = "30ff05a702273012438132f449575dbc804e27b2f3cbe3069aa237d26c98fa33" +dependencies = [ + "asn1-rs-derive 0.1.0", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time 0.3.17", +] [[package]] -name = "assert_matches" -version = "1.5.0" +name = "asn1-rs" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" +checksum = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4" +dependencies = [ + "asn1-rs-derive 0.4.0", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time 0.3.17", +] [[package]] -name = "async-attributes" -version = "1.1.2" +name = "asn1-rs-derive" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" +checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf" dependencies = [ + "proc-macro2", "quote", "syn", + "synstructure", ] [[package]] -name = "async-channel" -version = "1.7.1" +name = "asn1-rs-derive" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28" +checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", + "proc-macro2", + "quote", + "syn", + "synstructure", ] [[package]] -name = "async-executor" -version = "1.4.1" +name = "asn1-rs-impl" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" +checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "once_cell", - "slab", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "async-global-executor" -version = "2.3.0" +name = "asn1_der" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0da5b41ee986eed3f524c380e6d64965aea573882a8907682ad100f7859305ca" -dependencies = [ - "async-channel", - "async-executor", - "async-io", - "async-lock", - "blocking", - "futures-lite", - "once_cell", -] +checksum = "e22d1f4b888c298a027c99dc9048015fac177587de20fc30232a057dfbe24a21" + +[[package]] +name = "assert_matches" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-io" -version = "1.9.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83e21f3a490c72b3b0cf44962180e60045de2925d8dff97918f7ee43c8f637c7" +checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" dependencies = [ + "async-lock", "autocfg", "concurrent-queue", "futures-lite", "libc", "log", - "once_cell", "parking", "polling", "slab", "socket2", "waker-fn", - "winapi", + "windows-sys 0.42.0", ] [[package]] name = "async-lock" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-process" -version = "1.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02111fd8655a613c25069ea89fc8d9bb89331fa77486eb3bc059ee757cfa481c" +checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685" dependencies = [ - "async-io", - "autocfg", - "blocking", - "cfg-if", "event-listener", "futures-lite", - "libc", - "once_cell", - "signal-hook", - "winapi", -] - -[[package]] -name = "async-std" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" -dependencies = [ - "async-attributes", - "async-channel", - "async-global-executor", - "async-io", - "async-lock", - "async-process", - "crossbeam-utils", - "futures-channel", - "futures-core", - "futures-io", - "futures-lite", - "gloo-timers", - "kv-log-macro", - "log", - "memchr", - "once_cell", - "pin-project-lite 0.2.9", - "pin-utils", - "slab", - "wasm-bindgen-futures", ] -[[package]] -name = "async-std-resolver" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba50e24d9ee0a8950d3d03fc6d0dd10aa14b5de3b101949b4e160f7fee7c723" -dependencies = [ - "async-std", - "async-trait", - "futures-io", - "futures-util", - "pin-utils", - "socket2", - "trust-dns-resolver", -] - -[[package]] -name = "async-task" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" - [[package]] name = "async-trait" -version = "0.1.60" +version = "0.1.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d1d8ab452a3936018a687b20e6f7cf5363d713b732b8884001317b0e48aa3" +checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" dependencies = [ "proc-macro2", "quote", @@ -619,9 +646,9 @@ dependencies = [ [[package]] name = "asynchronous-codec" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0de5164e5edbf51c45fb8c2d9664ae1c095cce1b265ecf7569093c0d66ef690" +checksum = "06a0daa378f5fd10634e44b0a29b2a87b890657658e072a30d6f26e57ddee182" dependencies = [ "bytes", "futures-sink", @@ -632,9 +659,9 @@ dependencies = [ [[package]] name = "atomic-waker" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" +checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" [[package]] name = "atty" @@ -665,32 +692,18 @@ 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 = "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.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" dependencies = [ - "addr2line", + "addr2line 0.19.0", "cc", "cfg-if", "libc", "miniz_oxide", - "object", + "object 0.30.3", "rustc-demangle", ] @@ -736,15 +749,21 @@ checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" [[package]] name = "base64ct" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2b2456fd614d856680dcd9fcc660a51a820fa09daef2e49772b56a193c8474" +checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" [[package]] name = "bech32" @@ -764,21 +783,17 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "array-bytes", + "array-bytes 4.2.0", "async-trait", - "beefy-primitives", "fnv", - "futures 0.3.24", - "futures-timer", + "futures 0.3.26", "log", "parity-scale-codec", "parking_lot 0.12.1", - "sc-chain-spec", "sc-client-api", "sc-consensus", - "sc-finality-grandpa", "sc-keystore", "sc-network", "sc-network-common", @@ -787,6 +802,7 @@ dependencies = [ "sp-api", "sp-application-crypto", "sp-arithmetic", + "sp-beefy", "sp-blockchain", "sp-consensus", "sp-core", @@ -801,18 +817,17 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "beefy-gadget", - "beefy-primitives", - "futures 0.3.24", + "futures 0.3.26", "jsonrpsee", "log", "parity-scale-codec", "parking_lot 0.12.1", "sc-rpc", - "sc-utils", "serde", + "sp-beefy", "sp-core", "sp-runtime", "thiserror", @@ -821,30 +836,13 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "beefy-primitives", "sp-api", + "sp-beefy", "sp-runtime", ] -[[package]] -name = "beefy-primitives" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-io", - "sp-mmr-primitives", - "sp-runtime", - "sp-std", -] - [[package]] name = "bencher-procedural" version = "0.1.0" @@ -912,11 +910,11 @@ dependencies = [ [[package]] name = "blake2" -version = "0.10.4" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9cf849ee05b2ee5fba5e36f97ff8ec2533916700fc0758d40d92136a42f3388" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -927,7 +925,7 @@ checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127" dependencies = [ "arrayref", "arrayvec 0.7.2", - "constant_time_eq", + "constant_time_eq 0.1.5", ] [[package]] @@ -938,21 +936,21 @@ checksum = "db539cc2b5f6003621f1cd9ef92d7ded8ea5232c7de0f9faa2de251cd98730d4" dependencies = [ "arrayref", "arrayvec 0.7.2", - "constant_time_eq", + "constant_time_eq 0.1.5", ] [[package]] name = "blake3" -version = "1.3.1" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" +checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" dependencies = [ "arrayref", "arrayvec 0.7.2", "cc", "cfg-if", - "constant_time_eq", - "digest 0.10.5", + "constant_time_eq 0.2.4", + "digest 0.10.6", ] [[package]] @@ -986,6 +984,16 @@ dependencies = [ "generic-array 0.14.6", ] +[[package]] +name = "block-modes" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57a0e8073e8baa88212fb5823574c02ebccb395136ba9a164ab89379ec6072f0" +dependencies = [ + "block-padding 0.2.1", + "cipher 0.2.5", +] + [[package]] name = "block-padding" version = "0.1.5" @@ -1001,20 +1009,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" -[[package]] -name = "blocking" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" -dependencies = [ - "async-channel", - "async-task", - "atomic-waker", - "fastrand", - "futures-lite", - "once_cell", -] - [[package]] name = "bounded-vec" version = "0.6.0" @@ -1042,6 +1036,16 @@ dependencies = [ "serde", ] +[[package]] +name = "bstr" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b" +dependencies = [ + "memchr", + "serde", +] + [[package]] name = "bstringify" version = "0.1.2" @@ -1065,9 +1069,9 @@ checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "byte-slice-cast" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c5fdd0166095e1d463fc6cc01aa8ce547ad77a4e84d42eb6762b084e28067e" +checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "byte-tools" @@ -1075,6 +1079,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" +[[package]] +name = "bytemuck" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393" + [[package]] name = "byteorder" version = "1.4.3" @@ -1083,9 +1093,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" [[package]] name = "bzip2-sys" @@ -1098,17 +1108,11 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "cache-padded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" - [[package]] name = "camino" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e" +checksum = "c77df041dc383319cc661b428b6961a005db4d6808d5e12536931b1ca9556055" dependencies = [ "serde", ] @@ -1130,11 +1134,25 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ "camino", "cargo-platform", - "semver 1.0.14", + "semver 1.0.16", "serde", "serde_json", ] +[[package]] +name = "cargo_metadata" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "982a0cf6a99c350d7246035613882e376d58cebe571785abc5da4f648d53ac0a" +dependencies = [ + "camino", + "cargo-platform", + "semver 1.0.16", + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "cast" version = "0.3.0" @@ -1143,11 +1161,22 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.73" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +dependencies = [ + "jobserver", +] + +[[package]] +name = "ccm" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "5aca1a8fbc20b50ac9673ff014abfb2b5f4085ee1a850d408f14a159c5853ac7" dependencies = [ - "jobserver", + "aead 0.3.2", + "cipher 0.2.5", + "subtle", ] [[package]] @@ -1187,7 +1216,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" dependencies = [ "cfg-if", - "cipher", + "cipher 0.3.0", "cpufeatures", "zeroize", ] @@ -1198,24 +1227,24 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" dependencies = [ - "aead", + "aead 0.4.3", "chacha20", - "cipher", + "cipher 0.3.0", "poly1305", "zeroize", ] [[package]] name = "chrono" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" dependencies = [ "iana-time-zone", "js-sys", "num-integer", "num-traits", - "time", + "time 0.1.45", "wasm-bindgen", "winapi", ] @@ -1233,6 +1262,15 @@ dependencies = [ "unsigned-varint", ] +[[package]] +name = "cipher" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +dependencies = [ + "generic-array 0.14.6", +] + [[package]] name = "cipher" version = "0.3.0" @@ -1275,9 +1313,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.0.29" +version = "4.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d" +checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" dependencies = [ "bitflags", "clap_derive", @@ -1290,9 +1328,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.0.21" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" +checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" dependencies = [ "heck", "proc-macro-error", @@ -1303,9 +1341,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" +checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" dependencies = [ "os_str_bytes", ] @@ -1341,8 +1379,8 @@ dependencies = [ "bincode", "bs58", "coins-core", - "digest 0.10.5", - "getrandom 0.2.7", + "digest 0.10.6", + "getrandom 0.2.8", "hmac 0.12.1", "k256", "lazy_static", @@ -1359,7 +1397,7 @@ checksum = "2a11892bcac83b4c6e95ab84b5b06c76d9d70ad73548dd07418269c5c7977171" dependencies = [ "bitvec 0.17.4", "coins-bip32", - "getrandom 0.2.7", + "getrandom 0.2.8", "hex", "hmac 0.12.1", "pbkdf2 0.11.0", @@ -1378,7 +1416,7 @@ dependencies = [ "base64 0.12.3", "bech32", "blake2", - "digest 0.10.5", + "digest 0.10.6", "generic-array 0.14.6", "hex", "ripemd", @@ -1391,9 +1429,9 @@ dependencies = [ [[package]] name = "comfy-table" -version = "6.1.0" +version = "6.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85914173c2f558d61613bfbbf1911f14e630895087a7ed2fafc0f5319e1536e7" +checksum = "6e7b787b0dc42e8111badfdbe4c3059158ccb2db8780352fa1b01e8ccf45cc4d" dependencies = [ "strum", "strum_macros", @@ -1402,11 +1440,11 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "1.2.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" dependencies = [ - "cache-padded", + "crossbeam-utils", ] [[package]] @@ -1421,6 +1459,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +[[package]] +name = "constant_time_eq" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" + [[package]] name = "convert_case" version = "0.4.0" @@ -1461,6 +1505,16 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "cpu-time" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9e393a7668fe1fad3075085b86c781883000b4ede868f43627b34a87c8b7ded" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "cpufeatures" version = "0.2.5" @@ -1470,20 +1524,26 @@ dependencies = [ "libc", ] +[[package]] +name = "cpuid-bool" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" + [[package]] name = "cranelift-bforest" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44409ccf2d0f663920cab563d2b79fcd6b2e9a2bcc6e929fef76c8f82ad6c17a" +checksum = "52056f6d0584484b57fa6c1a65c1fcb15f3780d8b6a758426d9e3084169b2ddd" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de2018ad96eb97f621f7d6b900a0cc661aec8d02ea4a50e56ecb48e5a2fcaf" +checksum = "18fed94c8770dc25d01154c3ffa64ed0b3ba9d583736f305fed7beebe5d9cf74" dependencies = [ "arrayvec 0.7.2", "bumpalo", @@ -1492,7 +1552,7 @@ dependencies = [ "cranelift-codegen-shared", "cranelift-entity", "cranelift-isle", - "gimli", + "gimli 0.26.2", "log", "regalloc2", "smallvec", @@ -1501,33 +1561,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5287ce36e6c4758fbaf298bd1a8697ad97a4f2375a3d1b61142ea538db4877e5" +checksum = "1c451b81faf237d11c7e4f3165eeb6bac61112762c5cfe7b4c0fb7241474358f" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2855c24219e2f08827f3f4ffb2da92e134ae8d8ecc185b11ec8f9878cf5f588e" +checksum = "e7c940133198426d26128f08be2b40b0bd117b84771fd36798969c4d712d81fc" [[package]] name = "cranelift-entity" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b65673279d75d34bf11af9660ae2dbd1c22e6d28f163f5c72f4e1dc56d56103" +checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed2b3d7a4751163f6c4a349205ab1b7d9c00eecf19dcea48592ef1f7688eefc" +checksum = "34897538b36b216cc8dd324e73263596d51b8cf610da6498322838b2546baf8a" dependencies = [ "cranelift-codegen", "log", @@ -1537,15 +1597,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be64cecea9d90105fc6a2ba2d003e98c867c1d6c4c86cc878f97ad9fb916293" +checksum = "1b2629a569fae540f16a76b70afcc87ad7decb38dc28fa6c648ac73b51e78470" [[package]] name = "cranelift-native" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a03a6ac1b063e416ca4b93f6247978c991475e8271465340caa6f92f3c16a4" +checksum = "20937dab4e14d3e225c5adfc9c7106bafd4ac669bdb43027b911ff794c6fb318" dependencies = [ "cranelift-codegen", "libc", @@ -1554,9 +1614,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c699873f7b30bc5f20dd03a796b4183e073a46616c91704792ec35e45d13f913" +checksum = "80fc2288957a94fd342a015811479de1837850924166d1f1856d8406e6f3609b" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1568,6 +1628,21 @@ dependencies = [ "wasmtime-types", ] +[[package]] +name = "crc" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" + [[package]] name = "crc32fast" version = "1.3.2" @@ -1588,7 +1663,7 @@ dependencies = [ "clap 2.34.0", "criterion-plot", "csv", - "futures 0.3.24", + "futures 0.3.26", "itertools", "lazy_static", "num-traits", @@ -1638,22 +1713,22 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.11" +version = "0.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" +checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset", + "memoffset 0.7.1", "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd42583b04998a5363558e5f9291ee5a5ff6b49944332103f251e7479a82aa7" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ "cfg-if", "crossbeam-utils", @@ -1661,9 +1736,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" dependencies = [ "cfg-if", ] @@ -1706,6 +1781,16 @@ dependencies = [ "subtle", ] +[[package]] +name = "crypto-mac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" +dependencies = [ + "generic-array 0.14.6", + "subtle", +] + [[package]] name = "crypto-mac" version = "0.11.1" @@ -1722,7 +1807,7 @@ version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" dependencies = [ - "bstr", + "bstr 0.2.17", "csv-core", "itoa 0.4.8", "ryu", @@ -1739,13 +1824,12 @@ dependencies = [ ] [[package]] -name = "ctor" -version = "0.1.23" +name = "ctr" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" +checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" dependencies = [ - "quote", - "syn", + "cipher 0.2.5", ] [[package]] @@ -1754,15 +1838,15 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ - "cipher", + "cipher 0.3.0", ] [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ - "clap 4.0.29", + "clap 4.1.4", "parity-scale-codec", "sc-chain-spec", "sc-cli", @@ -1775,12 +1859,12 @@ dependencies = [ [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", "cumulus-primitives-core", - "futures 0.3.24", + "futures 0.3.26", "parity-scale-codec", "parking_lot 0.12.1", "polkadot-node-primitives", @@ -1798,12 +1882,12 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "async-trait", "cumulus-client-consensus-common", "cumulus-primitives-core", - "futures 0.3.24", + "futures 0.3.26", "parity-scale-codec", "sc-client-api", "sc-consensus", @@ -1827,12 +1911,15 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "async-trait", + "cumulus-client-pov-recovery", + "cumulus-primitives-core", "cumulus-relay-chain-interface", "dyn-clone", - "futures 0.3.24", + "futures 0.3.26", + "log", "parity-scale-codec", "polkadot-primitives", "sc-client-api", @@ -1847,13 +1934,13 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-relay-chain" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "async-trait", "cumulus-client-consensus-common", "cumulus-primitives-core", "cumulus-relay-chain-interface", - "futures 0.3.24", + "futures 0.3.26", "parking_lot 0.12.1", "sc-consensus", "sp-api", @@ -1870,11 +1957,11 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "async-trait", "cumulus-relay-chain-interface", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "parity-scale-codec", "parking_lot 0.12.1", @@ -1893,11 +1980,11 @@ dependencies = [ [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "parity-scale-codec", "polkadot-node-primitives", @@ -1916,19 +2003,24 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", "cumulus-client-consensus-common", "cumulus-client-pov-recovery", "cumulus-primitives-core", + "cumulus-relay-chain-inprocess-interface", "cumulus-relay-chain-interface", + "cumulus-relay-chain-minimal-node", + "futures 0.3.26", "parking_lot 0.12.1", "polkadot-primitives", "sc-client-api", "sc-consensus", "sc-service", + "sc-sysinfo", + "sc-telemetry", "sp-api", "sp-blockchain", "sp-consensus", @@ -1939,7 +2031,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "frame-support", "frame-system", @@ -1955,7 +2047,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1972,7 +2064,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "bytes", "cumulus-pallet-parachain-system-proc-macro", @@ -2000,7 +2092,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2011,7 +2103,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-session-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "frame-support", "frame-system", @@ -2024,7 +2116,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2040,7 +2132,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "cumulus-primitives-core", "frame-benchmarking", @@ -2059,7 +2151,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "parity-scale-codec", "polkadot-core-primitives", @@ -2074,7 +2166,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2097,10 +2189,10 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "cumulus-primitives-core", - "futures 0.3.24", + "futures 0.3.26", "parity-scale-codec", "sp-inherents", "sp-std", @@ -2110,7 +2202,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2126,12 +2218,12 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-inprocess-interface" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "polkadot-cli", "polkadot-client", @@ -2151,11 +2243,11 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "async-trait", "cumulus-primitives-core", - "futures 0.3.24", + "futures 0.3.26", "jsonrpsee-core", "parity-scale-codec", "polkadot-overseer", @@ -2165,24 +2257,23 @@ dependencies = [ "sp-blockchain", "sp-state-machine", "thiserror", + "tokio", ] [[package]] name = "cumulus-relay-chain-minimal-node" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ - "array-bytes", + "array-bytes 6.0.0", "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", "cumulus-relay-chain-rpc-interface", - "futures 0.3.24", + "futures 0.3.26", "lru", - "polkadot-availability-distribution 0.9.33 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.33)", "polkadot-core-primitives", - "polkadot-network-bridge 0.9.33 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.33)", - "polkadot-node-core-av-store", + "polkadot-network-bridge 0.9.37 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.37)", "polkadot-node-network-protocol", "polkadot-node-subsystem-util", "polkadot-overseer", @@ -2194,8 +2285,6 @@ dependencies = [ "sc-keystore", "sc-network", "sc-network-common", - "sc-network-light", - "sc-network-sync", "sc-service", "sc-telemetry", "sc-tracing", @@ -2214,24 +2303,25 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-rpc-interface" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "async-trait", - "backoff", "cumulus-primitives-core", "cumulus-relay-chain-interface", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "jsonrpsee", + "lru", "parity-scale-codec", "polkadot-service", "sc-client-api", "sc-rpc-api", + "serde", + "serde_json", "sp-api", "sp-authority-discovery", "sp-consensus-babe", "sp-core", - "sp-runtime", "sp-state-machine", "sp-storage", "tokio", @@ -2242,7 +2332,7 @@ dependencies = [ [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", @@ -2255,7 +2345,7 @@ dependencies = [ [[package]] name = "cumulus-test-relay-validation-worker-provider" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "polkadot-node-core-pvf", "toml", @@ -2289,22 +2379,23 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-pre.1" +version = "4.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4033478fbf70d6acf2655ac70da91ee65852d69daf7a67bf7a2f518fb47aafcf" +checksum = "8da00a7a9a4eb92a0a0f8e75660926d48f0d0f3c537e455c457bcdaa1e16b1ac" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.6.4", + "cfg-if", + "fiat-crypto", + "packed_simd_2", + "platforms 3.0.2", "subtle", "zeroize", ] [[package]] name = "cxx" -version = "1.0.85" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd" +checksum = "322296e2f2e5af4270b54df9e85a02ff037e271af20ba3e7fe1575515dc840b8" dependencies = [ "cc", "cxxbridge-flags", @@ -2314,9 +2405,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.85" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0" +checksum = "017a1385b05d631e7875b1f151c9f012d37b53491e2a87f65bff5c262b2111d8" dependencies = [ "cc", "codespan-reporting", @@ -2329,26 +2420,61 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.85" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59" +checksum = "c26bbb078acf09bc1ecda02d4223f03bdd28bd4874edcb0379138efc499ce971" [[package]] name = "cxxbridge-macro" -version = "1.0.85" +version = "1.0.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "357f40d1f06a24b60ae1fe122542c1fb05d28d32acb2aed064e84bc2ad1e252e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "darling" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6" +checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" dependencies = [ + "fnv", + "ident_case", "proc-macro2", "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" +dependencies = [ + "darling_core", + "quote", "syn", ] [[package]] name = "data-encoding" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" +checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" [[package]] name = "data-encoding-macro" @@ -2377,9 +2503,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" dependencies = [ "const-oid", + "pem-rfc7468", "zeroize", ] +[[package]] +name = "der-parser" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe398ac75057914d7d07307bf67dc7f3f574a26783b4fc7805a20ffa9f506e82" +dependencies = [ + "asn1-rs 0.3.1", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "der-parser" +version = "8.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42d4bc9b0db0a0df9ae64634ac5bdefb7afcb534e182275ca0beadbe486701c1" +dependencies = [ + "asn1-rs 0.5.1", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + [[package]] name = "derivative" version = "2.2.0" @@ -2391,6 +2546,37 @@ dependencies = [ "syn", ] +[[package]] +name = "derive_builder" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "derive_builder_macro" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" +dependencies = [ + "derive_builder_core", + "syn", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -2430,9 +2616,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer 0.10.3", "crypto-common", @@ -2481,13 +2667,14 @@ dependencies = [ ] [[package]] -name = "dns-parser" -version = "0.8.0" +name = "displaydoc" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea" +checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" dependencies = [ - "byteorder", - "quick-error", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -2504,9 +2691,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dtoa" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6053ff46b5639ceb91756a85a4c8914668393a03170efd79c8884a529d80656" +checksum = "c00704156a7de8df8da0911424e30c2049957b0a714542a44e05fe693dd85313" [[package]] name = "dyn-clonable" @@ -2531,9 +2718,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2" +checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60" [[package]] name = "e2e-tests" @@ -2577,9 +2764,9 @@ dependencies = [ [[package]] name = "ed25519" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ "signature", ] @@ -2614,9 +2801,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "elliptic-curve" @@ -2627,10 +2814,12 @@ dependencies = [ "base16ct", "crypto-bigint", "der", - "digest 0.10.5", + "digest 0.10.6", "ff", "generic-array 0.14.6", "group", + "hkdf", + "pem-rfc7468", "pkcs8", "rand_core 0.6.4", "sec1", @@ -2693,9 +2882,9 @@ dependencies = [ [[package]] name = "enumn" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038b1afa59052df211f9efd58f8b1d84c242935ede1c3dbaed26b018a9e06ae2" +checksum = "e88bcb3a067a6555d577aba299e75eff9942da276e6506fc6274327daa026132" dependencies = [ "proc-macro2", "quote", @@ -2704,9 +2893,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" dependencies = [ "atty", "humantime", @@ -2715,11 +2904,24 @@ dependencies = [ "termcolor", ] +[[package]] +name = "env_logger" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + [[package]] name = "environmental" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b91989ae21441195d7d9b9993a2f9295c7e1a8c96255d8b729accddc124797" +checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b" [[package]] name = "errno" @@ -2791,9 +2993,9 @@ dependencies = [ [[package]] name = "ethereum-types" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81224dc661606574f5a0f28c9947d0ee1d93ff11c5f1c4e7272f52e8c0b5483c" +checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee" dependencies = [ "ethbloom", "fixed-hash", @@ -2894,7 +3096,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5" dependencies = [ - "futures 0.3.24", + "futures 0.3.26", ] [[package]] @@ -2987,36 +3189,42 @@ dependencies = [ "subtle", ] +[[package]] +name = "fiat-crypto" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a214f5bb88731d436478f3ae1f8a277b62124089ba9fb67f4f93fb100ef73c90" + [[package]] name = "file-per-thread-logger" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e16290574b39ee41c71aeb90ae960c504ebaf1e2a1c87bd52aa56ed6e1a02f" +checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866" dependencies = [ - "env_logger", + "env_logger 0.10.0", "log", ] [[package]] name = "filetime" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" +checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" dependencies = [ "cfg-if", "libc", "redox_syscall", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] name = "finality-grandpa" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22349c6a11563a202d95772a68e0fcf56119e74ea8a2a19cf2301460fcd0df5" +checksum = "e24e6c429951433ccb7c87fd528c60084834dcd14763182c1f83291bcde24c34" dependencies = [ "either", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "log", "num-traits", @@ -3045,9 +3253,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", "libz-sys", @@ -3072,7 +3280,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "parity-scale-codec", ] @@ -3095,11 +3303,11 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-support", "frame-system", - "linregress", + "linregress 0.4.4", "log", "parity-scale-codec", "paste", @@ -3118,28 +3326,25 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "Inflector", - "array-bytes", + "array-bytes 4.2.0", "chrono", - "clap 4.0.29", + "clap 4.1.4", "comfy-table", "frame-benchmarking", "frame-support", "frame-system", "gethostname", "handlebars", - "hash-db", "itertools", - "kvdb", "lazy_static", "linked-hash-map", "log", - "memory-db", "parity-scale-codec", "rand 0.8.5", - "rand_pcg 0.3.1", + "rand_pcg", "sc-block-builder", "sc-cli", "sc-client-api", @@ -3149,7 +3354,6 @@ dependencies = [ "sc-sysinfo", "serde", "serde_json", - "serde_nanos", "sp-api", "sp-blockchain", "sp-core", @@ -3162,7 +3366,6 @@ dependencies = [ "sp-std", "sp-storage", "sp-trie", - "tempfile", "thiserror", "thousands", ] @@ -3170,7 +3373,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -3181,7 +3384,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -3189,6 +3392,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-arithmetic", + "sp-core", "sp-npos-elections", "sp-runtime", "sp-std", @@ -3197,7 +3401,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-support", "frame-system", @@ -3223,10 +3427,26 @@ dependencies = [ "serde", ] +[[package]] +name = "frame-remote-externalities" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" +dependencies = [ + "futures 0.3.26", + "log", + "parity-scale-codec", + "serde", + "sp-core", + "sp-io", + "sp-runtime", + "substrate-rpc-client", + "tokio", +] + [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "bitflags", "frame-metadata", @@ -3258,7 +3478,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "Inflector", "cfg-expr", @@ -3272,7 +3492,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -3284,7 +3504,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "proc-macro2", "quote", @@ -3294,7 +3514,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-support", "log", @@ -3312,7 +3532,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", @@ -3327,7 +3547,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "parity-scale-codec", "sp-api", @@ -3336,7 +3556,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-support", "parity-scale-codec", @@ -3347,9 +3567,9 @@ dependencies = [ [[package]] name = "fs-err" -version = "2.8.1" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64db3e262960f0662f43a6366788d5f10f7f244b8f7d7d987f560baf5ded5c50" +checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" [[package]] name = "fs2" @@ -3381,9 +3601,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c" +checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" dependencies = [ "futures-channel", "futures-core", @@ -3396,9 +3616,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" +checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" dependencies = [ "futures-core", "futures-sink", @@ -3406,15 +3626,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" +checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" [[package]] name = "futures-executor" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab" +checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" dependencies = [ "futures-core", "futures-task", @@ -3424,9 +3644,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" +checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" [[package]] name = "futures-lite" @@ -3445,9 +3665,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" +checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" dependencies = [ "proc-macro2", "quote", @@ -3461,33 +3681,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" dependencies = [ "futures-io", - "rustls", - "webpki", + "rustls 0.20.8", + "webpki 0.22.0", ] [[package]] name = "futures-sink" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" +checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" [[package]] name = "futures-task" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" +checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" [[package]] name = "futures-timer" version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +dependencies = [ + "gloo-timers", + "send_wrapper", +] [[package]] name = "futures-util" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" +checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" dependencies = [ "futures 0.1.31", "futures-channel", @@ -3547,17 +3771,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi 0.9.0+wasi-snapshot-preview1", - "wasm-bindgen", ] [[package]] name = "getrandom" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if", "js-sys", @@ -3566,6 +3788,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "ghash" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375" +dependencies = [ + "opaque-debug 0.3.0", + "polyval 0.4.5", +] + [[package]] name = "ghash" version = "0.4.4" @@ -3573,7 +3805,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" dependencies = [ "opaque-debug 0.3.0", - "polyval", + "polyval 0.5.3", ] [[package]] @@ -3587,30 +3819,56 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "gimli" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "221996f774192f0f718773def8201c4ae31f02616a54ccfc2d358bb0e5cefdec" + [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" +checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ "aho-corasick", - "bstr", + "bstr 1.1.0", "fnv", "log", "regex", ] +[[package]] +name = "gloo-net" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9902a044653b26b99f7e3693a42f171312d9be8b26b5697bd1e43ad1f8a35e10" +dependencies = [ + "futures-channel", + "futures-core", + "futures-sink", + "gloo-utils", + "js-sys", + "pin-project", + "serde", + "serde_json", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "gloo-timers" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" dependencies = [ "futures-channel", "futures-core", @@ -3618,6 +3876,19 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "gloo-utils" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8e8fc851e9c7b9852508bc6e3f690f452f474417e8545ec9857b7f7377036b5" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "group" version = "0.12.1" @@ -3631,9 +3902,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be" +checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" dependencies = [ "bytes", "fnv", @@ -3656,9 +3927,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "handlebars" -version = "4.3.5" +version = "4.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433e4ab33f1213cdc25b5fa45c76881240cfe79284cf2b395e8b9e312a30a2fd" +checksum = "035ef95d03713f2c347a72547b7cd38cbc9af7cd51e6099fb62d586d4a6dee3a" dependencies = [ "log", "pest", @@ -3726,7 +3997,16 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" name = "hex-literal" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" +checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" + +[[package]] +name = "hkdf" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +dependencies = [ + "hmac 0.12.1", +] [[package]] name = "hmac" @@ -3738,6 +4018,16 @@ dependencies = [ "digest 0.9.0", ] +[[package]] +name = "hmac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" +dependencies = [ + "crypto-mac 0.10.1", + "digest 0.9.0", +] + [[package]] name = "hmac" version = "0.11.0" @@ -3754,7 +4044,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -3801,6 +4091,12 @@ dependencies = [ "pin-project-lite 0.2.9", ] +[[package]] +name = "http-range-header" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" + [[package]] name = "httparse" version = "1.8.0" @@ -3821,9 +4117,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.20" +version = "0.14.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" +checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" dependencies = [ "bytes", "futures-channel", @@ -3845,32 +4141,50 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.0" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" +checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ "http", "hyper", "log", - "rustls", + "rustls 0.20.8", "rustls-native-certs", "tokio", "tokio-rustls", + "webpki-roots", ] [[package]] name = "iana-time-zone" -version = "0.1.50" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd911b35d940d2bd0bea0f9100068e5b97b51a1cbe13d13382f132e0365257a0" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" dependencies = [ "android_system_properties", "core-foundation-sys", + "iana-time-zone-haiku", "js-sys", "wasm-bindgen", "winapi", ] +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "0.2.3" @@ -3904,19 +4218,20 @@ dependencies = [ [[package]] name = "if-watch" -version = "2.0.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065c008e570a43c00de6aed9714035e5ea6a498c255323db9091722af6ee67dd" +checksum = "ba7abdbb86e485125dad06c2691e1e393bf3b08c7b743b43aa162a00fd39062e" dependencies = [ "async-io", "core-foundation", "fnv", - "futures 0.3.24", + "futures 0.3.26", "if-addrs", "ipnet", "log", "rtnetlink", "system-configuration", + "tokio", "windows", ] @@ -3960,9 +4275,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", "hashbrown", @@ -3993,17 +4308,36 @@ dependencies = [ "num-traits", ] +[[package]] +name = "interceptor" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e8a11ae2da61704edada656798b61c94b35ecac2c58eb955156987d5e6be90b" +dependencies = [ + "async-trait", + "bytes", + "log", + "rand 0.8.5", + "rtcp", + "rtp", + "thiserror", + "tokio", + "waitgroup", + "webrtc-srtp", + "webrtc-util", +] + [[package]] name = "io-lifetimes" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ea37f355c05dde75b84bba2d767906ad522e97cd9e2eef2be7a4ab7fb442c06" +checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" [[package]] name = "io-lifetimes" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" dependencies = [ "libc", "windows-sys 0.42.0", @@ -4017,9 +4351,9 @@ checksum = "aa2f047c0a98b2f299aa5d6d7088443570faae494e9ae1305e48be000c9e0eb1" [[package]] name = "ipconfig" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723519edce41262b05d4143ceb95050e4c614f483e78e9fd9e39a8275a84ad98" +checksum = "bd302af1b90f2463a98fa5ad469fc212c8e3175a41c3068601bfa2727591c5be" dependencies = [ "socket2", "widestring", @@ -4029,19 +4363,19 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.5.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "is-terminal" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330" +checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" dependencies = [ "hermit-abi 0.2.6", - "io-lifetimes 1.0.3", - "rustix 0.36.5", + "io-lifetimes 1.0.4", + "rustix 0.36.7", "windows-sys 0.42.0", ] @@ -4086,26 +4420,32 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd0d559d5e679b1ab2f869b486a11182923863b1b3ee8b421763cdd707b783a" +checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e" dependencies = [ + "jsonrpsee-client-transport", "jsonrpsee-core", - "jsonrpsee-http-server", + "jsonrpsee-http-client", "jsonrpsee-proc-macros", + "jsonrpsee-server", "jsonrpsee-types", + "jsonrpsee-wasm-client", "jsonrpsee-ws-client", - "jsonrpsee-ws-server", "tracing", ] [[package]] name = "jsonrpsee-client-transport" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8752740ecd374bcbf8b69f3e80b0327942df76f793f8d4e60d3355650c31fb74" +checksum = "965de52763f2004bc91ac5bcec504192440f0b568a5d621c59d9dbd6f886c3fb" dependencies = [ + "anyhow", + "futures-channel", + "futures-timer", "futures-util", + "gloo-net", "http", "jsonrpsee-core", "jsonrpsee-types", @@ -4122,9 +4462,9 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3dc3e9cf2ba50b7b1d7d76a667619f82846caa39e8e8daa8a4962d74acaddca" +checksum = "a4e70b4439a751a5de7dd5ed55eacff78ebf4ffe0fc009cb1ebb11417f5b536b" dependencies = [ "anyhow", "arrayvec 0.7.2", @@ -4135,10 +4475,8 @@ dependencies = [ "futures-timer", "futures-util", "globset", - "http", "hyper", "jsonrpsee-types", - "lazy_static", "parking_lot 0.12.1", "rand 0.8.5", "rustc-hash", @@ -4148,45 +4486,68 @@ dependencies = [ "thiserror", "tokio", "tracing", - "tracing-futures", - "unicase", + "wasm-bindgen-futures", ] [[package]] -name = "jsonrpsee-http-server" -version = "0.15.1" +name = "jsonrpsee-http-client" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03802f0373a38c2420c70b5144742d800b509e2937edc4afb116434f07120117" +checksum = "cc345b0a43c6bc49b947ebeb936e886a419ee3d894421790c969cc56040542ad" dependencies = [ - "futures-channel", - "futures-util", + "async-trait", "hyper", + "hyper-rustls", "jsonrpsee-core", "jsonrpsee-types", + "rustc-hash", "serde", "serde_json", + "thiserror", "tokio", "tracing", - "tracing-futures", ] [[package]] name = "jsonrpsee-proc-macros" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd67957d4280217247588ac86614ead007b301ca2fa9f19c19f880a536f029e3" +checksum = "baa6da1e4199c10d7b1d0a6e5e8bd8e55f351163b6f4b3cbb044672a69bd4c1c" dependencies = [ + "heck", "proc-macro-crate", "proc-macro2", "quote", "syn", ] +[[package]] +name = "jsonrpsee-server" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fb69dad85df79527c019659a992498d03f8495390496da2f07e6c24c2b356fc" +dependencies = [ + "futures-channel", + "futures-util", + "http", + "hyper", + "jsonrpsee-core", + "jsonrpsee-types", + "serde", + "serde_json", + "soketto", + "tokio", + "tokio-stream", + "tokio-util", + "tower", + "tracing", +] + [[package]] name = "jsonrpsee-types" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e290bba767401b646812f608c099b922d8142603c9e73a50fb192d3ac86f4a0d" +checksum = "5bd522fe1ce3702fd94812965d7bb7a3364b1c9aba743944c5a00529aae80f8c" dependencies = [ "anyhow", "beef", @@ -4197,35 +4558,26 @@ dependencies = [ ] [[package]] -name = "jsonrpsee-ws-client" -version = "0.15.1" +name = "jsonrpsee-wasm-client" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee5feddd5188e62ac08fcf0e56478138e581509d4730f3f7be9b57dd402a4ff" +checksum = "a77310456f43c6c89bcba1f6b2fc2a28300da7c341f320f5128f8c83cc63232d" dependencies = [ - "http", "jsonrpsee-client-transport", "jsonrpsee-core", "jsonrpsee-types", ] [[package]] -name = "jsonrpsee-ws-server" -version = "0.15.1" +name = "jsonrpsee-ws-client" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d488ba74fb369e5ab68926feb75a483458b88e768d44319f37e4ecad283c7325" +checksum = "0b83daeecfc6517cfe210df24e570fb06213533dfb990318fae781f4c7119dd9" dependencies = [ - "futures-channel", - "futures-util", "http", + "jsonrpsee-client-transport", "jsonrpsee-core", "jsonrpsee-types", - "serde_json", - "soketto", - "tokio", - "tokio-stream", - "tokio-util", - "tracing", - "tracing-futures", ] [[package]] @@ -4358,16 +4710,18 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" +checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +dependencies = [ + "cpufeatures", +] [[package]] name = "kusama-runtime" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "beefy-primitives", "bitvec 1.0.1", "frame-benchmarking", "frame-election-provider-support", @@ -4391,16 +4745,16 @@ dependencies = [ "pallet-conviction-voting", "pallet-democracy", "pallet-election-provider-multi-phase", - "pallet-election-provider-support-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33)", + "pallet-election-provider-support-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37)", "pallet-elections-phragmen", "pallet-fast-unstake", - "pallet-gilt", "pallet-grandpa", "pallet-identity", "pallet-im-online", "pallet-indices", "pallet-membership", "pallet-multisig", + "pallet-nis", "pallet-nomination-pools", "pallet-nomination-pools-benchmarking", "pallet-nomination-pools-runtime-api", @@ -4438,6 +4792,7 @@ dependencies = [ "sp-api", "sp-arithmetic", "sp-authority-discovery", + "sp-beefy", "sp-block-builder", "sp-consensus-babe", "sp-core", @@ -4461,8 +4816,8 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "frame-support", "polkadot-primitives", @@ -4473,46 +4828,33 @@ dependencies = [ "sp-weights", ] -[[package]] -name = "kv-log-macro" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" -dependencies = [ - "log", -] - [[package]] name = "kvdb" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585089ceadba0197ffe9af6740ab350b325e3c1f5fccfbc3522e0250c750409b" +checksum = "e7d770dcb02bf6835887c3a979b5107a04ff4bbde97a5f0928d27404a155add9" dependencies = [ - "parity-util-mem", "smallvec", ] [[package]] name = "kvdb-memorydb" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40d109c87bfb7759edd2a49b2649c1afe25af785d930ad6a38479b4dc70dd873" +checksum = "bf7a85fe66f9ff9cd74e169fdd2c94c6e1e74c412c99a73b4df3200b5d3760b2" dependencies = [ "kvdb", - "parity-util-mem", "parking_lot 0.12.1", ] [[package]] name = "kvdb-rocksdb" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c076cc2cdbac89b9910c853a36c957d3862a779f31c2661174222cefb49ee597" +checksum = "2182b8219fee6bd83aacaab7344e840179ae079d5216aa4e249b4d704646a844" dependencies = [ "kvdb", - "log", "num_cpus", - "parity-util-mem", "parking_lot 0.12.1", "regex", "rocksdb", @@ -4536,15 +4878,15 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.134" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "libloading" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ "cfg-if", "winapi", @@ -4552,22 +4894,27 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.5" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" + +[[package]] +name = "libm" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "292a948cd991e376cf75541fe5b97a1081d713c618b4f1b9500f8844e49eb565" +checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" [[package]] name = "libp2p" -version = "0.49.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec878fda12ebec479186b3914ebc48ff180fa4c51847e11a1a68bf65249e02c1" +checksum = "2e0a0d2f693675f49ded13c5d510c48b78069e23cbd9108d7ccd59f6dc568819" dependencies = [ "bytes", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", - "getrandom 0.2.7", + "getrandom 0.2.8", "instant", - "lazy_static", "libp2p-core", "libp2p-dns", "libp2p-identify", @@ -4577,11 +4924,12 @@ dependencies = [ "libp2p-mplex", "libp2p-noise", "libp2p-ping", + "libp2p-quic", "libp2p-request-response", "libp2p-swarm", - "libp2p-swarm-derive", "libp2p-tcp", "libp2p-wasm-ext", + "libp2p-webrtc", "libp2p-websocket", "libp2p-yamux", "multiaddr", @@ -4592,29 +4940,30 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799676bb0807c788065e57551c6527d461ad572162b0519d1958946ff9e0539d" +checksum = "b6a8fcd392ff67af6cc3f03b1426c41f7f26b6b9aff2dc632c1c56dd649e571f" dependencies = [ "asn1_der", "bs58", "ed25519-dalek", "either", "fnv", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "instant", - "lazy_static", "log", "multiaddr", "multihash", "multistream-select", + "once_cell", "parking_lot 0.12.1", "pin-project", "prost", "prost-build", "rand 0.8.5", "rw-stream-sink", + "sec1", "sha2 0.10.6", "smallvec", "thiserror", @@ -4625,12 +4974,11 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2322c9fb40d99101def6a01612ee30500c89abbbecb6297b3cd252903a4c1720" +checksum = "8e42a271c1b49f789b92f7fc87749fa79ce5c7bdc88cbdfacb818a4bca47fec5" dependencies = [ - "async-std-resolver", - "futures 0.3.24", + "futures 0.3.26", "libp2p-core", "log", "parking_lot 0.12.1", @@ -4640,12 +4988,12 @@ dependencies = [ [[package]] name = "libp2p-identify" -version = "0.40.0" +version = "0.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf9a121f699e8719bda2e6e9e9b6ddafc6cff4602471d6481c1067930ccb29b" +checksum = "c052d0026f4817b44869bfb6810f4e1112f43aec8553f2cb38881c524b563abf" dependencies = [ "asynchronous-codec", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "libp2p-core", "libp2p-swarm", @@ -4661,16 +5009,16 @@ dependencies = [ [[package]] name = "libp2p-kad" -version = "0.41.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6721c200e2021f6c3fab8b6cf0272ead8912d871610ee194ebd628cecf428f22" +checksum = "2766dcd2be8c87d5e1f35487deb22d765f49c6ae1251b3633efe3b25698bd3d2" dependencies = [ "arrayvec 0.7.2", "asynchronous-codec", "bytes", "either", "fnv", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "instant", "libp2p-core", @@ -4689,14 +5037,12 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.41.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "761704e727f7d68d58d7bc2231eafae5fc1b9814de24290f126df09d4bd37a15" +checksum = "04f378264aade9872d6ccd315c0accc18be3a35d15fc1b9c36e5b6f983b62b5b" dependencies = [ - "async-io", "data-encoding", - "dns-parser", - "futures 0.3.24", + "futures 0.3.26", "if-watch", "libp2p-core", "libp2p-swarm", @@ -4704,14 +5050,16 @@ dependencies = [ "rand 0.8.5", "smallvec", "socket2", + "tokio", + "trust-dns-proto", "void", ] [[package]] name = "libp2p-metrics" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee31b08e78b7b8bfd1c4204a9dd8a87b4fcdf6dafc57eb51701c1c264a81cb9" +checksum = "5ad8a64f29da86005c86a4d2728b8a0719e9b192f4092b609fd8790acb9dec55" dependencies = [ "libp2p-core", "libp2p-identify", @@ -4723,13 +5071,13 @@ dependencies = [ [[package]] name = "libp2p-mplex" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692664acfd98652de739a8acbb0a0d670f1d67190a49be6b4395e22c37337d89" +checksum = "03805b44107aa013e7cbbfa5627b31c36cbedfdfb00603c0311998882bc4bace" dependencies = [ "asynchronous-codec", "bytes", - "futures 0.3.24", + "futures 0.3.26", "libp2p-core", "log", "nohash-hasher", @@ -4741,33 +5089,34 @@ dependencies = [ [[package]] name = "libp2p-noise" -version = "0.40.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048155686bd81fe6cb5efdef0c6290f25ad32a0a42e8f4f72625cf6a505a206f" +checksum = "a978cb57efe82e892ec6f348a536bfbd9fee677adbe5689d7a93ad3a9bffbf2e" dependencies = [ "bytes", "curve25519-dalek 3.2.0", - "futures 0.3.24", - "lazy_static", + "futures 0.3.26", "libp2p-core", "log", + "once_cell", "prost", "prost-build", "rand 0.8.5", "sha2 0.10.6", "snow", "static_assertions", - "x25519-dalek", + "thiserror", + "x25519-dalek 1.1.1", "zeroize", ] [[package]] name = "libp2p-ping" -version = "0.40.1" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7228b9318d34689521349a86eb39a3c3a802c9efc99a0568062ffb80913e3f91" +checksum = "929fcace45a112536e22b3dcfd4db538723ef9c3cb79f672b98be2cc8e25f37f" dependencies = [ - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "instant", "libp2p-core", @@ -4777,15 +5126,36 @@ dependencies = [ "void", ] +[[package]] +name = "libp2p-quic" +version = "0.7.0-alpha" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01e7c867e95c8130667b24409d236d37598270e6da69b3baf54213ba31ffca59" +dependencies = [ + "bytes", + "futures 0.3.26", + "futures-timer", + "if-watch", + "libp2p-core", + "libp2p-tls", + "log", + "parking_lot 0.12.1", + "quinn-proto", + "rand 0.8.5", + "rustls 0.20.8", + "thiserror", + "tokio", +] + [[package]] name = "libp2p-request-response" -version = "0.22.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8827af16a017b65311a410bb626205a9ad92ec0473967618425039fa5231adc1" +checksum = "3236168796727bfcf4927f766393415361e2c644b08bedb6a6b13d957c9a4884" dependencies = [ "async-trait", "bytes", - "futures 0.3.24", + "futures 0.3.26", "instant", "libp2p-core", "libp2p-swarm", @@ -4797,29 +5167,31 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.40.1" +version = "0.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46d13df7c37807965d82930c0e4b04a659efcb6cca237373b206043db5398ecf" +checksum = "b2a35472fe3276b3855c00f1c032ea8413615e030256429ad5349cdf67c6e1a0" dependencies = [ "either", "fnv", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "instant", "libp2p-core", + "libp2p-swarm-derive", "log", "pin-project", "rand 0.8.5", "smallvec", "thiserror", + "tokio", "void", ] [[package]] name = "libp2p-swarm-derive" -version = "0.30.1" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0eddc4497a8b5a506013c40e8189864f9c3a00db2b25671f428ae9007f3ba32" +checksum = "9d527d5827582abd44a6d80c07ff8b50b4ee238a8979e05998474179e79dc400" dependencies = [ "heck", "quote", @@ -4828,27 +5200,45 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9839d96761491c6d3e238e70554b856956fca0ab60feb9de2cd08eed4473fa92" +checksum = "b4b257baf6df8f2df39678b86c578961d48cc8b68642a12f0f763f56c8e5858d" dependencies = [ - "async-io", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "if-watch", "libc", "libp2p-core", "log", "socket2", + "tokio", +] + +[[package]] +name = "libp2p-tls" +version = "0.1.0-alpha" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7905ce0d040576634e8a3229a7587cc8beab83f79db6023800f1792895defa8" +dependencies = [ + "futures 0.3.26", + "futures-rustls", + "libp2p-core", + "rcgen 0.10.0", + "ring", + "rustls 0.20.8", + "thiserror", + "webpki 0.22.0", + "x509-parser 0.14.0", + "yasna", ] [[package]] name = "libp2p-wasm-ext" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b5b8e7a73e379e47b1b77f8a82c4721e97eca01abcd18e9cd91a23ca6ce97" +checksum = "1bb1a35299860e0d4b3c02a3e74e3b293ad35ae0cee8a056363b0c862d082069" dependencies = [ - "futures 0.3.24", + "futures 0.3.26", "js-sys", "libp2p-core", "parity-send-wrapper", @@ -4856,14 +5246,45 @@ dependencies = [ "wasm-bindgen-futures", ] +[[package]] +name = "libp2p-webrtc" +version = "0.4.0-alpha" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb6cd86dd68cba72308ea05de1cebf3ba0ae6e187c40548167955d4e3970f6a" +dependencies = [ + "async-trait", + "asynchronous-codec", + "bytes", + "futures 0.3.26", + "futures-timer", + "hex", + "if-watch", + "libp2p-core", + "libp2p-noise", + "log", + "multihash", + "prost", + "prost-build", + "prost-codec", + "rand 0.8.5", + "rcgen 0.9.3", + "serde", + "stun", + "thiserror", + "tinytemplate", + "tokio", + "tokio-util", + "webrtc", +] + [[package]] name = "libp2p-websocket" -version = "0.39.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3758ae6f89b2531a24b6d9f5776bda6a626b60a57600d7185d43dfa75ca5ecc4" +checksum = "1d705506030d5c0aaf2882437c70dab437605f21c5f9811978f694e6917a3b54" dependencies = [ "either", - "futures 0.3.24", + "futures 0.3.26", "futures-rustls", "libp2p-core", "log", @@ -4877,11 +5298,11 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.41.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30f079097a21ad017fc8139460630286f02488c8c13b26affb46623aa20d8845" +checksum = "4f63594a0aa818642d9d4915c791945053877253f08a3626f13416b5cd928a29" dependencies = [ - "futures 0.3.24", + "futures 0.3.26", "libp2p-core", "log", "parking_lot 0.12.1", @@ -4911,7 +5332,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1" dependencies = [ "arrayref", - "base64 0.13.0", + "base64 0.13.1", "digest 0.9.0", "hmac-drbg", "libsecp256k1-core", @@ -4993,10 +5414,19 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6c601a85f5ecd1aba625247bca0031585fb1c446461b142878a16f8245ddeb8" dependencies = [ - "nalgebra", + "nalgebra 0.27.1", "statrs", ] +[[package]] +name = "linregress" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80bcca64d18ee67cc7c6a987a091c3d4eb7a760d486aa22f9e1aabcddeffb10f" +dependencies = [ + "nalgebra 0.31.4", +] + [[package]] name = "linux-raw-sys" version = "0.0.46" @@ -5026,7 +5456,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if", - "value-bag", ] [[package]] @@ -5163,6 +5592,7 @@ dependencies = [ "pallet-preimage", "pallet-proxy", "pallet-recovery", + "pallet-root-testing", "pallet-scheduler", "pallet-session", "pallet-sudo", @@ -5219,9 +5649,9 @@ dependencies = [ [[package]] name = "matches" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matrixmultiply" @@ -5232,6 +5662,15 @@ dependencies = [ "rawpointer", ] +[[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest 0.10.6", +] + [[package]] name = "memchr" version = "2.5.0" @@ -5240,18 +5679,18 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memfd" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "480b5a5de855d11ff13195950bdc8b98b5e942ef47afc447f6615cdcc4e15d80" +checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb" dependencies = [ - "rustix 0.35.11", + "rustix 0.36.7", ] [[package]] name = "memmap2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95af15f345b17af2efc8ead6080fb8bc376f8cec1b35277b935637595fe77498" +checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc" dependencies = [ "libc", ] @@ -5266,23 +5705,22 @@ dependencies = [ ] [[package]] -name = "memory-db" -version = "0.30.0" +name = "memoffset" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ac11bb793c28fa095b7554466f53b3a60a2cd002afdac01bcf135cbd73a269" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" dependencies = [ - "hash-db", - "hashbrown", - "parity-util-mem", + "autocfg", ] [[package]] -name = "memory-lru" -version = "0.1.1" +name = "memory-db" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce95ae042940bad7e312857b929ee3d11b8f799a80cb7b9c7ec5125516906395" +checksum = "5e0c7cba9ce19ac7ffd2053ac9f49843bbd3f4318feedfd74e85c19d5fb0ba66" dependencies = [ - "lru", + "hash-db", + "hashbrown", ] [[package]] @@ -5309,7 +5747,7 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69672161530e8aeca1d1400fbf3f1a1747ff60ea604265a4e906c2442df20532" dependencies = [ - "futures 0.3.24", + "futures 0.3.26", "rand 0.8.5", "thrift", ] @@ -5322,23 +5760,58 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.5.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" +checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.36.1", + "windows-sys 0.42.0", +] + +[[package]] +name = "mmr-gadget" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" +dependencies = [ + "futures 0.3.26", + "log", + "parity-scale-codec", + "sc-client-api", + "sc-offchain", + "sp-api", + "sp-beefy", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-mmr-primitives", + "sp-runtime", +] + +[[package]] +name = "mmr-rpc" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" +dependencies = [ + "anyhow", + "jsonrpsee", + "parity-scale-codec", + "serde", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-mmr-primitives", + "sp-runtime", ] [[package]] @@ -5624,7 +6097,7 @@ name = "module-evm" version = "2.12.0" dependencies = [ "acala-primitives", - "env_logger", + "env_logger 0.9.3", "frame-support", "frame-system", "hex", @@ -6121,14 +6594,14 @@ dependencies = [ [[package]] name = "multiaddr" -version = "0.14.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c580bfdd8803cce319b047d239559a22f809094aaea4ac13902a1fdcfcd4261" +checksum = "a4aebdb21e90f81d13ed01dc84123320838e53963c2ca94b60b305d3fa64f31e" dependencies = [ "arrayref", - "bs58", "byteorder", "data-encoding", + "multibase", "multihash", "percent-encoding", "serde", @@ -6158,7 +6631,7 @@ dependencies = [ "blake2s_simd", "blake3", "core2", - "digest 0.10.5", + "digest 0.10.6", "multihash-derive", "sha2 0.10.6", "sha3 0.10.6", @@ -6187,12 +6660,12 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multistream-select" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bc41247ec209813e2fd414d6e16b9d94297dacf3cd613fa6ef09cd4d9755c10" +checksum = "c8552ab875c1313b97b8d20cb857b9fd63e2d1d6a0a1b53ce9821e575405f27a" dependencies = [ "bytes", - "futures 0.3.24", + "futures 0.3.26", "log", "pin-project", "smallvec", @@ -6213,7 +6686,23 @@ dependencies = [ "num-traits", "rand 0.8.5", "rand_distr", - "simba", + "simba 0.5.1", + "typenum", +] + +[[package]] +name = "nalgebra" +version = "0.31.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20bd243ab3dbb395b39ee730402d2e5405e448c75133ec49cc977762c4cba3d1" +dependencies = [ + "approx", + "matrixmultiply", + "nalgebra-macros", + "num-complex", + "num-rational", + "num-traits", + "simba 0.7.3", "typenum", ] @@ -6271,9 +6760,9 @@ dependencies = [ [[package]] name = "netlink-packet-utils" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25af9cf0dc55498b7bd94a1508af7a78706aa0ab715a73c5169273e03c84845e" +checksum = "0ede8a08c71ad5a95cdd0e4e52facd37190977039a4704eb82a283f713747d34" dependencies = [ "anyhow", "byteorder", @@ -6288,7 +6777,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65b4b14489ab424703c092062176d52ba55485a89c076b4f9db05092b7223aa6" dependencies = [ "bytes", - "futures 0.3.24", + "futures 0.3.26", "log", "netlink-packet-core", "netlink-sys", @@ -6298,26 +6787,27 @@ dependencies = [ [[package]] name = "netlink-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92b654097027250401127914afb37cb1f311df6610a9891ff07a757e94199027" +checksum = "260e21fbb6f3d253a14df90eb0000a6066780a15dd901a7519ce02d77a94985b" dependencies = [ - "async-io", "bytes", - "futures 0.3.24", + "futures 0.3.26", "libc", "log", + "tokio", ] [[package]] name = "nix" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ "bitflags", "cfg-if", "libc", + "memoffset 0.6.5", ] [[package]] @@ -6328,14 +6818,23 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[package]] name = "nom" -version = "7.1.1" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", ] +[[package]] +name = "nom8" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" +dependencies = [ + "memchr", +] + [[package]] name = "normalize-line-endings" version = "0.3.0" @@ -6369,9 +6868,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19" +checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" dependencies = [ "num-traits", ] @@ -6426,33 +6925,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", - "libm", + "libm 0.2.6", ] [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi 0.1.19", + "hermit-abi 0.2.6", "libc", ] [[package]] name = "num_enum" -version = "0.5.7" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" +checksum = "8d829733185c1ca374f17e52b762f24f535ec625d2cc1f070e34c8a9068f341b" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.7" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" +checksum = "2be1598bf1c313dcdd12092e3f1920f463462525a21b7b4e11b4168353d0123e" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -6488,11 +6987,38 @@ dependencies = [ "memchr", ] +[[package]] +name = "object" +version = "0.30.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +dependencies = [ + "memchr", +] + +[[package]] +name = "oid-registry" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e20717fa0541f39bd146692035c37bedfa532b3e5071b35761082407546b2a" +dependencies = [ + "asn1-rs 0.3.1", +] + +[[package]] +name = "oid-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" +dependencies = [ + "asn1-rs 0.5.1", +] + [[package]] name = "once_cell" -version = "1.15.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" [[package]] name = "oorandom" @@ -6520,13 +7046,13 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "orchestra" -version = "0.0.2" +version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aab54694ddaa8a9b703724c6ef04272b2d27bc32d2c855aae5cdd1857216b43" +checksum = "17e7d5b6bb115db09390bed8842c94180893dd83df3dfce7354f2a2aa090a4ee" dependencies = [ "async-trait", "dyn-clonable", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "orchestra-proc-macro", "pin-project", @@ -6537,9 +7063,9 @@ dependencies = [ [[package]] name = "orchestra-proc-macro" -version = "0.0.2" +version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a702b2f6bf592b3eb06c00d80d05afaf7a8eff6b41bb361e397d799acc21b45a" +checksum = "c2af4dabb2286b0be0e9711d2d24e25f6217048b71210cffd3daddc3b5c84e1f" dependencies = [ "expander 0.0.6", "itertools", @@ -6615,6 +7141,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-preimage", + "pallet-root-testing", "pallet-scheduler", "parity-scale-codec", "scale-info", @@ -6632,10 +7159,10 @@ dependencies = [ "ansi_term", "bencher-procedural", "build-helper", - "cargo_metadata", - "frame-benchmarking", + "cargo_metadata 0.15.2", + "frame-support", "hash-db", - "linregress", + "linregress 0.5.0", "parity-scale-codec", "parking_lot 0.12.1", "paste", @@ -6929,6 +7456,7 @@ version = "0.4.1-dev" dependencies = [ "frame-support", "frame-system", + "orml-bencher", "pallet-balances", "parity-scale-codec", "scale-info", @@ -7000,15 +7528,48 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.3.0" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "p256" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" +dependencies = [ + "ecdsa", + "elliptic-curve", + "sha2 0.10.6", +] + +[[package]] +name = "p384" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" +dependencies = [ + "ecdsa", + "elliptic-curve", + "sha2 0.10.6", +] + +[[package]] +name = "packed_simd_2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" +checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" +dependencies = [ + "cfg-if", + "libm 0.1.4", +] [[package]] name = "pallet-asset-tx-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", "pallet-transaction-payment", @@ -7024,13 +7585,14 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", "scale-info", + "sp-core", "sp-runtime", "sp-std", ] @@ -7038,7 +7600,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-support", "frame-system", @@ -7054,7 +7616,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-support", "frame-system", @@ -7070,7 +7632,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-support", "frame-system", @@ -7085,7 +7647,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7109,7 +7671,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7129,7 +7691,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7144,15 +7706,15 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "beefy-primitives", "frame-support", "frame-system", "pallet-session", "parity-scale-codec", "scale-info", "serde", + "sp-beefy", "sp-runtime", "sp-std", ] @@ -7160,11 +7722,10 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "array-bytes", + "array-bytes 4.2.0", "beefy-merkle-tree", - "beefy-primitives", "frame-support", "frame-system", "log", @@ -7174,6 +7735,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", + "sp-beefy", "sp-core", "sp-io", "sp-runtime", @@ -7183,7 +7745,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7201,7 +7763,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7220,7 +7782,7 @@ dependencies = [ [[package]] name = "pallet-collator-selection" version = "3.0.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "frame-benchmarking", "frame-support", @@ -7239,7 +7801,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7256,7 +7818,7 @@ dependencies = [ [[package]] name = "pallet-conviction-voting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "assert_matches", "frame-benchmarking", @@ -7273,7 +7835,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7291,16 +7853,16 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-election-provider-support", "frame-support", "frame-system", "log", - "pallet-election-provider-support-benchmarking 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b)", + "pallet-election-provider-support-benchmarking 4.0.0-dev (git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4)", "parity-scale-codec", - "rand 0.7.3", + "rand 0.8.5", "scale-info", "sp-arithmetic", "sp-core", @@ -7308,14 +7870,13 @@ dependencies = [ "sp-npos-elections", "sp-runtime", "sp-std", - "static_assertions", "strum", ] [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7328,7 +7889,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7341,7 +7902,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7359,7 +7920,7 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7374,25 +7935,10 @@ dependencies = [ "sp-std", ] -[[package]] -name = "pallet-gilt" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" -dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-arithmetic", - "sp-runtime", - "sp-std", -] - [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7415,7 +7961,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "enumflags2 0.7.5", "frame-benchmarking", @@ -7431,7 +7977,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7451,7 +7997,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7468,7 +8014,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7485,9 +8031,8 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "ckb-merkle-mountain-range", "frame-benchmarking", "frame-support", "frame-system", @@ -7501,33 +8046,33 @@ dependencies = [ ] [[package]] -name = "pallet-mmr-rpc" -version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +name = "pallet-multisig" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "anyhow", - "jsonrpsee", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", "parity-scale-codec", - "serde", - "sp-api", - "sp-blockchain", - "sp-core", - "sp-mmr-primitives", + "scale-info", + "sp-io", "sp-runtime", + "sp-std", ] [[package]] -name = "pallet-multisig" +name = "pallet-nis" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "log", "parity-scale-codec", "scale-info", - "sp-io", + "sp-arithmetic", + "sp-core", "sp-runtime", "sp-std", ] @@ -7535,7 +8080,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-support", "frame-system", @@ -7552,7 +8097,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7572,7 +8117,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "parity-scale-codec", "sp-api", @@ -7582,7 +8127,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-support", "frame-system", @@ -7599,7 +8144,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7622,7 +8167,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7639,7 +8184,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7654,7 +8199,7 @@ dependencies = [ [[package]] name = "pallet-ranked-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7672,7 +8217,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7687,12 +8232,13 @@ dependencies = [ [[package]] name = "pallet-referenda" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "assert_matches", "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", "serde", @@ -7702,10 +8248,25 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-root-testing" +version = "1.0.0-dev" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" +dependencies = [ + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7716,12 +8277,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", + "sp-weights", ] [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-support", "frame-system", @@ -7742,14 +8304,14 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "pallet-session", "pallet-staking", - "rand 0.7.3", + "rand 0.8.5", "sp-runtime", "sp-session", "sp-std", @@ -7758,7 +8320,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-support", "frame-system", @@ -7772,7 +8334,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7795,7 +8357,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7806,7 +8368,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "log", "sp-arithmetic", @@ -7815,7 +8377,7 @@ dependencies = [ [[package]] name = "pallet-state-trie-migration" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7832,7 +8394,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-support", "frame-system", @@ -7846,7 +8408,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7864,7 +8426,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7883,7 +8445,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-support", "frame-system", @@ -7899,7 +8461,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -7915,7 +8477,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -7927,7 +8489,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7944,7 +8506,7 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7959,7 +8521,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7975,7 +8537,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7990,7 +8552,7 @@ dependencies = [ [[package]] name = "pallet-whitelist" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-benchmarking", "frame-support", @@ -8004,8 +8566,8 @@ dependencies = [ [[package]] name = "pallet-xcm" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "frame-support", "frame-system", @@ -8022,8 +8584,8 @@ dependencies = [ [[package]] name = "pallet-xcm-benchmarks" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "frame-benchmarking", "frame-support", @@ -8040,7 +8602,7 @@ dependencies = [ [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -8052,7 +8614,7 @@ dependencies = [ [[package]] name = "parachains-common" version = "1.0.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "cumulus-primitives-utility", "frame-support", @@ -8077,9 +8639,9 @@ dependencies = [ [[package]] name = "parity-db" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a7511a0bec4a336b5929999d02b560d2439c993cccf98c26481484e811adc43" +checksum = "dd684a725651d9588ef21f140a328b6b4f64e646b2e931f3e6f14f75eedf9980" dependencies = [ "blake2", "crc32fast", @@ -8096,9 +8658,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.2.1" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "366e44391a8af4cfd6002ef6ba072bae071a96aafca98d7d448a34c5dca38b6a" +checksum = "c3840933452adf7b3b9145e27086a5a3376c619dca1a21b1e5a5af0d54979bed" dependencies = [ "arrayvec 0.7.2", "bitvec 1.0.1", @@ -8111,9 +8673,9 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.1.3" +version = "3.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9299338969a3d2f491d65f140b00ddec470858402f888af98e8642fb5e8965cd" +checksum = "86b26a931f824dd4eca30b3e43bb4f31cd5f0d3a403c5f5ff27106b805bfde7b" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8127,35 +8689,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" -[[package]] -name = "parity-util-mem" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d32c34f4f5ca7f9196001c0aba5a1f9a5a12382c8944b8b0f90233282d1e8f8" -dependencies = [ - "cfg-if", - "hashbrown", - "impl-trait-for-tuples", - "parity-util-mem-derive", - "parking_lot 0.12.1", - "primitive-types", - "smallvec", - "tikv-jemalloc-ctl", - "tikv-jemallocator", - "winapi", -] - -[[package]] -name = "parity-util-mem-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" -dependencies = [ - "proc-macro2", - "syn", - "synstructure", -] - [[package]] name = "parity-wasm" version = "0.32.0" @@ -8185,7 +8718,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core 0.8.5", + "parking_lot_core 0.8.6", ] [[package]] @@ -8195,14 +8728,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.3", + "parking_lot_core 0.9.6", ] [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if", "instant", @@ -8214,15 +8747,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.3" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" +checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] @@ -8238,18 +8771,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" - -[[package]] -name = "pbkdf2" -version = "0.4.0" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" -dependencies = [ - "crypto-mac 0.8.0", -] +checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" [[package]] name = "pbkdf2" @@ -8266,7 +8790,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", "hmac 0.12.1", "password-hash", "sha2 0.10.6", @@ -8278,6 +8802,24 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" +[[package]] +name = "pem" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +dependencies = [ + "base64 0.13.1", +] + +[[package]] +name = "pem-rfc7468" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" +dependencies = [ + "base64ct", +] + [[package]] name = "percent-encoding" version = "2.2.0" @@ -8286,9 +8828,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.4.0" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc7bc69c062e492337d74d59b120c274fd3d261b6bf6d3207d499b4b379c41a" +checksum = "4ab62d2fa33726dbe6321cc97ef96d8cde531e3eeaf858a058de53a8a6d40d8f" dependencies = [ "thiserror", "ucd-trie", @@ -8296,9 +8838,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.4.0" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b75706b9642ebcb34dab3bc7750f811609a0eb1dd8b88c2d15bf628c1c65b2" +checksum = "8bf026e2d0581559db66d837fe5242320f525d85c76283c61f4d51a1238d65ea" dependencies = [ "pest", "pest_generator", @@ -8306,9 +8848,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.4.0" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f9272122f5979a6511a749af9db9bfc810393f63119970d7085fed1c4ea0db" +checksum = "2b27bd18aa01d91c8ed2b61ea23406a676b42d82609c6e2581fba42f0c15f17f" dependencies = [ "pest", "pest_meta", @@ -8319,13 +8861,13 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.4.0" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8717927f9b79515e565a64fe46c38b8cd0427e64c40680b14a7365ab09ac8d" +checksum = "9f02b677c1859756359fc9983c2e56a0237f18624a3789528804406b7e915e5d" dependencies = [ "once_cell", "pest", - "sha1", + "sha2 0.10.6", ] [[package]] @@ -8388,9 +8930,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "platforms" @@ -8398,6 +8940,12 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" +[[package]] +name = "platforms" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" + [[package]] name = "plotters" version = "0.3.4" @@ -8428,67 +8976,44 @@ dependencies = [ [[package]] name = "polkadot-approval-distribution" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "futures 0.3.24", + "futures 0.3.26", + "polkadot-node-metrics 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", - "polkadot-node-subsystem-util", "polkadot-primitives", "rand 0.8.5", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" -dependencies = [ - "futures 0.3.24", - "polkadot-node-network-protocol", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", - "rand 0.8.5", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", -] - -[[package]] -name = "polkadot-availability-distribution" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "derive_more", - "fatality", - "futures 0.3.24", - "lru", - "parity-scale-codec", - "polkadot-erasure-coding 0.9.33 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.33)", + "futures 0.3.26", "polkadot-node-network-protocol", - "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", "rand 0.8.5", - "sp-core", - "sp-keystore", - "thiserror", - "tracing-gum 0.9.33 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.33)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-availability-distribution" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "derive_more", "fatality", - "futures 0.3.24", + "futures 0.3.26", "lru", "parity-scale-codec", - "polkadot-erasure-coding 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -8498,19 +9023,19 @@ dependencies = [ "sp-core", "sp-keystore", "thiserror", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-availability-recovery" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "fatality", - "futures 0.3.24", + "futures 0.3.26", "lru", "parity-scale-codec", - "polkadot-erasure-coding 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -8519,30 +9044,31 @@ dependencies = [ "rand 0.8.5", "sc-network", "thiserror", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-cli" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "clap 4.0.29", + "clap 4.1.4", "frame-benchmarking-cli", - "futures 0.3.24", + "futures 0.3.26", "log", "polkadot-client", "polkadot-node-core-pvf", - "polkadot-node-metrics", + "polkadot-node-metrics 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", "polkadot-performance-test", "polkadot-service", "sc-cli", + "sc-executor", "sc-service", "sc-sysinfo", "sc-tracing", "sp-core", + "sp-io", "sp-keyring", - "sp-trie", "substrate-build-script-utils", "thiserror", "try-runtime-cli", @@ -8550,14 +9076,15 @@ dependencies = [ [[package]] name = "polkadot-client" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "beefy-primitives", + "async-trait", "frame-benchmarking", "frame-benchmarking-cli", "frame-system", "frame-system-rpc-runtime-api", + "futures 0.3.26", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "polkadot-core-primitives", @@ -8572,6 +9099,7 @@ dependencies = [ "sc-service", "sp-api", "sp-authority-discovery", + "sp-beefy", "sp-block-builder", "sp-blockchain", "sp-consensus", @@ -8591,13 +9119,13 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "always-assert", "bitvec 1.0.1", "fatality", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -8608,16 +9136,15 @@ dependencies = [ "sp-keystore", "sp-runtime", "thiserror", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-core-primitives" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "parity-scale-codec", - "parity-util-mem", "scale-info", "sp-core", "sp-runtime", @@ -8626,47 +9153,33 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "derive_more", "fatality", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "indexmap", "lru", "parity-scale-codec", - "polkadot-erasure-coding 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "polkadot-erasure-coding", "polkadot-node-network-protocol", "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", - "sc-network", - "sp-application-crypto", - "sp-keystore", - "thiserror", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", -] - -[[package]] -name = "polkadot-erasure-coding" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" -dependencies = [ - "parity-scale-codec", - "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", "polkadot-primitives", - "reed-solomon-novelpoly", - "sp-core", - "sp-trie", + "sc-network", + "sp-application-crypto", + "sp-keystore", "thiserror", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-erasure-coding" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -8679,10 +9192,10 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "polkadot-node-network-protocol", "polkadot-node-subsystem", @@ -8694,65 +9207,65 @@ dependencies = [ "sp-application-crypto", "sp-core", "sp-keystore", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-network-bridge" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "always-assert", "async-trait", "bytes", "fatality", - "futures 0.3.24", + "futures 0.3.26", "parity-scale-codec", "parking_lot 0.12.1", + "polkadot-node-metrics 0.9.37 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.37)", "polkadot-node-network-protocol", "polkadot-node-subsystem", - "polkadot-node-subsystem-util", "polkadot-overseer", "polkadot-primitives", "sc-network", "sc-network-common", "sp-consensus", "thiserror", - "tracing-gum 0.9.33 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.33)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.37)", ] [[package]] name = "polkadot-network-bridge" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "always-assert", "async-trait", "bytes", "fatality", - "futures 0.3.24", + "futures 0.3.26", "parity-scale-codec", "parking_lot 0.12.1", + "polkadot-node-metrics 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", "polkadot-node-network-protocol", "polkadot-node-subsystem", - "polkadot-node-subsystem-util", "polkadot-overseer", "polkadot-primitives", "sc-network", "sc-network-common", "sp-consensus", "thiserror", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-node-collation-generation" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "futures 0.3.24", + "futures 0.3.26", "parity-scale-codec", - "polkadot-erasure-coding 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -8760,23 +9273,23 @@ dependencies = [ "sp-core", "sp-maybe-compressed-blob", "thiserror", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "bitvec 1.0.1", "derive_more", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "kvdb", "lru", "merlin", "parity-scale-codec", - "polkadot-node-jaeger 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "polkadot-node-jaeger 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -8789,38 +9302,38 @@ dependencies = [ "sp-consensus-slots", "sp-runtime", "thiserror", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-node-core-av-store" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "bitvec 1.0.1", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "kvdb", "parity-scale-codec", - "polkadot-erasure-coding 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-overseer", "polkadot-primitives", "thiserror", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-node-core-backing" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "bitvec 1.0.1", "fatality", - "futures 0.3.24", - "polkadot-erasure-coding 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "futures 0.3.26", + "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -8828,64 +9341,64 @@ dependencies = [ "polkadot-statement-table", "sp-keystore", "thiserror", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "futures 0.3.24", + "futures 0.3.26", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", "sp-keystore", "thiserror", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", "wasm-timer", ] [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "async-trait", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "parity-scale-codec", "polkadot-node-core-pvf", + "polkadot-node-metrics 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", "polkadot-node-primitives", "polkadot-node-subsystem", - "polkadot-node-subsystem-util", "polkadot-parachain", "polkadot-primitives", "sp-maybe-compressed-blob", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "futures 0.3.24", + "futures 0.3.26", + "polkadot-node-metrics 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", "polkadot-node-subsystem", - "polkadot-node-subsystem-util", "polkadot-primitives", "sc-client-api", "sc-consensus-babe", "sp-blockchain", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "kvdb", "parity-scale-codec", @@ -8894,16 +9407,16 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "thiserror", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "fatality", - "futures 0.3.24", + "futures 0.3.26", "kvdb", "lru", "parity-scale-codec", @@ -8913,34 +9426,34 @@ dependencies = [ "polkadot-primitives", "sc-keystore", "thiserror", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "async-trait", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "polkadot-node-subsystem", + "polkadot-overseer", "polkadot-primitives", "sp-blockchain", "sp-inherents", - "sp-runtime", "thiserror", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "bitvec 1.0.1", "fatality", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -8948,24 +9461,23 @@ dependencies = [ "polkadot-primitives", "rand 0.8.5", "thiserror", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-node-core-pvf" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "always-assert", "assert_matches", - "async-process", - "async-std", - "futures 0.3.24", + "cpu-time", + "futures 0.3.26", "futures-timer", "parity-scale-codec", "pin-project", "polkadot-core-primitives", - "polkadot-node-metrics", + "polkadot-node-metrics 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", "polkadot-parachain", "rand 0.8.5", "rayon", @@ -8980,15 +9492,16 @@ dependencies = [ "sp-tracing", "sp-wasm-interface", "tempfile", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tokio", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-node-core-pvf-checker" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "futures 0.3.24", + "futures 0.3.26", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -8996,31 +9509,29 @@ dependencies = [ "polkadot-primitives", "sp-keystore", "thiserror", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "futures 0.3.24", - "memory-lru", - "parity-util-mem", + "futures 0.3.26", + "lru", + "polkadot-node-metrics 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", "polkadot-node-subsystem", "polkadot-node-subsystem-types", - "polkadot-node-subsystem-util", "polkadot-primitives", "sp-consensus-babe", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-node-jaeger" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "async-std", "lazy_static", "log", "mick-jaeger", @@ -9031,14 +9542,14 @@ dependencies = [ "sc-network", "sp-core", "thiserror", + "tokio", ] [[package]] name = "polkadot-node-jaeger" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "async-std", "lazy_static", "log", "mick-jaeger", @@ -9049,15 +9560,35 @@ dependencies = [ "sc-network", "sp-core", "thiserror", + "tokio", +] + +[[package]] +name = "polkadot-node-metrics" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" +dependencies = [ + "bs58", + "futures 0.3.26", + "futures-timer", + "log", + "parity-scale-codec", + "polkadot-primitives", + "prioritized-metered-channel", + "sc-cli", + "sc-service", + "sc-tracing", + "substrate-prometheus-endpoint", + "tracing-gum 0.9.37 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.37)", ] [[package]] name = "polkadot-node-metrics" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "bs58", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "log", "parity-scale-codec", @@ -9067,21 +9598,21 @@ dependencies = [ "sc-service", "sc-tracing", "substrate-prometheus-endpoint", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-node-network-protocol" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "async-trait", "derive_more", "fatality", - "futures 0.3.24", + "futures 0.3.26", "hex", "parity-scale-codec", - "polkadot-node-jaeger 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "polkadot-node-jaeger 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", "polkadot-node-primitives", "polkadot-primitives", "rand 0.8.5", @@ -9090,16 +9621,16 @@ dependencies = [ "sc-network-common", "strum", "thiserror", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-node-primitives" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "bounded-vec", - "futures 0.3.24", + "futures 0.3.26", "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", @@ -9117,24 +9648,24 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "polkadot-node-jaeger 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "polkadot-node-jaeger 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", "polkadot-node-subsystem-types", "polkadot-overseer", ] [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "async-trait", "derive_more", - "futures 0.3.24", + "futures 0.3.26", "orchestra", - "polkadot-node-jaeger 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "polkadot-node-jaeger 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-primitives", @@ -9150,23 +9681,23 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "async-trait", "derive_more", "fatality", - "futures 0.3.24", + "futures 0.3.26", + "futures-channel", "itertools", "kvdb", "lru", "parity-db", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.11.2", "pin-project", - "polkadot-node-jaeger 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", - "polkadot-node-metrics", + "polkadot-node-jaeger 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", + "polkadot-node-metrics 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -9178,22 +9709,21 @@ dependencies = [ "sp-core", "sp-keystore", "thiserror", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-overseer" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "async-trait", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "lru", "orchestra", - "parity-util-mem", "parking_lot 0.12.1", - "polkadot-node-metrics", + "polkadot-node-metrics 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem-types", @@ -9201,18 +9731,18 @@ dependencies = [ "sc-client-api", "sp-api", "sp-core", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tikv-jemalloc-ctl", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-parachain" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "derive_more", "frame-support", "parity-scale-codec", - "parity-util-mem", "polkadot-core-primitives", "scale-info", "serde", @@ -9223,13 +9753,13 @@ dependencies = [ [[package]] name = "polkadot-performance-test" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "env_logger", + "env_logger 0.9.3", "kusama-runtime", "log", - "polkadot-erasure-coding 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "polkadot-erasure-coding", "polkadot-node-core-pvf", "polkadot-node-primitives", "quote", @@ -9238,13 +9768,12 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "bitvec 1.0.1", "hex-literal", "parity-scale-codec", - "parity-util-mem", "polkadot-core-primitives", "polkadot-parachain", "scale-info", @@ -9265,13 +9794,13 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", "jsonrpsee", - "pallet-mmr-rpc", + "mmr-rpc", "pallet-transaction-payment-rpc", "polkadot-primitives", "sc-chain-spec", @@ -9297,10 +9826,9 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "beefy-primitives", "bitvec 1.0.1", "frame-benchmarking", "frame-election-provider-support", @@ -9322,7 +9850,7 @@ dependencies = [ "pallet-collective", "pallet-democracy", "pallet-election-provider-multi-phase", - "pallet-election-provider-support-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33)", + "pallet-election-provider-support-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37)", "pallet-elections-phragmen", "pallet-fast-unstake", "pallet-grandpa", @@ -9363,6 +9891,7 @@ dependencies = [ "smallvec", "sp-api", "sp-authority-discovery", + "sp-beefy", "sp-block-builder", "sp-consensus-babe", "sp-core", @@ -9386,10 +9915,9 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "beefy-primitives", "bitvec 1.0.1", "frame-benchmarking", "frame-election-provider-support", @@ -9420,6 +9948,7 @@ dependencies = [ "serde_derive", "slot-range-helper", "sp-api", + "sp-beefy", "sp-core", "sp-inherents", "sp-io", @@ -9434,8 +9963,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-constants" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "frame-support", "polkadot-primitives", @@ -9448,8 +9977,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "bs58", "parity-scale-codec", @@ -9460,8 +9989,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "bitflags", "bitvec 1.0.1", @@ -9503,20 +10032,20 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "async-trait", "beefy-gadget", - "beefy-primitives", "frame-support", "frame-system-rpc-runtime-api", - "futures 0.3.24", + "futures 0.3.26", "hex-literal", "kusama-runtime", "kvdb", "kvdb-rocksdb", "lru", + "mmr-gadget", "pallet-babe", "pallet-im-online", "pallet-staking", @@ -9524,13 +10053,13 @@ dependencies = [ "parity-db", "polkadot-approval-distribution", "polkadot-availability-bitfield-distribution", - "polkadot-availability-distribution 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "polkadot-availability-distribution", "polkadot-availability-recovery", "polkadot-client", "polkadot-collator-protocol", "polkadot-dispute-distribution", "polkadot-gossip-support", - "polkadot-network-bridge 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "polkadot-network-bridge 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", "polkadot-node-collation-generation", "polkadot-node-core-approval-voting", "polkadot-node-core-av-store", @@ -9583,6 +10112,7 @@ dependencies = [ "serde_json", "sp-api", "sp-authority-discovery", + "sp-beefy", "sp-block-builder", "sp-blockchain", "sp-consensus", @@ -9592,6 +10122,7 @@ dependencies = [ "sp-inherents", "sp-io", "sp-keystore", + "sp-mmr-primitives", "sp-offchain", "sp-runtime", "sp-session", @@ -9602,18 +10133,18 @@ dependencies = [ "sp-trie", "substrate-prometheus-endpoint", "thiserror", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", "westend-runtime", ] [[package]] name = "polkadot-statement-distribution" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "arrayvec 0.5.2", "fatality", - "futures 0.3.24", + "futures 0.3.26", "indexmap", "parity-scale-codec", "polkadot-node-network-protocol", @@ -9624,13 +10155,13 @@ dependencies = [ "sp-keystore", "sp-staking", "thiserror", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polkadot-statement-table" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -9639,10 +10170,9 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "beefy-primitives", "bitvec 1.0.1", "frame-election-provider-support", "frame-executive", @@ -9678,6 +10208,7 @@ dependencies = [ "smallvec", "sp-api", "sp-authority-discovery", + "sp-beefy", "sp-block-builder", "sp-consensus-babe", "sp-core", @@ -9700,12 +10231,12 @@ dependencies = [ [[package]] name = "polkadot-test-service" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "frame-benchmarking", "frame-system", - "futures 0.3.24", + "futures 0.3.26", "hex", "pallet-balances", "pallet-staking", @@ -9749,21 +10280,21 @@ dependencies = [ "tempfile", "test-runtime-constants", "tokio", - "tracing-gum 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "polling" -version = "2.3.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "899b00b9c8ab553c743b3e11e87c5c7d423b2a2de229ba95b24a756344748011" +checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6" dependencies = [ "autocfg", "cfg-if", "libc", "log", "wepoll-ffi", - "winapi", + "windows-sys 0.42.0", ] [[package]] @@ -9777,6 +10308,17 @@ dependencies = [ "universal-hash", ] +[[package]] +name = "polyval" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" +dependencies = [ + "cpuid-bool", + "opaque-debug 0.3.0", + "universal-hash", +] + [[package]] name = "polyval" version = "0.5.3" @@ -9800,15 +10342,15 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "predicates" -version = "2.1.3" +version = "2.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6bd09a7f7e68f3f0bf710fb7ab9c4615a488b58b5f653382a687701e458c92" +checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ "difflib", "float-cmp", @@ -9836,9 +10378,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c142c0e46b57171fe0c528bee8c5b7569e80f0c17e377cd0e30ea57dbc11bb51" +checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78" dependencies = [ "proc-macro2", "syn", @@ -9867,7 +10409,7 @@ dependencies = [ "coarsetime", "crossbeam-queue", "derive_more", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "nanorand", "thiserror", @@ -9876,13 +10418,12 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34" dependencies = [ "once_cell", - "thiserror", - "toml", + "toml_edit", ] [[package]] @@ -9911,18 +10452,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" dependencies = [ "unicode-ident", ] [[package]] name = "prometheus" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c8babc29389186697fe5a2a4859d697825496b83db5d0b65271cdc0488e88c" +checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" dependencies = [ "cfg-if", "fnv", @@ -9957,9 +10498,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.2" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0841812012b2d4a6145fae9a6af1534873c32aa67fff26bd09f8fa42c83f95a" +checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698" dependencies = [ "bytes", "prost-derive", @@ -9967,9 +10508,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.2" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d8b442418ea0822409d9e7d047cbf1e7e9e1760b172bf9982cf29d517c93511" +checksum = "a3f8ad728fb08fe212df3c05169e940fbb6d9d16a877ddde14644a983ba2012e" dependencies = [ "bytes", "heck", @@ -9989,9 +10530,9 @@ dependencies = [ [[package]] name = "prost-codec" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "011ae9ff8359df7915f97302d591cdd9e0e27fbd5a4ddc5bd13b71079bb20987" +checksum = "0dc34979ff898b6e141106178981ce2596c387ea6e62533facfc61a37fc879c0" dependencies = [ "asynchronous-codec", "bytes", @@ -10002,9 +10543,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.2" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164ae68b6587001ca506d3bf7f1000bfa248d0e1217b618108fba4ec1d0cc306" +checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d" dependencies = [ "anyhow", "itertools", @@ -10015,9 +10556,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.2" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747761bc3dc48f9a34553bf65605cf6cb6288ba219f3450b4275dbd81539551a" +checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788" dependencies = [ "bytes", "prost", @@ -10049,11 +10590,29 @@ dependencies = [ "pin-project-lite 0.1.12", ] +[[package]] +name = "quinn-proto" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4ced82a24bb281af338b9e8f94429b6eca01b4e66d899f40031f074e74c9" +dependencies = [ + "bytes", + "rand 0.8.5", + "ring", + "rustc-hash", + "rustls 0.20.8", + "slab", + "thiserror", + "tinyvec", + "tracing", + "webpki 0.22.0", +] + [[package]] name = "quote" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] @@ -10081,7 +10640,6 @@ dependencies = [ "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc", - "rand_pcg 0.2.1", ] [[package]] @@ -10130,7 +10688,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", ] [[package]] @@ -10152,15 +10710,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - [[package]] name = "rand_pcg" version = "0.3.1" @@ -10178,21 +10727,19 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.5.3" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" dependencies = [ - "autocfg", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.3" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -10200,6 +10747,31 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "rcgen" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" +dependencies = [ + "pem", + "ring", + "time 0.3.17", + "x509-parser 0.13.2", + "yasna", +] + +[[package]] +name = "rcgen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" +dependencies = [ + "pem", + "ring", + "time 0.3.17", + "yasna", +] + [[package]] name = "redox_syscall" version = "0.2.16" @@ -10215,7 +10787,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", "redox_syscall", "thiserror", ] @@ -10235,18 +10807,18 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.9" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed13bcd201494ab44900a96490291651d200730904221832b9547d24a87d332b" +checksum = "8c78fb8c9293bcd48ef6fce7b4ca950ceaf21210de6e105a883ee280c0f7b9ed" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.9" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5234cd6063258a5e32903b53b1b6ac043a0541c8adc1f610f67b0326c7a578fa" +checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f" dependencies = [ "proc-macro2", "quote", @@ -10267,9 +10839,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "aho-corasick", "memchr", @@ -10287,26 +10859,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" - -[[package]] -name = "remote-externalities" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" -dependencies = [ - "env_logger", - "log", - "parity-scale-codec", - "serde", - "serde_json", - "sp-core", - "sp-io", - "sp-runtime", - "sp-version", - "substrate-rpc-client", -] +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "remove_dir_all" @@ -10359,7 +10914,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -10407,17 +10962,17 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "beefy-merkle-tree", - "beefy-primitives", "frame-benchmarking", "frame-executive", "frame-support", "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", + "frame-try-runtime", "hex-literal", "log", "pallet-authority-discovery", @@ -10431,7 +10986,6 @@ dependencies = [ "pallet-collective", "pallet-democracy", "pallet-elections-phragmen", - "pallet-gilt", "pallet-grandpa", "pallet-identity", "pallet-im-online", @@ -10439,6 +10993,7 @@ dependencies = [ "pallet-membership", "pallet-mmr", "pallet-multisig", + "pallet-nis", "pallet-offences", "pallet-preimage", "pallet-proxy", @@ -10470,6 +11025,7 @@ dependencies = [ "smallvec", "sp-api", "sp-authority-discovery", + "sp-beefy", "sp-block-builder", "sp-consensus-babe", "sp-core", @@ -10492,8 +11048,8 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "frame-support", "polkadot-primitives", @@ -10506,27 +11062,63 @@ dependencies = [ [[package]] name = "rpassword" -version = "7.1.0" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20c9f5d2a0c3e2ea729ab3706d22217177770654c3ef5056b68b69d07332d3f5" +checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" dependencies = [ "libc", + "rtoolbox", "winapi", ] +[[package]] +name = "rtcp" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1919efd6d4a6a85d13388f9487549bb8e359f17198cc03ffd72f79b553873691" +dependencies = [ + "bytes", + "thiserror", + "webrtc-util", +] + [[package]] name = "rtnetlink" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0" dependencies = [ - "async-global-executor", - "futures 0.3.24", + "futures 0.3.26", "log", "netlink-packet-route", "netlink-proto", "nix", "thiserror", + "tokio", +] + +[[package]] +name = "rtoolbox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "rtp" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a095411ff00eed7b12e4c6a118ba984d113e1079582570d56a5ee723f11f80" +dependencies = [ + "async-trait", + "bytes", + "rand 0.8.5", + "serde", + "thiserror", + "webrtc-util", ] [[package]] @@ -10609,7 +11201,7 @@ dependencies = [ "cumulus-primitives-utility", "cumulus-test-relay-sproof-builder", "ecosystem-renvm-bridge", - "env_logger", + "env_logger 0.9.3", "frame-support", "frame-system", "hex", @@ -10741,32 +11333,41 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.14", + "semver 1.0.16", +] + +[[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", ] [[package]] name = "rustix" -version = "0.35.11" +version = "0.35.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb2fda4666def1433b1b05431ab402e42a1084285477222b72d6c564c417cef" +checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" dependencies = [ "bitflags", "errno", - "io-lifetimes 0.7.3", + "io-lifetimes 0.7.5", "libc", "linux-raw-sys 0.0.46", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] name = "rustix" -version = "0.36.5" +version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" +checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" dependencies = [ "bitflags", "errno", - "io-lifetimes 1.0.3", + "io-lifetimes 1.0.4", "libc", "linux-raw-sys 0.1.4", "windows-sys 0.42.0", @@ -10774,14 +11375,27 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.6" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +dependencies = [ + "base64 0.13.1", + "log", + "ring", + "sct 0.6.1", + "webpki 0.21.4", +] + +[[package]] +name = "rustls" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log", "ring", - "sct", - "webpki", + "sct 0.7.0", + "webpki 0.22.0", ] [[package]] @@ -10798,18 +11412,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64 0.13.0", + "base64 0.21.0", ] [[package]] name = "rustversion" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" +checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" [[package]] name = "rw-stream-sink" @@ -10817,16 +11431,25 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26338f5e09bb721b85b135ea05af7767c90b52f6de4f087d4f4a3a9d64e7dc04" dependencies = [ - "futures 0.3.24", + "futures 0.3.26", "pin-project", "static_assertions", ] [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" + +[[package]] +name = "safe_arch" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "794821e4ccb0d9f979512f9c1973480123f9bd62a90d74ab0f9426fcf8f4a529" +dependencies = [ + "bytemuck", +] [[package]] name = "same-file" @@ -10840,7 +11463,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "log", "sp-core", @@ -10851,10 +11474,10 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "async-trait", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "ip_network", "libp2p", @@ -10862,7 +11485,7 @@ dependencies = [ "parity-scale-codec", "prost", "prost-build", - "rand 0.7.3", + "rand 0.8.5", "sc-client-api", "sc-network-common", "sp-api", @@ -10878,9 +11501,9 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "log", "parity-scale-codec", @@ -10901,7 +11524,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -10917,11 +11540,9 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "impl-trait-for-tuples", "memmap2", - "parity-scale-codec", "sc-chain-spec-derive", "sc-network-common", "sc-telemetry", @@ -10934,7 +11555,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -10945,18 +11566,18 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "array-bytes", + "array-bytes 4.2.0", "chrono", - "clap 4.0.29", + "clap 4.1.4", "fdlimit", - "futures 0.3.24", + "futures 0.3.26", "libp2p", "log", "names", "parity-scale-codec", - "rand 0.7.3", + "rand 0.8.5", "regex", "rpassword", "sc-client-api", @@ -10985,11 +11606,10 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "fnv", - "futures 0.3.24", - "hash-db", + "futures 0.3.26", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -11006,14 +11626,13 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-storage", - "sp-trie", "substrate-prometheus-endpoint", ] [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "hash-db", "kvdb", @@ -11038,13 +11657,14 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "async-trait", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "libp2p", "log", + "mockall", "parking_lot 0.12.1", "sc-client-api", "sc-utils", @@ -11062,10 +11682,10 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "async-trait", - "futures 0.3.24", + "futures 0.3.26", "log", "parity-scale-codec", "sc-block-builder", @@ -11091,11 +11711,11 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "async-trait", "fork-tree", - "futures 0.3.24", + "futures 0.3.26", "log", "merlin", "num-bigint", @@ -11110,7 +11730,6 @@ dependencies = [ "sc-keystore", "sc-telemetry", "schnorrkel", - "serde", "sp-api", "sp-application-crypto", "sp-block-builder", @@ -11121,10 +11740,8 @@ dependencies = [ "sp-consensus-vrf", "sp-core", "sp-inherents", - "sp-io", "sp-keystore", "sp-runtime", - "sp-version", "substrate-prometheus-endpoint", "thiserror", ] @@ -11132,9 +11749,9 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "futures 0.3.24", + "futures 0.3.26", "jsonrpsee", "sc-consensus-babe", "sc-consensus-epochs", @@ -11154,7 +11771,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "fork-tree", "parity-scale-codec", @@ -11167,11 +11784,11 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "assert_matches", "async-trait", - "futures 0.3.24", + "futures 0.3.26", "jsonrpsee", "log", "parity-scale-codec", @@ -11201,10 +11818,10 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "async-trait", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "log", "parity-scale-codec", @@ -11219,15 +11836,13 @@ dependencies = [ "sp-inherents", "sp-runtime", "sp-state-machine", - "thiserror", ] [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "lazy_static", "lru", "parity-scale-codec", "parking_lot 0.12.1", @@ -11236,7 +11851,6 @@ dependencies = [ "sc-executor-wasmtime", "sp-api", "sp-core", - "sp-core-hashing-proc-macro", "sp-externalities", "sp-io", "sp-panic-handler", @@ -11251,13 +11865,10 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "environmental", - "parity-scale-codec", "sc-allocator", "sp-maybe-compressed-blob", - "sp-sandbox", "sp-wasm-interface", "thiserror", "wasm-instrument", @@ -11267,14 +11878,12 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "log", - "parity-scale-codec", "sc-allocator", "sc-executor-common", "sp-runtime-interface", - "sp-sandbox", "sp-wasm-interface", "wasmi", ] @@ -11282,19 +11891,16 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "cfg-if", "libc", "log", "once_cell", - "parity-scale-codec", - "parity-wasm 0.45.0", - "rustix 0.35.11", + "rustix 0.35.13", "sc-allocator", "sc-executor-common", "sp-runtime-interface", - "sp-sandbox", "sp-wasm-interface", "wasmtime", ] @@ -11302,15 +11908,15 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "ahash", - "array-bytes", + "array-bytes 4.2.0", "async-trait", "dyn-clone", "finality-grandpa", "fork-tree", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "log", "parity-scale-codec", @@ -11320,7 +11926,6 @@ dependencies = [ "sc-chain-spec", "sc-client-api", "sc-consensus", - "sc-keystore", "sc-network", "sc-network-common", "sc-network-gossip", @@ -11343,10 +11948,10 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "finality-grandpa", - "futures 0.3.24", + "futures 0.3.26", "jsonrpsee", "log", "parity-scale-codec", @@ -11354,7 +11959,6 @@ dependencies = [ "sc-finality-grandpa", "sc-rpc", "serde", - "serde_json", "sp-blockchain", "sp-core", "sp-runtime", @@ -11364,16 +11968,14 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "ansi_term", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "log", - "parity-util-mem", "sc-client-api", "sc-network-common", - "sc-transaction-pool-api", "sp-blockchain", "sp-runtime", ] @@ -11381,9 +11983,9 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "array-bytes", + "array-bytes 4.2.0", "async-trait", "parking_lot 0.12.1", "serde_json", @@ -11396,30 +11998,25 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "array-bytes", + "array-bytes 4.2.0", "async-trait", "asynchronous-codec", - "bitflags", + "backtrace", "bytes", - "cid", "either", "fnv", - "fork-tree", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "ip_network", "libp2p", - "linked-hash-map", - "linked_hash_set", "log", "lru", "parity-scale-codec", "parking_lot 0.12.1", "pin-project", - "prost", - "rand 0.7.3", + "rand 0.8.5", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -11443,10 +12040,10 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "cid", - "futures 0.3.24", + "futures 0.3.26", "libp2p", "log", "prost", @@ -11457,18 +12054,17 @@ dependencies = [ "sp-runtime", "thiserror", "unsigned-varint", - "void", ] [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "async-trait", "bitflags", "bytes", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "libp2p", "linked_hash_set", @@ -11489,10 +12085,10 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "ahash", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "libp2p", "log", @@ -11507,10 +12103,10 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "array-bytes", - "futures 0.3.24", + "array-bytes 4.2.0", + "futures 0.3.26", "libp2p", "log", "parity-scale-codec", @@ -11528,11 +12124,12 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "array-bytes", + "array-bytes 4.2.0", + "async-trait", "fork-tree", - "futures 0.3.24", + "futures 0.3.26", "libp2p", "log", "lru", @@ -11552,23 +12149,24 @@ dependencies = [ "sp-core", "sp-finality-grandpa", "sp-runtime", + "substrate-prometheus-endpoint", "thiserror", ] [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "array-bytes", - "futures 0.3.24", - "hex", + "array-bytes 4.2.0", + "futures 0.3.26", "libp2p", "log", "parity-scale-codec", "pin-project", "sc-network-common", "sc-peerset", + "sc-utils", "sp-consensus", "sp-runtime", "substrate-prometheus-endpoint", @@ -11577,12 +12175,12 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "array-bytes", + "array-bytes 4.2.0", "bytes", "fnv", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "hyper", "hyper-rustls", @@ -11591,7 +12189,7 @@ dependencies = [ "once_cell", "parity-scale-codec", "parking_lot 0.12.1", - "rand 0.7.3", + "rand 0.8.5", "sc-client-api", "sc-network-common", "sc-peerset", @@ -11607,9 +12205,9 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "futures 0.3.24", + "futures 0.3.26", "libp2p", "log", "sc-utils", @@ -11620,7 +12218,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -11629,10 +12227,9 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "futures 0.3.24", - "hash-db", + "futures 0.3.26", "jsonrpsee", "log", "parity-scale-codec", @@ -11659,13 +12256,10 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "futures 0.3.24", "jsonrpsee", - "log", "parity-scale-codec", - "parking_lot 0.12.1", "sc-chain-spec", "sc-transaction-pool-api", "scale-info", @@ -11674,7 +12268,6 @@ dependencies = [ "sp-core", "sp-rpc", "sp-runtime", - "sp-tracing", "sp-version", "thiserror", ] @@ -11682,53 +12275,60 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "futures 0.3.24", + "http", "jsonrpsee", "log", "serde_json", "substrate-prometheus-endpoint", "tokio", + "tower", + "tower-http", ] [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "futures 0.3.24", + "array-bytes 4.2.0", + "futures 0.3.26", + "futures-util", "hex", "jsonrpsee", + "log", "parity-scale-codec", + "parking_lot 0.12.1", "sc-chain-spec", + "sc-client-api", "sc-transaction-pool-api", "serde", "sp-api", "sp-blockchain", "sp-core", "sp-runtime", + "sp-version", "thiserror", + "tokio-stream", ] [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "async-trait", "directories", "exit-future", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", - "hash-db", "jsonrpsee", "log", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.12.1", "pin-project", - "rand 0.7.3", + "rand 0.8.5", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -11756,19 +12356,15 @@ dependencies = [ "serde", "serde_json", "sp-api", - "sp-application-crypto", - "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-core", "sp-externalities", - "sp-inherents", "sp-keystore", "sp-runtime", "sp-session", "sp-state-machine", "sp-storage", - "sp-tracing", "sp-transaction-pool", "sp-transaction-storage-proof", "sp-trie", @@ -11785,21 +12381,18 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "log", "parity-scale-codec", - "parity-util-mem", - "parity-util-mem-derive", "parking_lot 0.12.1", - "sc-client-api", "sp-core", ] [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -11818,13 +12411,13 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "futures 0.3.24", + "futures 0.3.26", "libc", "log", - "rand 0.7.3", - "rand_pcg 0.2.1", + "rand 0.8.5", + "rand_pcg", "regex", "sc-telemetry", "serde", @@ -11837,15 +12430,16 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "chrono", - "futures 0.3.24", + "futures 0.3.26", "libp2p", "log", "parking_lot 0.12.1", "pin-project", - "rand 0.7.3", + "rand 0.8.5", + "sc-utils", "serde", "serde_json", "thiserror", @@ -11855,7 +12449,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "ansi_term", "atty", @@ -11886,7 +12480,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -11897,15 +12491,14 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "async-trait", - "futures 0.3.24", + "futures 0.3.26", "futures-timer", "linked-hash-map", "log", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.12.1", "sc-client-api", "sc-transaction-pool-api", @@ -11924,10 +12517,10 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "async-trait", - "futures 0.3.24", + "futures 0.3.26", "log", "serde", "sp-blockchain", @@ -11938,9 +12531,10 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "futures 0.3.24", + "backtrace", + "futures 0.3.26", "futures-timer", "lazy_static", "log", @@ -11950,9 +12544,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d8a765117b237ef233705cc2cc4c6a27fccd46eea6ef0c8c6dae5f3ef407f8" +checksum = "001cf62ece89779fd16105b5f515ad0e5cedcd5440d3dd806bb067978e7c3608" dependencies = [ "bitvec 1.0.1", "cfg-if", @@ -11964,9 +12558,9 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdcd47b380d8c4541044e341dcd9475f55ba37ddc50c908d945fc036a8642496" +checksum = "303959cf613a6f6efd19ed4b4ad5bf79966a13352716299ad532cfb115f4205c" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -11976,12 +12570,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "lazy_static", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] @@ -12012,7 +12605,17 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" name = "scratch" version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" +checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" + +[[package]] +name = "sct" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +dependencies = [ + "ring", + "untrusted", +] [[package]] name = "sct" @@ -12024,6 +12627,18 @@ dependencies = [ "untrusted", ] +[[package]] +name = "sdp" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d22a5ef407871893fd72b4562ee15e4742269b173959db4b8df6f538c414e13" +dependencies = [ + "rand 0.8.5", + "substring", + "thiserror", + "url", +] + [[package]] name = "sec1" version = "0.3.0" @@ -12040,18 +12655,18 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9512ffd81e3a3503ed401f79c33168b9148c75038956039166cd750eaa037c3" +checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" dependencies = [ "secp256k1-sys", ] [[package]] name = "secp256k1-sys" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7058dc8eaf3f2810d7828680320acda0b25a288f6d288e19278e249bbf74226b" +checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b" dependencies = [ "cc", ] @@ -12067,9 +12682,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.7.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ "bitflags", "core-foundation", @@ -12080,9 +12695,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.6.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" dependencies = [ "core-foundation-sys", "libc", @@ -12099,9 +12714,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" dependencies = [ "serde", ] @@ -12112,11 +12727,17 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +[[package]] +name = "send_wrapper" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" + [[package]] name = "serde" -version = "1.0.145" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ "serde_derive", ] @@ -12133,9 +12754,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.145" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", @@ -12144,24 +12765,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.85" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" dependencies = [ "itoa 1.0.5", "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.9.8" @@ -12175,17 +12787,6 @@ dependencies = [ "opaque-debug 0.3.0", ] -[[package]] -name = "sha1" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.5", -] - [[package]] name = "sha2" version = "0.8.2" @@ -12219,7 +12820,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -12240,7 +12841,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", "keccak", ] @@ -12259,16 +12860,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" -[[package]] -name = "signal-hook" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" -dependencies = [ - "libc", - "signal-hook-registry", -] - [[package]] name = "signal-hook-registry" version = "1.4.0" @@ -12284,7 +12875,7 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", "rand_core 0.6.4", ] @@ -12300,6 +12891,19 @@ dependencies = [ "paste", ] +[[package]] +name = "simba" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f3fd720c48c53cace224ae62bef1bbff363a70c68c4802a78b5cc6159618176" +dependencies = [ + "approx", + "num-complex", + "num-traits", + "paste", + "wide", +] + [[package]] name = "slab" version = "0.4.7" @@ -12317,8 +12921,8 @@ checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" [[package]] name = "slot-range-helper" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "enumn", "parity-scale-codec", @@ -12344,9 +12948,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "snap" -version = "1.0.5" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45456094d1983e2ee2a18fdfebce3189fa451699d0502cb8e3b49dba5ba41451" +checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" [[package]] name = "snow" @@ -12354,10 +12958,10 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d" dependencies = [ - "aes-gcm", + "aes-gcm 0.9.4", "blake2", "chacha20poly1305", - "curve25519-dalek 4.0.0-pre.1", + "curve25519-dalek 4.0.0-rc.0", "rand_core 0.6.4", "ring", "rustc_version", @@ -12381,10 +12985,11 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "bytes", "flate2", - "futures 0.3.24", + "futures 0.3.26", + "http", "httparse", "log", "rand 0.8.5", @@ -12394,7 +12999,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "hash-db", "log", @@ -12412,7 +13017,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "blake2", "proc-macro-crate", @@ -12423,8 +13028,8 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +version = "7.0.0" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "parity-scale-codec", "scale-info", @@ -12436,15 +13041,14 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +version = "6.0.0" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-debug-derive", "sp-std", "static_assertions", ] @@ -12452,7 +13056,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "parity-scale-codec", "scale-info", @@ -12465,7 +13069,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "async-trait", "parity-scale-codec", @@ -12474,10 +13078,27 @@ dependencies = [ "sp-std", ] +[[package]] +name = "sp-beefy" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-io", + "sp-mmr-primitives", + "sp-runtime", + "sp-std", +] + [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "parity-scale-codec", "sp-api", @@ -12489,9 +13110,9 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "futures 0.3.24", + "futures 0.3.26", "log", "lru", "parity-scale-codec", @@ -12507,11 +13128,10 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "async-trait", - "futures 0.3.24", - "futures-timer", + "futures 0.3.26", "log", "parity-scale-codec", "sp-core", @@ -12526,7 +13146,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "async-trait", "parity-scale-codec", @@ -12544,7 +13164,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "async-trait", "merlin", @@ -12567,13 +13187,11 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-runtime", "sp-std", "sp-timestamp", ] @@ -12581,7 +13199,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "parity-scale-codec", "scale-info", @@ -12593,17 +13211,16 @@ dependencies = [ [[package]] name = "sp-core" -version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +version = "7.0.0" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "array-bytes", + "array-bytes 4.2.0", "base58 0.2.0", "bitflags", "blake2", - "byteorder", "dyn-clonable", "ed25519-zebra", - "futures 0.3.24", + "futures 0.3.26", "hash-db", "hash256-std-hasher", "impl-serde", @@ -12611,11 +13228,10 @@ dependencies = [ "libsecp256k1", "log", "merlin", - "num-traits", "parity-scale-codec", "parking_lot 0.12.1", "primitive-types", - "rand 0.7.3", + "rand 0.8.5", "regex", "scale-info", "schnorrkel", @@ -12632,18 +13248,17 @@ dependencies = [ "substrate-bip39", "thiserror", "tiny-bip39", - "wasmi", "zeroize", ] [[package]] name = "sp-core-hashing" -version = "4.0.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +version = "5.0.0" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "blake2", "byteorder", - "digest 0.10.5", + "digest 0.10.6", "sha2 0.10.6", "sha3 0.10.6", "sp-std", @@ -12653,7 +13268,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "proc-macro2", "quote", @@ -12664,7 +13279,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -12672,8 +13287,8 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "4.0.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +version = "5.0.0" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "proc-macro2", "quote", @@ -12682,8 +13297,8 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.12.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +version = "0.13.0" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "environmental", "parity-scale-codec", @@ -12694,7 +13309,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "finality-grandpa", "log", @@ -12712,7 +13327,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -12725,16 +13340,16 @@ dependencies = [ [[package]] name = "sp-io" -version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +version = "7.0.0" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "bytes", - "futures 0.3.24", - "hash-db", + "ed25519", + "ed25519-dalek", + "futures 0.3.26", "libsecp256k1", "log", "parity-scale-codec", - "parking_lot 0.12.1", "secp256k1", "sp-core", "sp-externalities", @@ -12744,15 +13359,14 @@ dependencies = [ "sp-std", "sp-tracing", "sp-trie", - "sp-wasm-interface", "tracing", "tracing-core", ] [[package]] name = "sp-keyring" -version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +version = "7.0.0" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "lazy_static", "sp-core", @@ -12762,11 +13376,11 @@ dependencies = [ [[package]] name = "sp-keystore" -version = "0.12.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +version = "0.13.0" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "async-trait", - "futures 0.3.24", + "futures 0.3.26", "merlin", "parity-scale-codec", "parking_lot 0.12.1", @@ -12780,7 +13394,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "thiserror", "zstd", @@ -12789,8 +13403,9 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ + "ckb-merkle-mountain-range", "log", "parity-scale-codec", "scale-info", @@ -12806,7 +13421,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "parity-scale-codec", "scale-info", @@ -12820,7 +13435,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "sp-api", "sp-core", @@ -12829,8 +13444,8 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "4.0.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +version = "5.0.0" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "backtrace", "lazy_static", @@ -12840,7 +13455,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "rustc-hash", "serde", @@ -12849,17 +13464,16 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +version = "7.0.0" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "either", "hash256-std-hasher", "impl-trait-for-tuples", "log", "parity-scale-codec", - "parity-util-mem", "paste", - "rand 0.7.3", + "rand 0.8.5", "scale-info", "serde", "sp-application-crypto", @@ -12872,8 +13486,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +version = "7.0.0" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -12890,8 +13504,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +version = "6.0.0" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "Inflector", "proc-macro-crate", @@ -12900,24 +13514,10 @@ dependencies = [ "syn", ] -[[package]] -name = "sp-sandbox" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" -dependencies = [ - "log", - "parity-scale-codec", - "sp-core", - "sp-io", - "sp-std", - "sp-wasm-interface", - "wasmi", -] - [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "parity-scale-codec", "scale-info", @@ -12931,25 +13531,25 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "parity-scale-codec", "scale-info", + "sp-core", "sp-runtime", "sp-std", ] [[package]] name = "sp-state-machine" -version = "0.12.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +version = "0.13.0" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "hash-db", "log", - "num-traits", "parity-scale-codec", "parking_lot 0.12.1", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "sp-core", "sp-externalities", @@ -12958,18 +13558,17 @@ dependencies = [ "sp-trie", "thiserror", "tracing", - "trie-root", ] [[package]] name = "sp-std" -version = "4.0.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +version = "5.0.0" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" [[package]] name = "sp-storage" -version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +version = "7.0.0" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "impl-serde", "parity-scale-codec", @@ -12982,13 +13581,12 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "async-trait", "futures-timer", "log", "parity-scale-codec", - "sp-api", "sp-inherents", "sp-runtime", "sp-std", @@ -12997,8 +13595,8 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +version = "6.0.0" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "parity-scale-codec", "sp-std", @@ -13010,7 +13608,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "sp-api", "sp-runtime", @@ -13019,7 +13617,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "async-trait", "log", @@ -13034,8 +13632,8 @@ dependencies = [ [[package]] name = "sp-trie" -version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +version = "7.0.0" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "ahash", "hash-db", @@ -13058,7 +13656,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "impl-serde", "parity-scale-codec", @@ -13075,7 +13673,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -13085,8 +13683,8 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "6.0.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +version = "7.0.0" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "impl-trait-for-tuples", "log", @@ -13099,9 +13697,8 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "serde", @@ -13130,9 +13727,9 @@ dependencies = [ [[package]] name = "ss58-registry" -version = "1.36.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d92659e7d18d82b803824a9ba5a6022cff101c3491d027c1c1d8d30e749284" +checksum = "e40c020d72bc0a9c5660bb71e4a6fdef081493583062c474740a7d59f55f0e7b" dependencies = [ "Inflector", "num-format", @@ -13152,7 +13749,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "statemine-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", @@ -13214,7 +13811,7 @@ dependencies = [ [[package]] name = "statemint-runtime" version = "1.0.0" -source = "git+https://github.com/paritytech//cumulus?rev=27721d794ee63aae42317a7eeda21595dd3200d9#27721d794ee63aae42317a7eeda21595dd3200d9" +source = "git+https://github.com/paritytech//cumulus?rev=09418fc04c2608b123f36ca80f16df3d2096753b#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", @@ -13299,7 +13896,7 @@ dependencies = [ "cfg_aliases", "libc", "parking_lot 0.11.2", - "parking_lot_core 0.8.5", + "parking_lot_core 0.8.6", "static_init_macro 1.0.2", "winapi", ] @@ -13338,7 +13935,7 @@ checksum = "05bdbb8e4e78216a85785a85d3ec3183144f98d0097b9281802c019bb07a6f05" dependencies = [ "approx", "lazy_static", - "nalgebra", + "nalgebra 0.27.1", "num-traits", "rand 0.8.5", ] @@ -13371,6 +13968,25 @@ dependencies = [ "syn", ] +[[package]] +name = "stun" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7e94b1ec00bad60e6410e058b52f1c66de3dc5fe4d62d09b3e52bb7d3b73e25" +dependencies = [ + "base64 0.13.1", + "crc", + "lazy_static", + "md-5", + "rand 0.8.5", + "ring", + "subtle", + "thiserror", + "tokio", + "url", + "webrtc-util", +] + [[package]] name = "substrate-bip39" version = "0.4.4" @@ -13400,25 +14016,23 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "platforms", + "platforms 2.0.0", ] [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "frame-system-rpc-runtime-api", - "futures 0.3.24", + "futures 0.3.26", "jsonrpsee", "log", "parity-scale-codec", - "sc-client-api", "sc-rpc-api", "sc-transaction-pool-api", - "serde_json", "sp-api", "sp-block-builder", "sp-blockchain", @@ -13429,9 +14043,8 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "futures-util", "hyper", "log", "prometheus", @@ -13442,7 +14055,7 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "async-trait", "jsonrpsee", @@ -13455,7 +14068,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "jsonrpsee", "log", @@ -13465,10 +14078,8 @@ dependencies = [ "scale-info", "serde", "sp-core", - "sp-io", "sp-runtime", "sp-state-machine", - "sp-std", "sp-trie", "trie-db", ] @@ -13476,11 +14087,11 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "array-bytes", + "array-bytes 4.2.0", "async-trait", - "futures 0.3.24", + "futures 0.3.26", "parity-scale-codec", "sc-client-api", "sc-client-db", @@ -13502,9 +14113,9 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "futures 0.3.24", + "futures 0.3.26", "substrate-test-utils-derive", "tokio", ] @@ -13512,7 +14123,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -13523,11 +14134,11 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ "ansi_term", "build-helper", - "cargo_metadata", + "cargo_metadata 0.14.2", "filetime", "sp-maybe-compressed-blob", "strum", @@ -13537,6 +14148,15 @@ dependencies = [ "wasm-opt", ] +[[package]] +name = "substring" +version = "1.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ee6433ecef213b2e72f587ef64a2f5943e7cd16fbd82dbe8bc07486c534c86" +dependencies = [ + "autocfg", +] + [[package]] name = "subtle" version = "2.4.1" @@ -13545,9 +14165,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.103" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", @@ -13595,9 +14215,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1" +checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d" [[package]] name = "tempfile" @@ -13615,9 +14235,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] @@ -13630,8 +14250,8 @@ checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" [[package]] name = "test-runtime-constants" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "frame-support", "polkadot-primitives", @@ -13668,7 +14288,7 @@ dependencies = [ "frame-support", "frame-system", "frame-system-rpc-runtime-api", - "futures 0.3.24", + "futures 0.3.26", "hex-literal", "jsonrpsee", "log", @@ -13737,18 +14357,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", @@ -13815,39 +14435,56 @@ dependencies = [ ] [[package]] -name = "tikv-jemallocator" -version = "0.5.0" +name = "time" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ "libc", - "tikv-jemalloc-sys", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", ] [[package]] name = "time" -version = "0.1.44" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", + "itoa 1.0.5", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "time-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +dependencies = [ + "time-core", ] [[package]] name = "tiny-bip39" -version = "0.8.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d" +checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861" dependencies = [ "anyhow", - "hmac 0.8.1", + "hmac 0.12.1", "once_cell", - "pbkdf2 0.4.0", - "rand 0.7.3", + "pbkdf2 0.11.0", + "rand 0.8.5", "rustc-hash", - "sha2 0.9.9", + "sha2 0.10.6", "thiserror", "unicode-normalization", "wasm-bindgen", @@ -13890,9 +14527,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.24.1" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae" +checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" dependencies = [ "autocfg", "bytes", @@ -13910,9 +14547,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.8.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2", "quote", @@ -13925,20 +14562,21 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls", + "rustls 0.20.8", "tokio", - "webpki", + "webpki 0.22.0", ] [[package]] name = "tokio-stream" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6edf2d6bc038a43d31353570e27270603f4648d18f5ed10c0e179abe43255af" +checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" dependencies = [ "futures-core", "pin-project-lite 0.2.9", "tokio", + "tokio-util", ] [[package]] @@ -13958,13 +14596,65 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] +[[package]] +name = "toml_datetime" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" + +[[package]] +name = "toml_edit" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" +dependencies = [ + "indexmap", + "nom8", + "toml_datetime", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +dependencies = [ + "bitflags", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite 0.2.9", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -13978,6 +14668,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", + "log", "pin-project-lite 0.2.9", "tracing-attributes", "tracing-core", @@ -14016,30 +14707,30 @@ dependencies = [ [[package]] name = "tracing-gum" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "polkadot-node-jaeger 0.9.33 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.33)", + "polkadot-node-jaeger 0.9.37 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.37)", "polkadot-primitives", "tracing", - "tracing-gum-proc-macro 0.9.33 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.33)", + "tracing-gum-proc-macro 0.9.37 (git+https://github.com/paritytech/polkadot?branch=release-v0.9.37)", ] [[package]] name = "tracing-gum" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "polkadot-node-jaeger 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "polkadot-node-jaeger 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", "polkadot-primitives", "tracing", - "tracing-gum-proc-macro 0.9.33 (git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d)", + "tracing-gum-proc-macro 0.9.37 (git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3)", ] [[package]] name = "tracing-gum-proc-macro" -version = "0.9.33" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "expander 0.0.6", "proc-macro-crate", @@ -14050,8 +14741,8 @@ dependencies = [ [[package]] name = "tracing-gum-proc-macro" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "expander 0.0.6", "proc-macro-crate", @@ -14154,8 +14845,10 @@ dependencies = [ "lazy_static", "rand 0.8.5", "smallvec", + "socket2", "thiserror", "tinyvec", + "tokio", "tracing", "url", ] @@ -14175,35 +14868,40 @@ dependencies = [ "resolv-conf", "smallvec", "thiserror", + "tokio", "tracing", "trust-dns-proto", ] [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech//substrate?rev=069ecf1d5c294759755b356ae028456b1bd6743b#069ecf1d5c294759755b356ae028456b1bd6743b" +source = "git+https://github.com/paritytech//substrate?rev=946507ba9ef13e263534176b7b74e26fc56efbd4#946507ba9ef13e263534176b7b74e26fc56efbd4" dependencies = [ - "clap 4.0.29", + "clap 4.1.4", + "frame-remote-externalities", "frame-try-runtime", + "hex", "log", "parity-scale-codec", - "remote-externalities", - "sc-chain-spec", "sc-cli", "sc-executor", "sc-service", "serde", + "serde_json", + "sp-api", "sp-core", + "sp-debug-derive", "sp-externalities", "sp-io", "sp-keystore", + "sp-rpc", "sp-runtime", "sp-state-machine", "sp-version", @@ -14213,10 +14911,29 @@ dependencies = [ ] [[package]] -name = "tt-call" -version = "1.0.8" +name = "tt-call" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df" + +[[package]] +name = "turn" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e66dcbec4290c69dd03c57e76c2469ea5c7ce109c6dd4351c13055cf71ea055" +checksum = "4712ee30d123ec7ae26d1e1b218395a16c87cdbaf4b3925d170d684af62ea5e8" +dependencies = [ + "async-trait", + "base64 0.13.1", + "futures 0.3.26", + "log", + "md-5", + "rand 0.8.5", + "ring", + "stun", + "thiserror", + "tokio", + "webrtc-util", +] [[package]] name = "twox-hash" @@ -14225,16 +14942,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", - "digest 0.10.5", + "digest 0.10.6", "rand 0.8.5", "static_assertions", ] [[package]] name = "typenum" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" @@ -14244,9 +14961,9 @@ checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" [[package]] name = "uint" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a45526d29728d135c2900b0d30573fe3ee79fceb12ef534c7bb30e810a91b601" +checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52" dependencies = [ "byteorder", "crunchy", @@ -14254,26 +14971,17 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" [[package]] name = "unicode-ident" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "unicode-normalization" @@ -14336,20 +15044,19 @@ dependencies = [ ] [[package]] -name = "valuable" -version = "0.1.0" +name = "uuid" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" +dependencies = [ + "getrandom 0.2.8", +] [[package]] -name = "value-bag" -version = "1.0.0-alpha.9" +name = "valuable" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" -dependencies = [ - "ctor", - "version_check", -] +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "vcpkg" @@ -14369,6 +15076,15 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +[[package]] +name = "waitgroup" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1f50000a783467e6c0200f9d10642f4bc424e39efc1b770203e88b488f79292" +dependencies = [ + "atomic-waker", +] + [[package]] name = "waker-fn" version = "1.1.0" @@ -14547,7 +15263,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ - "futures 0.3.24", + "futures 0.3.26", "js-sys", "parking_lot 0.11.2", "pin-utils", @@ -14583,7 +15299,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7" dependencies = [ "downcast-rs", - "libm", + "libm 0.2.6", "memory_units", "num-rational", "num-traits", @@ -14600,9 +15316,9 @@ dependencies = [ [[package]] name = "wasmtime" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f511c4917c83d04da68333921107db75747c4e11a2f654a8e909cc5e0520dc" +checksum = "4ad5af6ba38311282f2a21670d96e78266e8c8e2f38cbcd52c254df6ccbc7731" dependencies = [ "anyhow", "bincode", @@ -14610,7 +15326,7 @@ dependencies = [ "indexmap", "libc", "log", - "object", + "object 0.29.0", "once_cell", "paste", "psm", @@ -14628,26 +15344,26 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39bf3debfe744bf19dd3732990ce6f8c0ced7439e2370ba4e1d8f5a3660a3178" +checksum = "45de63ddfc8b9223d1adc8f7b2ee5f35d1f6d112833934ad7ea66e4f4339e597" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece42fa4676a263f7558cdaaf5a71c2592bebcbac22a0580e33cf3406c103da2" +checksum = "bcd849399d17d2270141cfe47fa0d91ee52d5f8ea9b98cf7ddde0d53e5f79882" dependencies = [ "anyhow", - "base64 0.13.0", + "base64 0.13.1", "bincode", "directories-next", "file-per-thread-logger", "log", - "rustix 0.35.11", + "rustix 0.35.13", "serde", "sha2 0.9.9", "toml", @@ -14657,9 +15373,9 @@ dependencies = [ [[package]] name = "wasmtime-cranelift" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058217e28644b012bdcdf0e445f58d496d78c2e0b6a6dd93558e701591dad705" +checksum = "4bd91339b742ff20bfed4532a27b73c86b5bcbfedd6bea2dcdf2d64471e1b5c6" dependencies = [ "anyhow", "cranelift-codegen", @@ -14667,9 +15383,9 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli", + "gimli 0.26.2", "log", - "object", + "object 0.29.0", "target-lexicon", "thiserror", "wasmparser", @@ -14678,16 +15394,16 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7af06848df28b7661471d9a80d30a973e0f401f2e3ed5396ad7e225ed217047" +checksum = "ebb881c61f4f627b5d45c54e629724974f8a8890d455bcbe634330cc27309644" dependencies = [ "anyhow", "cranelift-entity", - "gimli", + "gimli 0.26.2", "indexmap", "log", - "object", + "object 0.29.0", "serde", "target-lexicon", "thiserror", @@ -14697,20 +15413,20 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9028fb63a54185b3c192b7500ef8039c7bb8d7f62bfc9e7c258483a33a3d13bb" +checksum = "1985c628011fe26adf5e23a5301bdc79b245e0e338f14bb58b39e4e25e4d8681" dependencies = [ - "addr2line", + "addr2line 0.17.0", "anyhow", "bincode", "cfg-if", "cpp_demangle", - "gimli", + "gimli 0.26.2", "log", - "object", + "object 0.29.0", "rustc-demangle", - "rustix 0.35.11", + "rustix 0.35.13", "serde", "target-lexicon", "thiserror", @@ -14722,20 +15438,20 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25e82d4ef93296785de7efca92f7679dc67fe68a13b625a5ecc8d7503b377a37" +checksum = "f671b588486f5ccec8c5a3dba6b4c07eac2e66ab8c60e6f4e53717c77f709731" dependencies = [ - "object", + "object 0.29.0", "once_cell", - "rustix 0.35.11", + "rustix 0.35.13", ] [[package]] name = "wasmtime-runtime" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f0e9bea7d517d114fe66b930b2124ee086516ee93eeebfd97f75f366c5b0553" +checksum = "ee8f92ad4b61736339c29361da85769ebc200f184361959d1792832e592a1afd" dependencies = [ "anyhow", "cc", @@ -14745,10 +15461,10 @@ dependencies = [ "log", "mach", "memfd", - "memoffset", + "memoffset 0.6.5", "paste", "rand 0.8.5", - "rustix 0.35.11", + "rustix 0.35.13", "thiserror", "wasmtime-asm-macros", "wasmtime-environ", @@ -14758,9 +15474,9 @@ dependencies = [ [[package]] name = "wasmtime-types" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b83e93ed41b8fdc936244cfd5e455480cf1eca1fd60c78a0040038b4ce5075" +checksum = "d23d61cb4c46e837b431196dd06abb11731541021916d03476a178b54dc07aeb" dependencies = [ "cranelift-entity", "serde", @@ -14778,6 +15494,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "webpki" version = "0.22.0" @@ -14790,18 +15516,230 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.22.5" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +dependencies = [ + "webpki 0.22.0", +] + +[[package]] +name = "webrtc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3bc9049bdb2cea52f5fd4f6f728184225bdb867ed0dc2410eab6df5bdd67bb" +dependencies = [ + "arc-swap", + "async-trait", + "bytes", + "hex", + "interceptor", + "lazy_static", + "log", + "rand 0.8.5", + "rcgen 0.9.3", + "regex", + "ring", + "rtcp", + "rtp", + "rustls 0.19.1", + "sdp", + "serde", + "serde_json", + "sha2 0.10.6", + "stun", + "thiserror", + "time 0.3.17", + "tokio", + "turn", + "url", + "waitgroup", + "webrtc-data", + "webrtc-dtls", + "webrtc-ice", + "webrtc-mdns", + "webrtc-media", + "webrtc-sctp", + "webrtc-srtp", + "webrtc-util", +] + +[[package]] +name = "webrtc-data" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ef36a4d12baa6e842582fe9ec16a57184ba35e1a09308307b67d43ec8883100" +dependencies = [ + "bytes", + "derive_builder", + "log", + "thiserror", + "tokio", + "webrtc-sctp", + "webrtc-util", +] + +[[package]] +name = "webrtc-dtls" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7021987ae0a2ed6c8cd33f68e98e49bb6e74ffe9543310267b48a1bbe3900e5f" +dependencies = [ + "aes 0.6.0", + "aes-gcm 0.8.0", + "async-trait", + "bincode", + "block-modes", + "byteorder", + "ccm", + "curve25519-dalek 3.2.0", + "der-parser 8.1.0", + "elliptic-curve", + "hkdf", + "hmac 0.10.1", + "log", + "oid-registry 0.6.1", + "p256", + "p384", + "rand 0.8.5", + "rand_core 0.6.4", + "rcgen 0.9.3", + "ring", + "rustls 0.19.1", + "sec1", + "serde", + "sha-1", + "sha2 0.9.9", + "signature", + "subtle", + "thiserror", + "tokio", + "webpki 0.21.4", + "webrtc-util", + "x25519-dalek 2.0.0-pre.1", + "x509-parser 0.13.2", +] + +[[package]] +name = "webrtc-ice" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "494483fbb2f5492620871fdc78b084aed8807377f6e3fe88b2e49f0a9c9c41d7" +dependencies = [ + "arc-swap", + "async-trait", + "crc", + "log", + "rand 0.8.5", + "serde", + "serde_json", + "stun", + "thiserror", + "tokio", + "turn", + "url", + "uuid", + "waitgroup", + "webrtc-mdns", + "webrtc-util", +] + +[[package]] +name = "webrtc-mdns" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f08dfd7a6e3987e255c4dbe710dde5d94d0f0574f8a21afa95d171376c143106" +dependencies = [ + "log", + "socket2", + "thiserror", + "tokio", + "webrtc-util", +] + +[[package]] +name = "webrtc-media" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee2a3c157a040324e5049bcbd644ffc9079e6738fa2cfab2bcff64e5cc4c00d7" +dependencies = [ + "byteorder", + "bytes", + "derive_builder", + "displaydoc", + "rand 0.8.5", + "rtp", + "thiserror", + "webrtc-util", +] + +[[package]] +name = "webrtc-sctp" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be" +checksum = "0d47adcd9427eb3ede33d5a7f3424038f63c965491beafcc20bc650a2f6679c0" dependencies = [ - "webpki", + "arc-swap", + "async-trait", + "bytes", + "crc", + "log", + "rand 0.8.5", + "thiserror", + "tokio", + "webrtc-util", +] + +[[package]] +name = "webrtc-srtp" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6183edc4c1c6c0175f8812eefdce84dfa0aea9c3ece71c2bf6ddd3c964de3da5" +dependencies = [ + "aead 0.4.3", + "aes 0.7.5", + "aes-gcm 0.9.4", + "async-trait", + "byteorder", + "bytes", + "ctr 0.8.0", + "hmac 0.11.0", + "log", + "rtcp", + "rtp", + "sha-1", + "subtle", + "thiserror", + "tokio", + "webrtc-util", +] + +[[package]] +name = "webrtc-util" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f1db1727772c05cf7a2cfece52c3aca8045ca1e176cd517d323489aa3c6d87" +dependencies = [ + "async-trait", + "bitflags", + "bytes", + "cc", + "ipnet", + "lazy_static", + "libc", + "log", + "nix", + "rand 0.8.5", + "thiserror", + "tokio", + "winapi", ] [[package]] name = "weight-gen" version = "0.4.1-dev" dependencies = [ - "clap 4.0.29", + "clap 4.1.4", "handlebars", "serde", "serde_json", @@ -14827,10 +15765,9 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "beefy-primitives", "bitvec 1.0.1", "frame-benchmarking", "frame-election-provider-support", @@ -14850,7 +15787,7 @@ dependencies = [ "pallet-collective", "pallet-democracy", "pallet-election-provider-multi-phase", - "pallet-election-provider-support-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33)", + "pallet-election-provider-support-benchmarking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37)", "pallet-elections-phragmen", "pallet-fast-unstake", "pallet-grandpa", @@ -14894,6 +15831,7 @@ dependencies = [ "smallvec", "sp-api", "sp-authority-discovery", + "sp-beefy", "sp-block-builder", "sp-consensus-babe", "sp-core", @@ -14917,8 +15855,8 @@ dependencies = [ [[package]] name = "westend-runtime-constants" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "frame-support", "polkadot-primitives", @@ -14931,15 +15869,25 @@ dependencies = [ [[package]] name = "which" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", "libc", "once_cell", ] +[[package]] +name = "wide" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae41ecad2489a1655c8ef8489444b0b113c0a0c795944a3572a0931cf7d2525c" +dependencies = [ + "bytemuck", + "safe_arch", +] + [[package]] name = "widestring" version = "0.5.1" @@ -15010,19 +15958,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_x86_64_msvc 0.42.1", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] name = "windows_aarch64_msvc" @@ -15038,9 +15986,9 @@ checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] name = "windows_i686_gnu" @@ -15056,9 +16004,9 @@ checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] name = "windows_i686_msvc" @@ -15074,9 +16022,9 @@ checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] name = "windows_x86_64_gnu" @@ -15092,15 +16040,15 @@ checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] name = "windows_x86_64_msvc" @@ -15116,24 +16064,24 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] name = "winreg" -version = "0.7.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" dependencies = [ "winapi", ] [[package]] name = "wyz" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] @@ -15149,10 +16097,58 @@ dependencies = [ "zeroize", ] +[[package]] +name = "x25519-dalek" +version = "2.0.0-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df" +dependencies = [ + "curve25519-dalek 3.2.0", + "rand_core 0.6.4", + "zeroize", +] + +[[package]] +name = "x509-parser" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb9bace5b5589ffead1afb76e43e34cff39cd0f3ce7e170ae0c29e53b88eb1c" +dependencies = [ + "asn1-rs 0.3.1", + "base64 0.13.1", + "data-encoding", + "der-parser 7.0.0", + "lazy_static", + "nom", + "oid-registry 0.4.0", + "ring", + "rusticata-macros", + "thiserror", + "time 0.3.17", +] + +[[package]] +name = "x509-parser" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" +dependencies = [ + "asn1-rs 0.5.1", + "base64 0.13.1", + "data-encoding", + "der-parser 8.1.0", + "lazy_static", + "nom", + "oid-registry 0.6.1", + "rusticata-macros", + "thiserror", + "time 0.3.17", +] + [[package]] name = "xcm" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "derivative", "impl-trait-for-tuples", @@ -15165,8 +16161,8 @@ dependencies = [ [[package]] name = "xcm-builder" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "frame-support", "frame-system", @@ -15186,7 +16182,7 @@ dependencies = [ [[package]] name = "xcm-emulator" version = "0.1.0" -source = "git+https://github.com/shaunxw/xcm-simulator?rev=c62dbf8e247c03d9797dbf3f1886f74973f2b22a#c62dbf8e247c03d9797dbf3f1886f74973f2b22a" +source = "git+https://github.com/shaunxw/xcm-simulator?rev=64d8822f6ebc1af50092677a80a9bdb74860e9a9#64d8822f6ebc1af50092677a80a9bdb74860e9a9" dependencies = [ "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", @@ -15211,8 +16207,8 @@ dependencies = [ [[package]] name = "xcm-executor" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "frame-benchmarking", "frame-support", @@ -15229,8 +16225,8 @@ dependencies = [ [[package]] name = "xcm-procedural" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "Inflector", "proc-macro2", @@ -15240,8 +16236,8 @@ dependencies = [ [[package]] name = "xcm-simulator" -version = "0.9.33" -source = "git+https://github.com/paritytech//polkadot?rev=c7d6c21242fc654f6f069e12c00951484dff334d#c7d6c21242fc654f6f069e12c00951484dff334d" +version = "0.9.37" +source = "git+https://github.com/paritytech//polkadot?rev=645723987cf9662244be8faf4e9b63e8b9a1b3a3#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "frame-support", "parity-scale-codec", @@ -15261,7 +16257,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d9ba232399af1783a58d8eb26f6b5006fbefe2dc9ef36bd283324792d03ea5" dependencies = [ - "futures 0.3.24", + "futures 0.3.26", "log", "nohash-hasher", "parking_lot 0.12.1", @@ -15269,6 +16265,15 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "yasna" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" +dependencies = [ + "time 0.3.17", +] + [[package]] name = "zeroize" version = "1.5.7" @@ -15280,9 +16285,9 @@ dependencies = [ [[package]] name = "zeroize_derive" -version = "1.3.2" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" +checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ "proc-macro2", "quote", @@ -15311,10 +16316,11 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.1+zstd.1.5.2" +version = "2.0.5+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" +checksum = "edc50ffce891ad571e9f9afe5039c4837bede781ac4bb13052ed7ae695518596" dependencies = [ "cc", "libc", + "pkg-config", ] diff --git a/Cargo.toml b/Cargo.toml index cac13d91b5..e17a24ea19 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -126,218 +126,218 @@ yamux = { opt-level = 3 } zeroize = { opt-level = 3 } [patch."https://github.com/paritytech/substrate"] -frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -frame-benchmarking-cli = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -frame-election-provider-support = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -frame-executive = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -frame-support = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -frame-support-procedural = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -frame-support-procedural-tools = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -frame-support-procedural-tools-derive = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -frame-system = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -frame-system-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -frame-try-runtime = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-assets = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-asset-tx-payment = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-aura = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-bounties = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-child-bounties = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-collective = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-conviction-voting = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-democracy = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-election-provider-multi-phase = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-gilt = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-grandpa = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-identity = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-im-online = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-indices = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-membership = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-mmr = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-mmr-rpc = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-multisig = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-nomination-pools-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-offences = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-offences-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-proxy = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-ranked-collective = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-recovery = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-referenda = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-session = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-session-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-society = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-staking-reward-curve = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-staking-reward-fn = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-sudo = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-tips = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-uniques = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-utility = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-beefy = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-beefy-mmr = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-bags-list = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -pallet-preimage = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -beefy-primitives = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -beefy-merkle-tree = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -beefy-gadget = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -beefy-gadget-rpc = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -remote-externalities = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-basic-authorship = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-block-builder = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-chain-spec = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-cli = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-consensus = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-consensus-babe-rpc = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-consensus-epochs = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-executor = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-executor-wasmtime = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-finality-grandpa-rpc = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-informant = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-keystore = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-network = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-network-common = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-network-gossip = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-network-light = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-network-sync = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-offchain = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-rpc = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-rpc-api = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-rpc-server = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-service = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-sync-state-rpc = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-sysinfo = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-telemetry = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-tracing = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-transaction-pool-api = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sc-utils = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-api = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-block-builder = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-consensus-vrf = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-core = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-io = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-keyring = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-mmr-primitives = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-offchain = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-rpc = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-session = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-staking = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-std = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-storage = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-trie = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-version = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -sp-weights = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -substrate-build-script-utils = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -substrate-wasm-builder = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -substrate-test-client = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -substrate-test-utils = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -substrate-test-utils-derive = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } -try-runtime-cli = { git = "https://github.com/paritytech//substrate", rev = "069ecf1d5c294759755b356ae028456b1bd6743b" } +frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +frame-benchmarking-cli = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +frame-election-provider-support = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +frame-executive = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +frame-remote-externalities = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +frame-support = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +frame-support-procedural = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +frame-support-procedural-tools = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +frame-support-procedural-tools-derive = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +frame-system = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +frame-system-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +frame-try-runtime = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-assets = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-asset-tx-payment = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-aura = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-bounties = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-child-bounties = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-collective = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-conviction-voting = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-democracy = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-election-provider-multi-phase = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-grandpa = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-identity = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-im-online = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-indices = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-membership = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-mmr = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-multisig = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-nomination-pools-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-offences = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-offences-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-proxy = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-ranked-collective = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-recovery = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-referenda = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-root-testing = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-session = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-session-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-society = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-staking-reward-fn = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-sudo = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-tips = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-uniques = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-utility = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-beefy = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-beefy-mmr = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-bags-list = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +pallet-preimage = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +beefy-merkle-tree = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +beefy-gadget = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +beefy-gadget-rpc = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +mmr-rpc = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-basic-authorship = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-block-builder = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-chain-spec = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-cli = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-consensus = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-consensus-babe-rpc = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-consensus-epochs = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-executor = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-executor-wasmtime = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-finality-grandpa-rpc = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-informant = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-keystore = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-network = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-network-common = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-network-gossip = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-network-light = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-network-sync = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-offchain = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-rpc = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-rpc-api = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-rpc-server = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-service = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-sync-state-rpc = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-sysinfo = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-telemetry = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-tracing = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-transaction-pool-api = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sc-utils = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-api = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-beefy = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-block-builder = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-consensus-vrf = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-core = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-io = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-keyring = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-mmr-primitives = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-offchain = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-rpc = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-session = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-staking = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-std = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-storage = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-trie = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-version = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +sp-weights = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +substrate-build-script-utils = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +substrate-wasm-builder = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +substrate-test-client = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +substrate-test-utils = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +substrate-test-utils-derive = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } +try-runtime-cli = { git = "https://github.com/paritytech//substrate", rev = "946507ba9ef13e263534176b7b74e26fc56efbd4" } [patch."https://github.com/paritytech/polkadot"] -kusama-runtime = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -kusama-runtime-constants = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -polkadot-cli = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -polkadot-client = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -polkadot-node-core-av-store = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -polkadot-node-core-pvf = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -polkadot-node-network-protocol = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -polkadot-node-primitives = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -polkadot-node-subsystem = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -polkadot-node-subsystem-util= { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -polkadot-overseer = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -polkadot-runtime = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -polkadot-runtime-common = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -polkadot-runtime-constants = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -polkadot-service = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -polkadot-statement-table = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -polkadot-rpc = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -polkadot-test-runtime = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -polkadot-test-service = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -test-runtime-constants = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -rococo-runtime = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -westend-runtime = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -xcm = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } -xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "c7d6c21242fc654f6f069e12c00951484dff334d" } +kusama-runtime = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +kusama-runtime-constants = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +pallet-xcm = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +polkadot-cli = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +polkadot-client = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +polkadot-node-core-av-store = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +polkadot-node-core-pvf = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +polkadot-node-network-protocol = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +polkadot-node-primitives = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +polkadot-node-subsystem = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +polkadot-node-subsystem-util= { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +polkadot-overseer = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +polkadot-runtime = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +polkadot-runtime-common = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +polkadot-runtime-constants = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +polkadot-service = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +polkadot-statement-table = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +polkadot-rpc = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +polkadot-test-runtime = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +polkadot-test-service = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +test-runtime-constants = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +rococo-runtime = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +westend-runtime = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +xcm = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } +xcm-simulator = { git = "https://github.com/paritytech//polkadot", rev = "645723987cf9662244be8faf4e9b63e8b9a1b3a3" } [patch."https://github.com/paritytech/cumulus"] -cumulus-client-cli = { git = "https://github.com/paritytech//cumulus", rev = "27721d794ee63aae42317a7eeda21595dd3200d9" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech//cumulus", rev = "27721d794ee63aae42317a7eeda21595dd3200d9" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech//cumulus", rev = "27721d794ee63aae42317a7eeda21595dd3200d9" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech//cumulus", rev = "27721d794ee63aae42317a7eeda21595dd3200d9" } -cumulus-client-network = { git = "https://github.com/paritytech//cumulus", rev = "27721d794ee63aae42317a7eeda21595dd3200d9" } -cumulus-client-service = { git = "https://github.com/paritytech//cumulus", rev = "27721d794ee63aae42317a7eeda21595dd3200d9" } -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech//cumulus", rev = "27721d794ee63aae42317a7eeda21595dd3200d9" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "27721d794ee63aae42317a7eeda21595dd3200d9" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech//cumulus", rev = "27721d794ee63aae42317a7eeda21595dd3200d9" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "27721d794ee63aae42317a7eeda21595dd3200d9" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "27721d794ee63aae42317a7eeda21595dd3200d9" } -cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "27721d794ee63aae42317a7eeda21595dd3200d9" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech//cumulus", rev = "27721d794ee63aae42317a7eeda21595dd3200d9" } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech//cumulus", rev = "27721d794ee63aae42317a7eeda21595dd3200d9" } -cumulus-primitives-utility = { git = "https://github.com/paritytech//cumulus", rev = "27721d794ee63aae42317a7eeda21595dd3200d9" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech//cumulus", rev = "27721d794ee63aae42317a7eeda21595dd3200d9" } -parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "27721d794ee63aae42317a7eeda21595dd3200d9" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech//cumulus", rev = "27721d794ee63aae42317a7eeda21595dd3200d9" } -cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech//cumulus", rev = "27721d794ee63aae42317a7eeda21595dd3200d9" } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech//cumulus", rev = "27721d794ee63aae42317a7eeda21595dd3200d9" } -cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech//cumulus", rev = "27721d794ee63aae42317a7eeda21595dd3200d9" } -cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech//cumulus", rev = "27721d794ee63aae42317a7eeda21595dd3200d9" } -statemine-runtime = { git = "https://github.com/paritytech//cumulus", rev = "27721d794ee63aae42317a7eeda21595dd3200d9" } -statemint-runtime = { git = "https://github.com/paritytech//cumulus", rev = "27721d794ee63aae42317a7eeda21595dd3200d9" } -parachains-common = { git = "https://github.com/paritytech//cumulus", rev = "27721d794ee63aae42317a7eeda21595dd3200d9" } +cumulus-client-cli = { git = "https://github.com/paritytech//cumulus", rev = "09418fc04c2608b123f36ca80f16df3d2096753b" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech//cumulus", rev = "09418fc04c2608b123f36ca80f16df3d2096753b" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech//cumulus", rev = "09418fc04c2608b123f36ca80f16df3d2096753b" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech//cumulus", rev = "09418fc04c2608b123f36ca80f16df3d2096753b" } +cumulus-client-network = { git = "https://github.com/paritytech//cumulus", rev = "09418fc04c2608b123f36ca80f16df3d2096753b" } +cumulus-client-service = { git = "https://github.com/paritytech//cumulus", rev = "09418fc04c2608b123f36ca80f16df3d2096753b" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech//cumulus", rev = "09418fc04c2608b123f36ca80f16df3d2096753b" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "09418fc04c2608b123f36ca80f16df3d2096753b" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech//cumulus", rev = "09418fc04c2608b123f36ca80f16df3d2096753b" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "09418fc04c2608b123f36ca80f16df3d2096753b" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "09418fc04c2608b123f36ca80f16df3d2096753b" } +cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "09418fc04c2608b123f36ca80f16df3d2096753b" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech//cumulus", rev = "09418fc04c2608b123f36ca80f16df3d2096753b" } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech//cumulus", rev = "09418fc04c2608b123f36ca80f16df3d2096753b" } +cumulus-primitives-utility = { git = "https://github.com/paritytech//cumulus", rev = "09418fc04c2608b123f36ca80f16df3d2096753b" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech//cumulus", rev = "09418fc04c2608b123f36ca80f16df3d2096753b" } +parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "09418fc04c2608b123f36ca80f16df3d2096753b" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech//cumulus", rev = "09418fc04c2608b123f36ca80f16df3d2096753b" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech//cumulus", rev = "09418fc04c2608b123f36ca80f16df3d2096753b" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech//cumulus", rev = "09418fc04c2608b123f36ca80f16df3d2096753b" } +cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech//cumulus", rev = "09418fc04c2608b123f36ca80f16df3d2096753b" } +cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech//cumulus", rev = "09418fc04c2608b123f36ca80f16df3d2096753b" } +statemine-runtime = { git = "https://github.com/paritytech//cumulus", rev = "09418fc04c2608b123f36ca80f16df3d2096753b" } +statemint-runtime = { git = "https://github.com/paritytech//cumulus", rev = "09418fc04c2608b123f36ca80f16df3d2096753b" } +parachains-common = { git = "https://github.com/paritytech//cumulus", rev = "09418fc04c2608b123f36ca80f16df3d2096753b" } diff --git a/Makefile b/Makefile index 2f6c8716c2..81f7c26f8a 100644 --- a/Makefile +++ b/Makefile @@ -122,15 +122,18 @@ check-try-runtime: .PHONY: try-runtime-karura try-runtime-karura: - SKIP_WASM_BUILD= cargo run --features with-karura-runtime --features try-runtime -- try-runtime --chain=karura-dev --wasm-execution=compiled on-runtime-upgrade live --uri wss://karura.api.onfinality.io:443/public-ws -s /tmp/snapshot.bin + cargo build --release --locked --features with-karura-runtime --features try-runtime --workspace --exclude runtime-integration-tests --exclude e2e-tests --exclude test-service + ./target/release/acala try-runtime --runtime ./target/release/wbuild/karura-runtime/karura_runtime.compact.compressed.wasm --chain=karura-dev on-runtime-upgrade live --uri wss://karura.api.onfinality.io:443/public-ws .PHONY: try-runtime-mandala try-runtime-mandala: - SKIP_WASM_BUILD= cargo run --features with-mandala-runtime --features try-runtime -- try-runtime --chain=dev --wasm-execution=compiled on-runtime-upgrade live --uri wss://mandala.polkawallet.io:443 -s /tmp/snapshot.bin + cargo build --release --locked --features with-mandala-runtime --features try-runtime --workspace --exclude runtime-integration-tests --exclude e2e-tests --exclude test-service + ./target/release/acala try-runtime --runtime ./target/release/wbuild/mandala-runtime/mandala_runtime.compact.compressed.wasm --chain=dev on-runtime-upgrade live --uri wss://mandala.polkawallet.io:443 .PHONY: try-runtime-acala try-runtime-acala: - SKIP_WASM_BUILD= cargo run --features with-acala-runtime --features try-runtime -- try-runtime --chain=acala-dev --wasm-execution=compiled on-runtime-upgrade live --uri wss://acala-polkadot.api.onfinality.io:443/public-ws -s /tmp/snapshot.bin + cargo build --release --locked --features with-acala-runtime --features try-runtime --workspace --exclude runtime-integration-tests --exclude e2e-tests --exclude test-service + ./target/release/acala try-runtime --runtime ./target/release/wbuild/acala-runtime/acala_runtime.compact.compressed.wasm --chain=acala-dev on-runtime-upgrade live --uri wss://acala-polkadot.api.onfinality.io:443/public-ws .PHONY: test test: githooks @@ -164,7 +167,7 @@ test-ts: build-mandala-internal-release .PHONY: test-benchmarking test-benchmarking: cargo test --features bench --package module-evm --package runtime-common - cargo test --features runtime-benchmarks --features with-all-runtime --features --all benchmarking + cargo test --features runtime-benchmarks --features with-all-runtime --all benchmarking .PHONY: test-all test-all: test-runtimes test-eth test-benchmarking diff --git a/README.md b/README.md index 0a72d2308f..71d593911e 100644 --- a/README.md +++ b/README.md @@ -186,20 +186,31 @@ If modify the storage, should test the data migration before upgrade the runtime try-runtime on karura ```bash -# Use a live chain to run the migration test and save state snapshot to file `snapshot.bin`. -# Add `-m module_name` can specify the module. -cargo run --features with-karura-runtime --features try-runtime -- try-runtime --chain=karura-dev --wasm-execution=compiled --no-spec-check-panic on-runtime-upgrade live --uri wss://karura.api.onfinality.io:443/public-ws -s /tmp/snapshot.bin +# Use a live chain to run the migration test. +# Add `-p module_name` can specify the module. +make try-runtime-karura - # Use a state snapshot to run the migration test. -cargo run --features with-karura-runtime --features try-runtime -- try-runtime --chain=karura-dev --wasm-execution=compiled on-runtime-upgrade snap -s /tmp/snapshot.bin +# Create a state snapshot to run the migration test. +# Add `--pallet module_name` can specify the module. +cargo run --features with-karura-runtime --features try-runtime -- try-runtime --runtime existing create-snapshot --uri wss://karura.api.onfinality.io:443/public-ws karura-latest.snap + +# Use a state snapshot to run the migration test. +./target/release/acala try-runtime --runtime ./target/release/wbuild/karura-runtime/karura_runtime.compact.compressed.wasm --chain=karura-dev on-runtime-upgrade snap -s karura-latest.snap ``` try-runtime on acala ```bash -cargo run --features with-acala-runtime --features try-runtime -- try-runtime --chain=acala-dev --wasm-execution=compiled --no-spec-check-panic on-runtime-upgrade live --uri wss://acala-polkadot.api.onfinality.io:443/public-ws -s /tmp/snapshot.bin +# Use a live chain to run the migration test. +# Add `--pallet module_name` can specify the module. +make try-runtime-acala + +# Create a state snapshot to run the migration test. +# Add `-palet module_name` can specify the module. +cargo run --features with-acala-runtime --features try-runtime -- try-runtime --runtime existing create-snapshot --uri wss://acala.api.onfinality.io:443/public-ws acala-latest.snap -cargo run --features with-acala-runtime --features try-runtime -- try-runtime --chain=acala-dev --wasm-execution=compiled on-runtime-upgrade snap -s /tmp/snapshot.bin +# Use a state snapshot to run the migration test. +./target/release/acala try-runtime --runtime ./target/release/wbuild/acala-runtime/acala_runtime.compact.compressed.wasm --chain=acala-dev on-runtime-upgrade snap -s acala-latest.snap ``` # 9. Run local testnet with [parachain-launch](https://github.com/open-web3-stack/parachain-launch) diff --git a/ecosystem-modules/ren/renvm-bridge/Cargo.toml b/ecosystem-modules/ren/renvm-bridge/Cargo.toml index c2fad6bbe8..e781d52ad5 100644 --- a/ecosystem-modules/ren/renvm-bridge/Cargo.toml +++ b/ecosystem-modules/ren/renvm-bridge/Cargo.toml @@ -7,12 +7,12 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } support = { package = "module-support", path = "../../../modules/support", default-features = false } orml-traits = { path = "../../../orml/traits", default-features = false } primitives = { package = "acala-primitives", path = "../../../primitives", default-features = false } @@ -21,7 +21,7 @@ primitives = { package = "acala-primitives", path = "../../../primitives", defau hex-literal = "0.3.1" orml-currencies = { path = "../../../orml/currencies" } orml-tokens = { path = "../../../orml/tokens" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } [features] default = ["std"] diff --git a/ecosystem-modules/ren/renvm-bridge/src/lib.rs b/ecosystem-modules/ren/renvm-bridge/src/lib.rs index ff10a46fec..7f54c697e2 100644 --- a/ecosystem-modules/ren/renvm-bridge/src/lib.rs +++ b/ecosystem-modules/ren/renvm-bridge/src/lib.rs @@ -233,7 +233,7 @@ pub mod module { sig, } => { // check if already exists - if Signatures::::contains_key(&sig) { + if Signatures::::contains_key(sig) { return InvalidTransaction::Stale.into(); } @@ -255,7 +255,7 @@ pub mod module { } Call::rotate_key { new_key, sig } => { // check if already exists - if Signatures::::contains_key(&sig) { + if Signatures::::contains_key(sig) { return InvalidTransaction::Stale.into(); } @@ -287,7 +287,7 @@ impl Pallet { fn do_rotate_key(new_key: PublicKey, sig: EcdsaSignature) { RenVmPublicKey::::set(Some(new_key)); - Signatures::::insert(&sig, ()); + Signatures::::insert(sig, ()); } // ABI-encode the values for creating the signature hash. diff --git a/ecosystem-modules/stable-asset b/ecosystem-modules/stable-asset index eab87f860f..d20ce38125 160000 --- a/ecosystem-modules/stable-asset +++ b/ecosystem-modules/stable-asset @@ -1 +1 @@ -Subproject commit eab87f860f57dd2300a2f6fcb4c647b2e17f3181 +Subproject commit d20ce381253dca7a9814e90dbfab188f38bc424c diff --git a/evm-tests b/evm-tests index 8814e48e9d..3abe94b275 160000 --- a/evm-tests +++ b/evm-tests @@ -1 +1 @@ -Subproject commit 8814e48e9d1e1e606a227055b47b7cc757951aeb +Subproject commit 3abe94b2752dd2f6f0c7d3934ba4fdb87c68d446 diff --git a/inspect/Cargo.toml b/inspect/Cargo.toml index 613e7e581e..9ffdfd4b92 100644 --- a/inspect/Cargo.toml +++ b/inspect/Cargo.toml @@ -9,9 +9,9 @@ codec = { package = "parity-scale-codec", version = "3.0.0" } clap = { version = "4.0.9", features = ["derive"] } derive_more = "0.99" log = "0.4.17" -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } diff --git a/inspect/src/lib.rs b/inspect/src/lib.rs index 128df14ed9..4654eb3d18 100644 --- a/inspect/src/lib.rs +++ b/inspect/src/lib.rs @@ -147,20 +147,19 @@ impl> Inspector .ok_or_else(|| Error::NotFound(not_found.clone()))?; let header = self .chain - .header(id)? + .header(hash)? .ok_or_else(|| Error::NotFound(not_found.clone()))?; TBlock::new(header, body) } BlockAddress::Hash(hash) => { - let id = BlockId::hash(hash); - let not_found = format!("Could not find block {:?}", id); + let not_found = format!("Could not find block {:?}", BlockId::::Hash(hash)); let body = self .chain .block_body(hash)? .ok_or_else(|| Error::NotFound(not_found.clone()))?; let header = self .chain - .header(id)? + .header(hash)? .ok_or_else(|| Error::NotFound(not_found.clone()))?; TBlock::new(header, body) } diff --git a/modules/aggregated-dex/Cargo.toml b/modules/aggregated-dex/Cargo.toml index 3909a6c00b..7a7cdc6d44 100644 --- a/modules/aggregated-dex/Cargo.toml +++ b/modules/aggregated-dex/Cargo.toml @@ -7,11 +7,11 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } @@ -21,9 +21,9 @@ orml-tokens = { path = "../../orml/tokens", default-features = false } [dev-dependencies] orml-tokens = { path = "../../orml/tokens" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } [features] default = ["std"] diff --git a/modules/asset-registry/Cargo.toml b/modules/asset-registry/Cargo.toml index 6d2d241597..557a20cfa2 100644 --- a/modules/asset-registry/Cargo.toml +++ b/modules/asset-registry/Cargo.toml @@ -8,23 +8,23 @@ edition = "2021" log = { version = "0.4.17", default-features = false } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } module-support = { path = "../support", default-features = false } [dev-dependencies] serde_json = "1.0.68" hex = "0.4" -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } module-evm = { path = "../evm" } module-evm-bridge = { path = "../evm-bridge" } diff --git a/modules/auction-manager/Cargo.toml b/modules/auction-manager/Cargo.toml index 45435a6aa9..7857676687 100644 --- a/modules/auction-manager/Cargo.toml +++ b/modules/auction-manager/Cargo.toml @@ -7,19 +7,19 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-utilities = { path = "../../orml/utilities", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } orml-auction = { path = "../../orml/auction" } cdp-treasury = { package = "module-cdp-treasury", path = "../cdp-treasury" } module-dex = { path = "../dex" } diff --git a/modules/cdp-engine/Cargo.toml b/modules/cdp-engine/Cargo.toml index 8fb9e5d5ee..732e83e6b3 100644 --- a/modules/cdp-engine/Cargo.toml +++ b/modules/cdp-engine/Cargo.toml @@ -7,14 +7,14 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-utilities = { path = "../../orml/utilities", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } support = { package = "module-support", path = "../support", default-features = false } loans = { package = "module-loans", path = "../loans", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } @@ -22,11 +22,11 @@ rand_chacha = { version = "0.2", default-features = false } nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path = "../../ecosystem-modules/stable-asset/lib/stable-asset", package = "nutsfinance-stable-asset" } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } orml-currencies = { path = "../../orml/currencies" } -dex = { package = "module-dex", path = "../dex"} +dex = { package = "module-dex", path = "../dex" } cdp-treasury = { package = "module-cdp-treasury", path = "../cdp-treasury" } evm-accounts = { package = "module-evm-accounts", path = "../evm-accounts" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/cdp-engine/src/lib.rs b/modules/cdp-engine/src/lib.rs index cbb3a8c18c..85fe124bc0 100644 --- a/modules/cdp-engine/src/lib.rs +++ b/modules/cdp-engine/src/lib.rs @@ -899,7 +899,7 @@ impl Pallet { debit_adjustment: Amount, ) -> DispatchResult { ensure!( - CollateralParams::::contains_key(¤cy_id), + CollateralParams::::contains_key(currency_id), Error::::InvalidCollateralType, ); >::adjust_position(who, currency_id, collateral_adjustment, debit_adjustment)?; @@ -978,7 +978,7 @@ impl Pallet { min_increase_collateral: Balance, ) -> DispatchResult { ensure!( - CollateralParams::::contains_key(¤cy_id), + CollateralParams::::contains_key(currency_id), Error::::InvalidCollateralType, ); let loans_module_account = >::account_id(); @@ -1037,7 +1037,7 @@ impl Pallet { let debit_adjustment = >::amount_try_from_balance(increase_debit_balance)?; >::update_loan(who, currency_id, collateral_adjustment, debit_adjustment)?; - let Position { collateral, debit } = >::positions(currency_id, &who); + let Position { collateral, debit } = >::positions(currency_id, who); // check the CDP if is still at valid risk Self::check_position_valid(currency_id, collateral, debit, false)?; // debit cap check due to new issued stable coin @@ -1059,13 +1059,13 @@ impl Pallet { min_decrease_debit_value: Balance, ) -> DispatchResult { ensure!( - CollateralParams::::contains_key(¤cy_id), + CollateralParams::::contains_key(currency_id), Error::::InvalidCollateralType, ); let loans_module_account = >::account_id(); let stable_currency_id = T::GetStableCurrencyId::get(); - let Position { collateral, debit } = >::positions(currency_id, &who); + let Position { collateral, debit } = >::positions(currency_id, who); // ensure collateral of CDP is enough ensure!(decrease_collateral <= collateral, Error::::CollateralNotEnough); diff --git a/modules/cdp-treasury/Cargo.toml b/modules/cdp-treasury/Cargo.toml index e4b573fd54..e451871467 100644 --- a/modules/cdp-treasury/Cargo.toml +++ b/modules/cdp-treasury/Cargo.toml @@ -7,19 +7,19 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path = "../../ecosystem-modules/stable-asset/lib/stable-asset", package = "nutsfinance-stable-asset" } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } orml-currencies = { path = "../../orml/currencies" } orml-auction = { path = "../../orml/auction" } module-dex = { path = "../dex" } diff --git a/modules/cdp-treasury/src/lib.rs b/modules/cdp-treasury/src/lib.rs index 3f339dfac7..6fa4c0bf9a 100644 --- a/modules/cdp-treasury/src/lib.rs +++ b/modules/cdp-treasury/src/lib.rs @@ -282,6 +282,7 @@ pub mod module { /// The dispatch origin of this call must be `UpdateOrigin`. /// /// - `amount`: the buffer amount of debit pool + #[pallet::call_index(4)] #[pallet::weight((T::WeightInfo::set_expected_collateral_auction_size(), DispatchClass::Operational))] #[transactional] pub fn set_debit_offset_buffer(origin: OriginFor, #[pallet::compact] amount: Balance) -> DispatchResult { diff --git a/modules/collator-selection/Cargo.toml b/modules/collator-selection/Cargo.toml index c44294701a..9947f0df80 100644 --- a/modules/collator-selection/Cargo.toml +++ b/modules/collator-selection/Cargo.toml @@ -12,26 +12,26 @@ log = { version = "0.4.17", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } [features] default = ['std'] diff --git a/modules/collator-selection/src/lib.rs b/modules/collator-selection/src/lib.rs index 28ad1ef250..e9843cda79 100644 --- a/modules/collator-selection/src/lib.rs +++ b/modules/collator-selection/src/lib.rs @@ -251,8 +251,8 @@ pub mod pallet { "genesis desired_candidates are more than T::MaxCandidates", ); - >::put(&self.desired_candidates); - >::put(&self.candidacy_bond); + >::put(self.desired_candidates); + >::put(self.candidacy_bond); >::put(&bounded_invulnerables); } } @@ -315,7 +315,7 @@ pub mod pallet { if max > T::MaxCandidates::get() { Err(Error::::MaxCandidatesExceeded)?; } - >::put(&max); + >::put(max); Self::deposit_event(Event::NewDesiredCandidates { new_desired_candidates: max, }); @@ -326,7 +326,7 @@ pub mod pallet { #[pallet::weight(T::WeightInfo::set_candidacy_bond())] pub fn set_candidacy_bond(origin: OriginFor, #[pallet::compact] bond: BalanceOf) -> DispatchResult { T::UpdateOrigin::ensure_origin(origin)?; - >::put(&bond); + >::put(bond); Self::deposit_event(Event::NewCandidacyBond { new_candidacy_bond: bond, }); @@ -515,7 +515,7 @@ pub mod pallet { candidates.iter().for_each(|candidate| { if validators.contains(candidate) { collators.push(candidate); - >::insert(&candidate, 0); + >::insert(candidate, 0); } }); diff --git a/modules/currencies/Cargo.toml b/modules/currencies/Cargo.toml index 7b98a44c7e..0040acc055 100644 --- a/modules/currencies/Cargo.toml +++ b/modules/currencies/Cargo.toml @@ -7,13 +7,13 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-utilities = { path = "../../orml/utilities", default-features = false } @@ -25,9 +25,9 @@ support = { package = "module-support", path = "../support", default-features = serde_json = "1.0.68" hex = "0.4" hex-literal = "0.3.1" -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } tokens = { package = "orml-tokens", path = "../../orml/tokens" } module-evm = { path = "../evm" } module-evm-bridge = { path = "../evm-bridge" } diff --git a/modules/currencies/src/lib.rs b/modules/currencies/src/lib.rs index 57c1e24e38..9b36a9b6ee 100644 --- a/modules/currencies/src/lib.rs +++ b/modules/currencies/src/lib.rs @@ -815,6 +815,19 @@ impl fungibles::Inspect for Pallet { _ => >::can_withdraw(asset_id, who, amount), } } + + fn asset_exists(asset_id: Self::AssetId) -> bool { + match asset_id { + CurrencyId::Erc20(contract) => T::EVMBridge::symbol(InvokeContext { + contract, + sender: Default::default(), + origin: Default::default(), + }) + .is_ok(), + id if id == T::GetNativeCurrencyId::get() => true, + _ => >::asset_exists(asset_id), + } + } } impl fungibles::Mutate for Pallet { diff --git a/modules/currencies/src/mock.rs b/modules/currencies/src/mock.rs index 92bb551c21..d3f87d59e1 100644 --- a/modules/currencies/src/mock.rs +++ b/modules/currencies/src/mock.rs @@ -263,6 +263,10 @@ pub fn erc20_address() -> EvmAddress { EvmAddress::from_str("0x5dddfce53ee040d9eb21afbc0ae1bb4dbb0ba643").unwrap() } +pub fn erc20_address_not_exist() -> EvmAddress { + EvmAddress::from_str("0x00ddfce53ee040d9eb21afbc0ae1bb4dbb0ba600").unwrap() +} + pub const ALICE_BALANCE: u128 = 100_000_000_000_000_000_000_000u128; pub fn deploy_contracts() { diff --git a/modules/currencies/src/tests.rs b/modules/currencies/src/tests.rs index 01259900d1..8a57086adb 100644 --- a/modules/currencies/src/tests.rs +++ b/modules/currencies/src/tests.rs @@ -24,9 +24,9 @@ use super::*; use crate::mock::Erc20HoldingAccount; use frame_support::{assert_noop, assert_ok, dispatch::GetDispatchInfo, traits::WithdrawReasons}; use mock::{ - alice, bob, deploy_contracts, erc20_address, eva, AccountId, AdaptedBasicCurrency, CouncilAccount, Currencies, - DustAccount, ExtBuilder, NativeCurrency, PalletBalances, Runtime, RuntimeEvent, RuntimeOrigin, System, Tokens, - ALICE_BALANCE, DOT, EVM, ID_1, NATIVE_CURRENCY_ID, X_TOKEN_ID, + alice, bob, deploy_contracts, erc20_address, erc20_address_not_exist, eva, AccountId, AdaptedBasicCurrency, + CouncilAccount, Currencies, DustAccount, ExtBuilder, NativeCurrency, PalletBalances, Runtime, RuntimeEvent, + RuntimeOrigin, System, Tokens, ALICE_BALANCE, DOT, EVM, ID_1, NATIVE_CURRENCY_ID, X_TOKEN_ID, }; use sp_core::H160; use sp_runtime::{ @@ -1303,7 +1303,6 @@ fn fungible_inspect_trait_should_work() { DepositConsequence::Success ); - // TODO: update test code to assert_eq! for this: https://github.com/AcalaNetwork/Acala/issues/2038 // Test Inspect::can_withdraw assert_eq!( >::can_withdraw(NATIVE_CURRENCY_ID, &alice(), Bounded::max_value()), @@ -1387,6 +1386,22 @@ fn fungible_inspect_trait_should_work() { >::can_withdraw(CurrencyId::Erc20(erc20_address()), &alice(), 0), WithdrawConsequence::Success ); + + // Test Inspect::asset_exists + assert_eq!( + >::asset_exists(NATIVE_CURRENCY_ID), + true + ); + assert_eq!(>::asset_exists(X_TOKEN_ID), true); + assert_eq!(>::asset_exists(DOT), false); + assert_eq!( + >::asset_exists(CurrencyId::Erc20(erc20_address())), + true + ); + assert_eq!( + >::asset_exists(CurrencyId::Erc20(erc20_address_not_exist())), + false + ); }); } diff --git a/modules/dex-oracle/Cargo.toml b/modules/dex-oracle/Cargo.toml index 8ae1a448e4..d68e19eaa2 100644 --- a/modules/dex-oracle/Cargo.toml +++ b/modules/dex-oracle/Cargo.toml @@ -7,20 +7,20 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } [features] default = ["std"] diff --git a/modules/dex-oracle/src/lib.rs b/modules/dex-oracle/src/lib.rs index e87627dcb0..a289c8c699 100644 --- a/modules/dex-oracle/src/lib.rs +++ b/modules/dex-oracle/src/lib.rs @@ -119,7 +119,7 @@ pub mod module { let (pool_0, pool_1) = T::DEX::get_liquidity_pool(trading_pair.first(), trading_pair.second()); Self::try_update_cumulative(&trading_pair, pool_0, pool_1); - let (cumulative_0, cumulative_1, _) = Self::cumulatives(&trading_pair); + let (cumulative_0, cumulative_1, _) = Self::cumulatives(trading_pair); let u256_elapsed_time: U256 = elapsed_time.saturated_into::().into(); let average_price_0 = ExchangeRate::from_inner( cumulative_0 @@ -137,7 +137,7 @@ pub mod module { ); AveragePrices::::insert( - &trading_pair, + trading_pair, ( average_price_0, average_price_1, @@ -179,7 +179,7 @@ pub mod module { let trading_pair = TradingPair::from_currency_ids(currency_id_a, currency_id_b).ok_or(Error::::InvalidCurrencyId)?; ensure!( - Self::average_prices(&trading_pair).is_none(), + Self::average_prices(trading_pair).is_none(), Error::::AveragePriceAlreadyEnabled ); ensure!(!interval.is_zero(), Error::::IntervalIsZero,); @@ -191,7 +191,7 @@ pub mod module { let initial_cumulative_1 = U256::zero(); AveragePrices::::insert( - &trading_pair, + trading_pair, ( initial_price_0, initial_price_1, @@ -201,7 +201,7 @@ pub mod module { interval, ), ); - Cumulatives::::insert(&trading_pair, (initial_cumulative_0, initial_cumulative_1, now)); + Cumulatives::::insert(trading_pair, (initial_cumulative_0, initial_cumulative_1, now)); Ok(()) } @@ -224,8 +224,8 @@ pub mod module { let trading_pair = TradingPair::from_currency_ids(currency_id_a, currency_id_b).ok_or(Error::::InvalidCurrencyId)?; - AveragePrices::::take(&trading_pair).ok_or(Error::::AveragePriceMustBeEnabled)?; - Cumulatives::::remove(&trading_pair); + AveragePrices::::take(trading_pair).ok_or(Error::::AveragePriceMustBeEnabled)?; + Cumulatives::::remove(trading_pair); Ok(()) } @@ -250,7 +250,7 @@ pub mod module { let trading_pair = TradingPair::from_currency_ids(currency_id_a, currency_id_b).ok_or(Error::::InvalidCurrencyId)?; - AveragePrices::::try_mutate_exists(&trading_pair, |maybe| -> DispatchResult { + AveragePrices::::try_mutate_exists(trading_pair, |maybe| -> DispatchResult { let (_, _, _, _, _, update_interval) = maybe.as_mut().ok_or(Error::::AveragePriceMustBeEnabled)?; ensure!(!new_interval.is_zero(), Error::::IntervalIsZero); *update_interval = new_interval; diff --git a/modules/dex/Cargo.toml b/modules/dex/Cargo.toml index 0d17673bfa..c94c093564 100644 --- a/modules/dex/Cargo.toml +++ b/modules/dex/Cargo.toml @@ -7,20 +7,20 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] orml-tokens = { path = "../../orml/tokens" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } [features] default = ["std"] diff --git a/modules/dex/src/lib.rs b/modules/dex/src/lib.rs index 77dac1731b..f67c331a1c 100644 --- a/modules/dex/src/lib.rs +++ b/modules/dex/src/lib.rs @@ -951,7 +951,7 @@ impl Pallet { Error::::InvalidContributionIncrement ); - ProvisioningPool::::try_mutate_exists(trading_pair, &who, |maybe_pool| -> DispatchResult { + ProvisioningPool::::try_mutate_exists(trading_pair, who, |maybe_pool| -> DispatchResult { let existed = maybe_pool.is_some(); let mut pool = maybe_pool.unwrap_or_default(); pool.0 = pool.0.checked_add(contribution_0).ok_or(ArithmeticError::Overflow)?; diff --git a/modules/earning/Cargo.toml b/modules/earning/Cargo.toml index db6e45337c..16635562dc 100644 --- a/modules/earning/Cargo.toml +++ b/modules/earning/Cargo.toml @@ -8,11 +8,11 @@ edition = "2021" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } orml-traits = { package = "orml-traits", path = "../../orml/traits", default-features = false } @@ -22,8 +22,8 @@ primitives = { package = "acala-primitives", path = "../../primitives", default- paste = "1.0" [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } [features] default = ["std"] diff --git a/modules/emergency-shutdown/Cargo.toml b/modules/emergency-shutdown/Cargo.toml index b20cfcfb18..b4a1f98288 100644 --- a/modules/emergency-shutdown/Cargo.toml +++ b/modules/emergency-shutdown/Cargo.toml @@ -7,18 +7,18 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } support = { package = "module-support", path = "../support", default-features = false } loans = { package = "module-loans", path = "../loans", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-balances= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } orml-currencies = { path = "../../orml/currencies" } orml-traits = { path = "../../orml/traits" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/evm-accounts/Cargo.toml b/modules/evm-accounts/Cargo.toml index 084a18b29a..9c925988cc 100644 --- a/modules/evm-accounts/Cargo.toml +++ b/modules/evm-accounts/Cargo.toml @@ -9,12 +9,12 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = libsecp256k1 = { version = "0.7", default-features = false, features = ["hmac", "static-context"], optional = true } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } @@ -23,7 +23,7 @@ module-support = { path = "../support", default-features = false } module-evm-utility-macro = { path = "../evm-utility/macro" } [dev-dependencies] -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } orml-currencies = { path = "../../orml/currencies" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/evm-accounts/src/lib.rs b/modules/evm-accounts/src/lib.rs index c50253d829..450052abd4 100644 --- a/modules/evm-accounts/src/lib.rs +++ b/modules/evm-accounts/src/lib.rs @@ -315,8 +315,8 @@ where let addr = account_to_default_evm_address(account_id); // create reverse mapping - Accounts::::insert(&addr, &account_id); - EvmAddresses::::insert(&account_id, &addr); + Accounts::::insert(addr, account_id); + EvmAddresses::::insert(account_id, addr); Pallet::::deposit_event(Event::ClaimAccount { account_id: account_id.clone(), diff --git a/modules/evm-bridge/Cargo.toml b/modules/evm-bridge/Cargo.toml index bac35ee706..1c807c3135 100644 --- a/modules/evm-bridge/Cargo.toml +++ b/modules/evm-bridge/Cargo.toml @@ -10,12 +10,12 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } impl-trait-for-tuples = "0.2.2" ethereum-types = { version = "0.14.0", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } @@ -27,8 +27,8 @@ num_enum = { version = "0.5.1", default-features = false } [dev-dependencies] serde_json = "1.0.68" hex = "0.4" -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } [features] default = ["std"] diff --git a/modules/evm-utility/Cargo.toml b/modules/evm-utility/Cargo.toml index 2e00d47400..a091ff8ca4 100644 --- a/modules/evm-utility/Cargo.toml +++ b/modules/evm-utility/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] sha3 = { version = "0.10.6", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } evm = { git = "https://github.com/rust-blockchain/evm", rev = "13240a8a551586fdef0b5028ed73af80b248092a", default-features = false, features = ["with-codec"] } evm-gasometer = { git = "https://github.com/rust-blockchain/evm", rev = "13240a8a551586fdef0b5028ed73af80b248092a", default-features = false } diff --git a/modules/evm/Cargo.toml b/modules/evm/Cargo.toml index 4e2846db31..552cac55d0 100644 --- a/modules/evm/Cargo.toml +++ b/modules/evm/Cargo.toml @@ -23,15 +23,15 @@ hex = { version = "0.4", default-features = false, features = ["alloc"], optiona num = { version = "0.4", features = ["alloc"], default-features = false } bn = { package = "substrate-bn", version = "0.6", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, optional = true } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-bencher = { path = "../../orml/bencher", default-features = false, optional = true } orml-currencies = { path = "../../orml/currencies", default-features = false, optional = true } @@ -44,13 +44,13 @@ module-idle-scheduler = { path = "../idle-scheduler", default-features = false, module-transaction-payment = { path = "../../modules/transaction-payment", default-features = false } module-dex = { path = "../dex", default-features = false, optional = true } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } [dev-dependencies] hex = "0.4" env_logger = "0.9.0" serde_json = "1.0.68" -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } [features] default = ["std"] diff --git a/modules/evm/rpc/Cargo.toml b/modules/evm/rpc/Cargo.toml index dcac7c1a10..9b26778e2a 100644 --- a/modules/evm/rpc/Cargo.toml +++ b/modules/evm/rpc/Cargo.toml @@ -5,20 +5,20 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] -jsonrpsee = { version = "0.15.1", features = ["server", "macros"] } +jsonrpsee = { version = "0.16.2", features = ["server", "macros"] } rustc-hex = "2.1.0" serde = { version = "1.0.145", features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } primitives = { package = "acala-primitives", path = "../../../primitives" } module-evm-rpc-runtime-api = { path = "runtime_api" } diff --git a/modules/evm/rpc/runtime_api/Cargo.toml b/modules/evm/rpc/runtime_api/Cargo.toml index 504733cfd0..400809f713 100644 --- a/modules/evm/rpc/runtime_api/Cargo.toml +++ b/modules/evm/rpc/runtime_api/Cargo.toml @@ -5,10 +5,10 @@ authors = ["Acala Developers"] edition = "2021" [dependencies] -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } primitives = { package = "acala-primitives", path = "../../../../primitives", default-features = false } [features] diff --git a/modules/evm/src/lib.rs b/modules/evm/src/lib.rs index d84f2caab7..b12002247c 100644 --- a/modules/evm/src/lib.rs +++ b/modules/evm/src/lib.rs @@ -1308,11 +1308,11 @@ impl Pallet { let account_info = account_info.as_mut().ok_or(Error::::ContractNotFound)?; let contract_info = account_info.contract_info.take().ok_or(Error::::ContractNotFound)?; - CodeInfos::::mutate_exists(&contract_info.code_hash, |maybe_code_info| { + CodeInfos::::mutate_exists(contract_info.code_hash, |maybe_code_info| { if let Some(code_info) = maybe_code_info.as_mut() { code_info.ref_count = code_info.ref_count.saturating_sub(1); if code_info.ref_count == 0 { - Codes::::remove(&contract_info.code_hash); + Codes::::remove(contract_info.code_hash); *maybe_code_info = None; } } else { @@ -1344,14 +1344,14 @@ impl Pallet { /// Only used in `remove_account_if_empty` fn remove_account(address: &EvmAddress) -> DispatchResult { // Deref code, and remove it if ref count is zero. - Accounts::::mutate_exists(&address, |maybe_account| { + Accounts::::mutate_exists(address, |maybe_account| { if let Some(account) = maybe_account { if let Some(ContractInfo { code_hash, .. }) = account.contract_info { - CodeInfos::::mutate_exists(&code_hash, |maybe_code_info| { + CodeInfos::::mutate_exists(code_hash, |maybe_code_info| { if let Some(code_info) = maybe_code_info { code_info.ref_count = code_info.ref_count.saturating_sub(1); if code_info.ref_count == 0 { - Codes::::remove(&code_hash); + Codes::::remove(code_hash); *maybe_code_info = None; } } @@ -1403,7 +1403,7 @@ impl Pallet { published: publish, }; - CodeInfos::::mutate_exists(&code_hash, |maybe_code_info| { + CodeInfos::::mutate_exists(code_hash, |maybe_code_info| { if let Some(code_info) = maybe_code_info.as_mut() { code_info.ref_count = code_info.ref_count.saturating_add(1); } else { @@ -1413,7 +1413,7 @@ impl Pallet { }; *maybe_code_info = Some(new); - Codes::::insert(&code_hash, bounded_code); + Codes::::insert(code_hash, bounded_code); } }); @@ -1474,7 +1474,7 @@ impl Pallet { /// Get code at given address. pub fn code_at_address(address: &EvmAddress) -> BoundedVec { - Self::codes(&Self::code_hash_at_address(address)) + Self::codes(Self::code_hash_at_address(address)) } pub fn is_contract(address: &EvmAddress) -> bool { @@ -1598,7 +1598,7 @@ impl Pallet { T::NetworkContractSource::get() }; - let old_code_info = Self::code_infos(&contract_info.code_hash).ok_or(Error::::ContractNotFound)?; + let old_code_info = Self::code_infos(contract_info.code_hash).ok_or(Error::::ContractNotFound)?; let bounded_code: BoundedVec = code.try_into().map_err(|_| Error::::ContractExceedsMaxCodeSize)?; @@ -1621,17 +1621,17 @@ impl Pallet { Self::update_contract_storage_size(&contract, storage_size_changed); // try remove old codes - CodeInfos::::mutate_exists(&contract_info.code_hash, |maybe_code_info| -> DispatchResult { + CodeInfos::::mutate_exists(contract_info.code_hash, |maybe_code_info| -> DispatchResult { let code_info = maybe_code_info.as_mut().ok_or(Error::::ContractNotFound)?; code_info.ref_count = code_info.ref_count.saturating_sub(1); if code_info.ref_count == 0 { - Codes::::remove(&contract_info.code_hash); + Codes::::remove(contract_info.code_hash); *maybe_code_info = None; } Ok(()) })?; - CodeInfos::::mutate_exists(&code_hash, |maybe_code_info| { + CodeInfos::::mutate_exists(code_hash, |maybe_code_info| { if let Some(code_info) = maybe_code_info.as_mut() { code_info.ref_count = code_info.ref_count.saturating_add(1); } else { @@ -1641,7 +1641,7 @@ impl Pallet { }; *maybe_code_info = Some(new); - Codes::::insert(&code_hash, bounded_code); + Codes::::insert(code_hash, bounded_code); } }); // update code_hash diff --git a/modules/evm/src/runner/stack.rs b/modules/evm/src/runner/stack.rs index cddbc31ece..3cc8f644fb 100644 --- a/modules/evm/src/runner/stack.rs +++ b/modules/evm/src/runner/stack.rs @@ -674,7 +674,7 @@ impl<'vicinity, 'config, T: Config> BackendT for SubstrateStackState<'vicinity, } fn storage(&self, address: H160, index: H256) -> H256 { - AccountStorages::::get(&address, index) + AccountStorages::::get(address, index) } fn original_storage(&self, address: H160, index: H256) -> Option { @@ -724,7 +724,7 @@ impl<'vicinity, 'config, T: Config> StackStateT<'config> for SubstrateStackState } fn inc_nonce(&mut self, address: H160) { - Accounts::::mutate(&address, |maybe_account| { + Accounts::::mutate(address, |maybe_account| { if let Some(account) = maybe_account.as_mut() { account.nonce += One::one() } else { diff --git a/modules/evm/src/runner/state.rs b/modules/evm/src/runner/state.rs index 30698604a8..ee4c5f2c1c 100644 --- a/modules/evm/src/runner/state.rs +++ b/modules/evm/src/runner/state.rs @@ -711,7 +711,7 @@ impl<'config, 'precompiles, S: StackState<'config>, P: PrecompileSet> StackExecu salt, } => { let mut hasher = Keccak256::new(); - hasher.update(&[0xff]); + hasher.update([0xff]); hasher.update(&caller[..]); hasher.update(&salt[..]); hasher.update(&code_hash[..]); diff --git a/modules/example/Cargo.toml b/modules/example/Cargo.toml index ee67ba575a..ef55b911bf 100644 --- a/modules/example/Cargo.toml +++ b/modules/example/Cargo.toml @@ -7,13 +7,13 @@ edition = "2021" [dependencies] scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } [features] default = ["std"] diff --git a/modules/homa-lite/Cargo.toml b/modules/homa-lite/Cargo.toml index 13611f494d..76c5387ab2 100644 --- a/modules/homa-lite/Cargo.toml +++ b/modules/homa-lite/Cargo.toml @@ -7,27 +7,27 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, optional = true} -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, optional = true} +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } module-support = { path = "../../modules/support", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } module-currencies = { path = "../../modules/currencies" } orml-tokens = { path = "../../orml/tokens" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } module-relaychain = { path = "../relaychain", features = ["kusama"] } [features] diff --git a/modules/homa-lite/src/lib.rs b/modules/homa-lite/src/lib.rs index ff42faf744..ddcbc7c139 100644 --- a/modules/homa-lite/src/lib.rs +++ b/modules/homa-lite/src/lib.rs @@ -783,7 +783,7 @@ pub mod module { redeemer: &T::AccountId, liquid_amount_to_redeem: Balance, ) -> Result { - RedeemRequests::::mutate_exists(&redeemer, |request| { + RedeemRequests::::mutate_exists(redeemer, |request| { let (request_amount, extra_fee) = request.unwrap_or_default(); // If the redeem request doesn't exist, return. if request_amount.is_zero() { @@ -981,7 +981,7 @@ pub mod module { return Ok(0); } - RedeemRequests::::mutate_exists(&redeemer, |request| { + RedeemRequests::::mutate_exists(redeemer, |request| { let (request_amount, extra_fee) = request.unwrap_or_default(); // If the redeem request doesn't exist, return. if request_amount.is_zero() { diff --git a/modules/homa-lite/src/mock.rs b/modules/homa-lite/src/mock.rs index 5c04900989..3b9c4bb207 100644 --- a/modules/homa-lite/src/mock.rs +++ b/modules/homa-lite/src/mock.rs @@ -103,6 +103,16 @@ impl XcmTransfer for MockXcm { ) -> DispatchResult { Ok(()) } + + fn transfer_multiasset_with_fee( + _who: AccountId, + _asset: MultiAsset, + _fee: MultiAsset, + _dest: MultiLocation, + _dest_weight: WeightLimit, + ) -> DispatchResult { + Ok(()) + } } impl InvertLocation for MockXcm { fn ancestry() -> MultiLocation { diff --git a/modules/homa-lite/src/mock_no_fees.rs b/modules/homa-lite/src/mock_no_fees.rs index 1c376295d2..50a8d3ccf1 100644 --- a/modules/homa-lite/src/mock_no_fees.rs +++ b/modules/homa-lite/src/mock_no_fees.rs @@ -51,6 +51,16 @@ impl XcmTransfer for MockXcm { ) -> DispatchResult { Ok(()) } + + fn transfer_multiasset_with_fee( + _who: AccountId, + _asset: MultiAsset, + _fee: MultiAsset, + _dest: MultiLocation, + _dest_weight: WeightLimit, + ) -> DispatchResult { + Ok(()) + } } impl InvertLocation for MockXcm { fn ancestry() -> MultiLocation { diff --git a/modules/homa-validator-list/Cargo.toml b/modules/homa-validator-list/Cargo.toml index 9266d81ba7..49de84edf1 100644 --- a/modules/homa-validator-list/Cargo.toml +++ b/modules/homa-validator-list/Cargo.toml @@ -8,19 +8,19 @@ edition = "2021" serde = { version = "1.0.145", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-utilities = { path = "../../orml/utilities", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } support = { package = "module-support", path = "../support", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } orml-tokens = { path = "../../orml/tokens" } orml-currencies = { path = "../../orml/currencies" } diff --git a/modules/homa/Cargo.toml b/modules/homa/Cargo.toml index 7cb891efdf..530ee043d9 100644 --- a/modules/homa/Cargo.toml +++ b/modules/homa/Cargo.toml @@ -7,23 +7,23 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, optional = true} -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, optional = true} +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } module-support = { path = "../../modules/support", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } module-currencies = { path = "../../modules/currencies" } orml-tokens = { path = "../../orml/tokens" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } [features] default = ["std"] diff --git a/modules/honzon-bridge/Cargo.toml b/modules/honzon-bridge/Cargo.toml index 61eeaec1b4..a0365bb28e 100644 --- a/modules/honzon-bridge/Cargo.toml +++ b/modules/honzon-bridge/Cargo.toml @@ -7,20 +7,20 @@ edition = "2021" [dependencies] scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } [dev-dependencies] serde_json = "1.0.68" hex = "0.4" -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } module-currencies = { path = "../../modules/currencies" } module-evm = { path = "../evm" } diff --git a/modules/honzon/Cargo.toml b/modules/honzon/Cargo.toml index 783c2326f2..4b52de58d7 100644 --- a/modules/honzon/Cargo.toml +++ b/modules/honzon/Cargo.toml @@ -7,21 +7,21 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } cdp-engine = { package = "module-cdp-engine", path = "../cdp-engine", default-features = false } loans = { package = "module-loans", path = "../loans", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } orml-currencies = { path = "../../orml/currencies" } orml-traits = { path = "../../orml/traits" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/honzon/src/lib.rs b/modules/honzon/src/lib.rs index 3bd82cc521..b8bec33b3d 100644 --- a/modules/honzon/src/lib.rs +++ b/modules/honzon/src/lib.rs @@ -456,7 +456,7 @@ impl HonzonManager for Pal } fn get_current_collateral_ratio(who: &T::AccountId, currency_id: CurrencyId) -> Option { - let Position { collateral, debit } = >::positions(currency_id, &who); + let Position { collateral, debit } = >::positions(currency_id, who); let stable_currency_id = T::GetStableCurrencyId::get(); T::PriceSource::get_relative_price(currency_id, stable_currency_id) diff --git a/modules/idle-scheduler/Cargo.toml b/modules/idle-scheduler/Cargo.toml index 7e8752004a..8a5e3eb938 100644 --- a/modules/idle-scheduler/Cargo.toml +++ b/modules/idle-scheduler/Cargo.toml @@ -7,16 +7,16 @@ edition = "2021" [dependencies] scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } acala-primitives = { path = "../../primitives", default-features = false } module-support = { path = "../support", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } [features] default = ["std"] diff --git a/modules/incentives/Cargo.toml b/modules/incentives/Cargo.toml index 0381dd1edd..41f90c2b0b 100644 --- a/modules/incentives/Cargo.toml +++ b/modules/incentives/Cargo.toml @@ -7,19 +7,19 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } orml-rewards = { path = "../../orml/rewards", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } orml-tokens = { path = "../../orml/tokens" } orml-rewards = { path = "../../orml/rewards" } diff --git a/modules/incentives/src/lib.rs b/modules/incentives/src/lib.rs index 262eb4a73f..dd267a7b12 100644 --- a/modules/incentives/src/lib.rs +++ b/modules/incentives/src/lib.rs @@ -325,7 +325,7 @@ pub mod module { if let PoolId::Dex(currency_id) = pool_id { ensure!(currency_id.is_dex_share_currency_id(), Error::::InvalidPoolId); } - ClaimRewardDeductionRates::::mutate_exists(&pool_id, |maybe_rate| -> DispatchResult { + ClaimRewardDeductionRates::::mutate_exists(pool_id, |maybe_rate| -> DispatchResult { let mut v = maybe_rate.unwrap_or_default(); if deduction_rate != *v.inner() { v.try_set(deduction_rate).map_err(|_| Error::::InvalidRate)?; @@ -402,7 +402,7 @@ impl Pallet { // orml_rewards will claim rewards for all currencies rewards >::claim_rewards(&who, &pool_id); - let pending_multi_rewards: BTreeMap = PendingMultiRewards::::take(&pool_id, &who); + let pending_multi_rewards: BTreeMap = PendingMultiRewards::::take(pool_id, &who); let deduction_rate = Self::claim_reward_deduction_rates(&pool_id); for (currency_id, pending_reward) in pending_multi_rewards { diff --git a/modules/loans/Cargo.toml b/modules/loans/Cargo.toml index 86506137d9..7b769e3fff 100644 --- a/modules/loans/Cargo.toml +++ b/modules/loans/Cargo.toml @@ -7,18 +7,18 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } support = { package = "module-support", path = "../support", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } orml-currencies = { path = "../../orml/currencies" } orml-tokens = { path = "../../orml/tokens" } cdp-treasury = { package = "module-cdp-treasury", path = "../cdp-treasury" } diff --git a/modules/nft/Cargo.toml b/modules/nft/Cargo.toml index 17cc8f3e5b..290a34bcbb 100644 --- a/modules/nft/Cargo.toml +++ b/modules/nft/Cargo.toml @@ -9,22 +9,22 @@ serde = { version = "1.0.145", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.1", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, optional = true} -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, optional = true} +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } orml-nft = { path = "../../orml/nft", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } orml-tokens = { path = "../../orml/tokens" } module-currencies = { path = "../../modules/currencies" } diff --git a/modules/nominees-election/Cargo.toml b/modules/nominees-election/Cargo.toml index e99309f453..50c13ee778 100644 --- a/modules/nominees-election/Cargo.toml +++ b/modules/nominees-election/Cargo.toml @@ -7,18 +7,18 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } orml-currencies = { path = "../../orml/currencies" } orml-tokens = { path = "../../orml/tokens" } diff --git a/modules/prices/Cargo.toml b/modules/prices/Cargo.toml index 981bcc5d70..d1bb27fbba 100644 --- a/modules/prices/Cargo.toml +++ b/modules/prices/Cargo.toml @@ -7,17 +7,17 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } orml-traits = { package = "orml-traits", path = "../../orml/traits", default-features = false } support = { package = "module-support", path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } orml-tokens = { path = "../../orml/tokens" } [features] diff --git a/modules/relaychain/Cargo.toml b/modules/relaychain/Cargo.toml index 46d5fa6985..733a4bf8b6 100644 --- a/modules/relaychain/Cargo.toml +++ b/modules/relaychain/Cargo.toml @@ -6,18 +6,18 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } module-support = { path = "../support", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } [features] default = ["std"] diff --git a/modules/session-manager/Cargo.toml b/modules/session-manager/Cargo.toml index 36126df4b8..6658d05b8f 100644 --- a/modules/session-manager/Cargo.toml +++ b/modules/session-manager/Cargo.toml @@ -8,15 +8,15 @@ edition = "2021" log = { version = "0.4.17", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } [features] default = ["std"] diff --git a/modules/support/Cargo.toml b/modules/support/Cargo.toml index b2eef86237..8602170e93 100644 --- a/modules/support/Cargo.toml +++ b/modules/support/Cargo.toml @@ -10,12 +10,12 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } serde = { version = "1.0.145", optional = true } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } orml-tokens = { path = "../../orml/tokens", default-features = false } nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path = "../../ecosystem-modules/stable-asset/lib/stable-asset", package = "nutsfinance-stable-asset" } diff --git a/modules/support/src/stable_asset.rs b/modules/support/src/stable_asset.rs index 320a36fbac..46f91dc58d 100644 --- a/modules/support/src/stable_asset.rs +++ b/modules/support/src/stable_asset.rs @@ -110,7 +110,7 @@ where .iter() .enumerate() .map(|(index, amount)| { - if let Some(currency_id) = pool_info.assets.get(index as usize) { + if let Some(currency_id) = pool_info.assets.get(index) { RebaseTokenAmountConvertor::convert_balance(*amount, *currency_id) } else { *amount @@ -170,7 +170,7 @@ where .iter() .enumerate() .map(|(index, redeem_amount)| { - if let Some(currency_id) = pool_info.assets.get(index as usize) { + if let Some(currency_id) = pool_info.assets.get(index) { RebaseTokenAmountConvertor::convert_balance(*redeem_amount, *currency_id) } else { *redeem_amount @@ -212,7 +212,7 @@ where .iter() .enumerate() .map(|(index, amount)| { - if let Some(currency_id) = pool_info.assets.get(index as usize) { + if let Some(currency_id) = pool_info.assets.get(index) { RebaseTokenAmountConvertor::convert_balance(*amount, *currency_id) } else { *amount @@ -326,7 +326,7 @@ where .iter() .enumerate() .map(|(index, amount)| { - if let Some(currency_id) = pool_info.assets.get(index as usize) { + if let Some(currency_id) = pool_info.assets.get(index) { RebaseTokenAmountConvertor::convert_balance_back(*amount, *currency_id) } else { *amount diff --git a/modules/transaction-pause/Cargo.toml b/modules/transaction-pause/Cargo.toml index 543696b39e..d89cbe3456 100644 --- a/modules/transaction-pause/Cargo.toml +++ b/modules/transaction-pause/Cargo.toml @@ -7,16 +7,16 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } module-support = { path = "../support", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } orml-tokens = { path = "../../orml/tokens" } orml-traits = { path = "../../orml/traits" } primitives = { package = "acala-primitives", path = "../../primitives" } diff --git a/modules/transaction-pause/src/lib.rs b/modules/transaction-pause/src/lib.rs index 5418ab26e9..753bbde745 100644 --- a/modules/transaction-pause/src/lib.rs +++ b/modules/transaction-pause/src/lib.rs @@ -150,7 +150,7 @@ pub mod module { #[transactional] pub fn pause_evm_precompile(origin: OriginFor, address: H160) -> DispatchResult { T::UpdateOrigin::ensure_origin(origin)?; - PausedEvmPrecompiles::::mutate_exists(&address, |maybe_paused| { + PausedEvmPrecompiles::::mutate_exists(address, |maybe_paused| { if maybe_paused.is_none() { *maybe_paused = Some(()); Self::deposit_event(Event::EvmPrecompilePaused { address }); @@ -164,7 +164,7 @@ pub mod module { #[transactional] pub fn unpause_evm_precompile(origin: OriginFor, address: H160) -> DispatchResult { T::UpdateOrigin::ensure_origin(origin)?; - if PausedEvmPrecompiles::::take(&address).is_some() { + if PausedEvmPrecompiles::::take(address).is_some() { Self::deposit_event(Event::EvmPrecompileUnpaused { address }); }; Ok(()) @@ -189,6 +189,6 @@ where pub struct PausedPrecompileFilter(sp_std::marker::PhantomData); impl module_support::PrecompilePauseFilter for PausedPrecompileFilter { fn is_paused(address: H160) -> bool { - PausedEvmPrecompiles::::contains_key(&address) + PausedEvmPrecompiles::::contains_key(address) } } diff --git a/modules/transaction-payment/Cargo.toml b/modules/transaction-payment/Cargo.toml index c08ac057eb..fff04e5a88 100644 --- a/modules/transaction-payment/Cargo.toml +++ b/modules/transaction-payment/Cargo.toml @@ -7,22 +7,22 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-io= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-io= { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } support = { package = "module-support", path = "../support", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } orml-tokens = { path = "../../orml/tokens" } module-currencies = { path = "../../modules/currencies" } module-dex = { path = "../dex" } diff --git a/modules/xcm-interface/Cargo.toml b/modules/xcm-interface/Cargo.toml index 9df7af0c76..33df738a3a 100644 --- a/modules/xcm-interface/Cargo.toml +++ b/modules/xcm-interface/Cargo.toml @@ -7,25 +7,25 @@ edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, optional = true} -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, optional = true} +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } primitives = { package = "acala-primitives", path = "../../primitives", default-features = false } orml-traits = { path = "../../orml/traits", default-features = false } module-support = { path = "../../modules/support", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } module-currencies = { path = "../../modules/currencies" } orml-tokens = { path = "../../orml/tokens" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } module-relaychain = { path = "../relaychain", features = ["kusama"] } [features] diff --git a/node/Cargo.toml b/node/Cargo.toml index 874043cf05..f69bb01e6e 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -10,8 +10,7 @@ name = "acala" path = "src/main.rs" [dependencies] -futures = "0.3.24" -parity-util-mem = { version = "0.12.0", default-features = false, features = ["jemalloc-global"] } +futures = "0.3.25" acala-cli = { path = "cli" } acala-service = { path = "service" } diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml index b602ecf03f..97a6b973d3 100644 --- a/node/cli/Cargo.toml +++ b/node/cli/Cargo.toml @@ -9,39 +9,42 @@ log = "0.4.17" clap = { version = "4.0.9", features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", optional = true } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", optional = true } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", optional = true } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", optional = true } -try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", optional = true } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", optional = true } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", optional = true } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", optional = true } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", optional = true } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", optional = true } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", optional = true } +try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", optional = true } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } inspect = { package = "acala-inspect", path = "../../inspect" } service = { package = "acala-service", path = "../service", default-features = false, optional = true } [build-dependencies] -orml-build-script-utils = { path = "../../orml/build-script-utils"} -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +orml-build-script-utils = { path = "../../orml/build-script-utils" } +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } [features] -default = [ "wasmtime", "cli" ] -wasmtime = [ "sc-cli/wasmtime" ] +default = [ "cli" ] cli = [ "frame-benchmarking-cli", "sc-cli", + "sp-core", + "sc-executor", "sc-service", "service", - "sp-core", + "sp-io", "try-runtime-cli", ] runtime-benchmarks = [ diff --git a/node/cli/src/cli.rs b/node/cli/src/cli.rs index 60110c975f..74eb43391d 100644 --- a/node/cli/src/cli.rs +++ b/node/cli/src/cli.rs @@ -101,9 +101,9 @@ pub struct Cli { #[clap(flatten)] pub run: cumulus_client_cli::RunCmd, - /// Relaychain arguments + /// Relay chain arguments #[clap(raw = true)] - pub relaychain_args: Vec, + pub relay_chain_args: Vec, /// Instant block sealing /// diff --git a/node/cli/src/command.rs b/node/cli/src/command.rs index f0d026dfb5..8108886e81 100644 --- a/node/cli/src/command.rs +++ b/node/cli/src/command.rs @@ -161,8 +161,8 @@ impl SubstrateCli for RelayChainCli { format!( "{} parachain collator\n\nThe command-line arguments provided first will be \ passed to the parachain node, while the arguments provided after -- will be passed \ - to the relaychain node.\n\n\ - rococo-collator [parachain-args] -- [relaychain-args]", + to the relay chain node.\n\n\ + rococo-collator [parachain-args] -- [relay-chain-args]", chain_name() ) } @@ -386,7 +386,7 @@ pub fn run() -> sc_cli::Result<()> { &config, [RelayChainCli::executable_name()] .iter() - .chain(cli.relaychain_args.iter()), + .chain(cli.relay_chain_args.iter()), ); let polkadot_config = @@ -432,6 +432,7 @@ pub fn run() -> sc_cli::Result<()> { #[cfg(feature = "try-runtime")] Some(Subcommand::TryRuntime(cmd)) => { + use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch}; let runner = cli.create_runner(cmd)?; let chain_spec = &runner.config().chain_spec; set_default_ss58_version(chain_spec); @@ -443,7 +444,13 @@ pub fn run() -> sc_cli::Result<()> { let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry); let task_manager = sc_service::TaskManager::new(config.tokio_handle.clone(), registry) .map_err(|e| sc_cli::Error::Service(sc_service::Error::Prometheus(e)))?; - Ok((cmd.run::(config), task_manager)) + Ok(( + cmd.run::::ExtendHostFunctions, + >>(), + task_manager, + )) }); }) } @@ -476,7 +483,7 @@ pub fn run() -> sc_cli::Result<()> { &config, [RelayChainCli::executable_name()] .iter() - .chain(cli.relaychain_args.iter()), + .chain(cli.relay_chain_args.iter()), ); let id = ParaId::from(para_id); diff --git a/node/e2e-tests/test-service/Cargo.toml b/node/e2e-tests/test-service/Cargo.toml index 5edb9f2432..99dcea0da6 100644 --- a/node/e2e-tests/test-service/Cargo.toml +++ b/node/e2e-tests/test-service/Cargo.toml @@ -11,7 +11,7 @@ serde = { version = "1.0.145", features = ["derive"] } async-trait = "0.1.59" tokio = { version = "1.21.2", features = ["macros"] } criterion = { version = "0.3.6", features = [ "async_tokio" ] } -jsonrpsee = { version = "0.15.1", features = ["server", "macros"] } +jsonrpsee = { version = "0.16.2", features = ["server", "macros"] } log = "0.4.17" futures = { package = "futures", version = "0.3", features = ["compat"] } tempfile = "3.1.0" @@ -21,62 +21,62 @@ rlp = "0.5.2" sha3 = "0.10" # Substrate dependencies -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", features = [ "wasmtime" ] } -sc-rpc-server = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-rpc-server = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } # Polkadot dependencies -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } # Cumulus dependencies -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-test-relay-validation-worker-provider = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } runtime-common = { path = "../../../runtime/common" } node-runtime = { package = "mandala-runtime", path = "../../../runtime/mandala" } @@ -94,5 +94,5 @@ ecosystem-renvm-bridge = { path = "../../../ecosystem-modules/ren/renvm-bridge" portpicker = "0.1.1" # Substrate dependencies -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } diff --git a/node/e2e-tests/test-service/src/builder.rs b/node/e2e-tests/test-service/src/builder.rs index f43c382ba7..7acf652ea3 100644 --- a/node/e2e-tests/test-service/src/builder.rs +++ b/node/e2e-tests/test-service/src/builder.rs @@ -32,7 +32,7 @@ pub struct TestNodeBuilder { storage_update_func_relay_chain: Option>, consensus: Consensus, seal_mode: SealMode, - relay_chain_full_node_url: Option, + relay_chain_full_node_url: Vec, } impl TestNodeBuilder { @@ -56,7 +56,7 @@ impl TestNodeBuilder { storage_update_func_relay_chain: None, consensus: Consensus::Aura, seal_mode: SealMode::DevAuraSeal, - relay_chain_full_node_url: None, + relay_chain_full_node_url: vec![], } } @@ -153,7 +153,7 @@ impl TestNodeBuilder { /// Connect to full node via RPC. pub fn use_external_relay_chain_node_at_url(mut self, network_address: Url) -> Self { - self.relay_chain_full_node_url = Some(network_address); + self.relay_chain_full_node_url = vec![network_address]; self } @@ -161,7 +161,7 @@ impl TestNodeBuilder { pub fn use_external_relay_chain_node_at_port(mut self, port: u16) -> Self { let mut localhost_url = Url::parse("ws://localhost").expect("Should be able to parse localhost Url"); localhost_url.set_port(Some(port)).expect("Should be able to set port"); - self.relay_chain_full_node_url = Some(localhost_url); + self.relay_chain_full_node_url = vec![localhost_url]; self } @@ -187,7 +187,7 @@ impl TestNodeBuilder { ); let collator_options = CollatorOptions { - relay_chain_rpc_url: self.relay_chain_full_node_url, + relay_chain_rpc_urls: self.relay_chain_full_node_url, }; relay_chain_config.network.node_name = format!("{} (relay chain)", relay_chain_config.network.node_name); diff --git a/node/e2e-tests/test-service/src/lib.rs b/node/e2e-tests/test-service/src/lib.rs index d0a0d7630c..380970f98c 100644 --- a/node/e2e-tests/test-service/src/lib.rs +++ b/node/e2e-tests/test-service/src/lib.rs @@ -53,7 +53,7 @@ use futures::{channel::mpsc::Sender, SinkExt}; use jsonrpsee::RpcModule; use polkadot_primitives::v2::{CollatorPair, Hash as PHash, HeadData, PersistedValidationData}; use sc_client_api::{execution_extensions::ExecutionStrategies, Backend, CallExecutor, ExecutorProvider}; -use sc_consensus::LongestChain; +use sc_consensus::{ImportQueue, LongestChain}; use sc_consensus_aura::{ImportQueueParams, StartAuraParams}; use sc_consensus_manual_seal::{ rpc::{ManualSeal, ManualSealApiServer}, @@ -137,13 +137,16 @@ impl sc_executor::NativeExecutionDispatch for RuntimeExecutor { /// The client type being used by the test service. pub type Client = TFullClient>; +/// The backend type being used by the test service. +pub type ParachainBackend = TFullBackend; + /// Transaction pool type used by the test service pub type TxPool = Arc>; -type ParachainBlockImport = TParachainBlockImport>; +type ParachainBlockImport = TParachainBlockImport, ParachainBackend>; /// Maybe Mandala Dev full select chain. -type MaybeFullSelectChain = Option, Block>>; +type MaybeFullSelectChain = Option>; pub enum Consensus { /// Use the relay-chain provided consensus. diff --git a/node/e2e-tests/test-service/src/node.rs b/node/e2e-tests/test-service/src/node.rs index 6ef8fde4d1..dacc653ae1 100644 --- a/node/e2e-tests/test-service/src/node.rs +++ b/node/e2e-tests/test-service/src/node.rs @@ -126,12 +126,13 @@ impl TestNode { std::fmt::Debug, { let hash = self.client.info().best_hash; + let number = self.client.info().best_number.saturated_into(); let mut overlay = OverlayedChanges::default(); let mut cache = StorageTransactionCache:: as Backend>::State>::default(); - let mut extensions = self - .client - .execution_extensions() - .extensions(&BlockId::Hash(hash), ExecutionContext::BlockConstruction); + let mut extensions = + self.client + .execution_extensions() + .extensions(hash, number, ExecutionContext::BlockConstruction); let state_backend = self .backend .state_at(hash) diff --git a/node/e2e-tests/test-service/src/service.rs b/node/e2e-tests/test-service/src/service.rs index c7b3365c61..1290fffe65 100644 --- a/node/e2e-tests/test-service/src/service.rs +++ b/node/e2e-tests/test-service/src/service.rs @@ -32,7 +32,7 @@ pub fn new_partial( ) -> Result< PartialComponents< Client, - TFullBackend, + ParachainBackend, MaybeFullSelectChain, sc_consensus::import_queue::BasicQueue>, sc_transaction_pool::FullPool, @@ -51,7 +51,7 @@ pub fn new_partial( sc_service::new_full_parts::(config, None, executor)?; let client = Arc::new(client); - let block_import = ParachainBlockImport::new(client.clone()); + let block_import = ParachainBlockImport::new(client.clone(), backend.clone()); let registry = config.prometheus_registry(); @@ -384,8 +384,8 @@ async fn build_relay_chain_interface( collator_options: CollatorOptions, task_manager: &mut TaskManager, ) -> RelayChainResult> { - if let Some(relay_chain_url) = collator_options.relay_chain_rpc_url { - return build_minimal_relay_chain_node(relay_chain_config, task_manager, relay_chain_url) + if !collator_options.relay_chain_rpc_urls.is_empty() { + return build_minimal_relay_chain_node(relay_chain_config, task_manager, collator_options.relay_chain_rpc_urls) .await .map(|r| r.0); } @@ -469,18 +469,27 @@ where let prometheus_registry = parachain_config.prometheus_registry().cloned(); - let import_queue = cumulus_client_service::SharedImportQueue::new(params.import_queue); + let import_queue_service = params.import_queue.service(); let (network, system_rpc_tx, tx_handler_controller, start_network) = sc_service::build_network(sc_service::BuildNetworkParams { config: ¶chain_config, client: client.clone(), transaction_pool: transaction_pool.clone(), spawn_handle: task_manager.spawn_handle(), - import_queue: import_queue.clone(), + import_queue: params.import_queue, block_announce_validator_builder: Some(Box::new(block_announce_validator_builder)), warp_sync: None, })?; + if parachain_config.offchain_worker.enabled { + sc_service::build_offchain_workers( + ¶chain_config, + task_manager.spawn_handle(), + client.clone(), + network.clone(), + ); + } + let rpc_builder = { let client = client.clone(); @@ -620,7 +629,7 @@ where parachain_consensus, relay_chain_interface, collator_key, - import_queue, + import_queue: import_queue_service, relay_chain_slot_duration: Duration::from_secs(6), }; @@ -632,7 +641,7 @@ where task_manager: &mut task_manager, para_id, relay_chain_interface, - import_queue, + import_queue: import_queue_service, // The slot duration is currently used internally only to configure // the recovery delay of pov-recovery. We don't want to wait for too // long on the full node to recover, so we reduce this time here. diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml index 64babed950..d2d2b6b6ba 100644 --- a/node/service/Cargo.toml +++ b/node/service/Cargo.toml @@ -13,72 +13,72 @@ serde_json = "1.0.68" codec = { package = "parity-scale-codec", version = "3.0.0" } futures = "0.3.24" hex = "0.4.0" -jsonrpsee = { version = "0.15.1", features = ["server", "macros"] } +jsonrpsee = { version = "0.16.2", features = ["server", "macros"] } coins-bip32 = "0.7.0" coins-bip39 = "0.7.0" k256 = { version = "0.11.5", default-features = false, features = ["keccak256", "ecdsa", "std"] } tiny-keccak = { version = "2.0", features = ["keccak"] } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33"} -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } orml-oracle-rpc = { path = "../../orml/oracle/rpc" } orml-tokens-rpc = { path = "../../orml/tokens/rpc" } diff --git a/node/service/src/chain_spec/mandala.rs b/node/service/src/chain_spec/mandala.rs index 8aaefd0d29..0475f76d12 100644 --- a/node/service/src/chain_spec/mandala.rs +++ b/node/service/src/chain_spec/mandala.rs @@ -69,7 +69,7 @@ fn generate_evm_address(phrase: &str, index: u32) -> H160 { .expect("should parse the default derivation path"); let mnemonic = Mnemonic::::new_from_phrase(phrase).unwrap(); - let derived_priv_key = mnemonic.derive_key(&derivation_path, None).unwrap(); + let derived_priv_key = mnemonic.derive_key(derivation_path, None).unwrap(); let key: &SigningKey = derived_priv_key.as_ref(); let secret_key: SigningKey = SigningKey::from_bytes(&key.to_bytes()).unwrap(); let verify_key: VerifyingKey = secret_key.verifying_key(); diff --git a/node/service/src/client.rs b/node/service/src/client.rs index 9f3172185e..e610c4c01f 100644 --- a/node/service/src/client.rs +++ b/node/service/src/client.rs @@ -25,7 +25,7 @@ use sp_api::{CallApiAt, NumberFor, ProvideRuntimeApi}; use sp_blockchain::HeaderBackend; use sp_consensus::BlockStatus; use sp_runtime::{ - generic::{BlockId, SignedBlock}, + generic::SignedBlock, traits::{BlakeTwo256, Block as BlockT}, Justifications, }; @@ -206,25 +206,25 @@ impl sc_client_api::BlockBackend for Client { } } - fn block(&self, id: &BlockId) -> sp_blockchain::Result>> { + fn block(&self, hash: ::Hash) -> sp_blockchain::Result>> { match self { #[cfg(feature = "with-mandala-runtime")] - Self::Mandala(client) => client.block(id), + Self::Mandala(client) => client.block(hash), #[cfg(feature = "with-karura-runtime")] - Self::Karura(client) => client.block(id), + Self::Karura(client) => client.block(hash), #[cfg(feature = "with-acala-runtime")] - Self::Acala(client) => client.block(id), + Self::Acala(client) => client.block(hash), } } - fn block_status(&self, id: &BlockId) -> sp_blockchain::Result { + fn block_status(&self, hash: ::Hash) -> sp_blockchain::Result { match self { #[cfg(feature = "with-mandala-runtime")] - Self::Mandala(client) => client.block_status(id), + Self::Mandala(client) => client.block_status(hash), #[cfg(feature = "with-karura-runtime")] - Self::Karura(client) => client.block_status(id), + Self::Karura(client) => client.block_status(hash), #[cfg(feature = "with-acala-runtime")] - Self::Acala(client) => client.block_status(id), + Self::Acala(client) => client.block_status(hash), } } @@ -424,14 +424,14 @@ impl sc_client_api::StorageProvider for Client { } impl sp_blockchain::HeaderBackend for Client { - fn header(&self, id: BlockId) -> sp_blockchain::Result> { + fn header(&self, hash: ::Hash) -> sp_blockchain::Result> { match self { #[cfg(feature = "with-mandala-runtime")] - Self::Mandala(client) => client.header(&id), + Self::Mandala(client) => client.header(hash), #[cfg(feature = "with-karura-runtime")] - Self::Karura(client) => client.header(&id), + Self::Karura(client) => client.header(hash), #[cfg(feature = "with-acala-runtime")] - Self::Acala(client) => client.header(&id), + Self::Acala(client) => client.header(hash), } } @@ -446,14 +446,14 @@ impl sp_blockchain::HeaderBackend for Client { } } - fn status(&self, id: BlockId) -> sp_blockchain::Result { + fn status(&self, hash: ::Hash) -> sp_blockchain::Result { match self { #[cfg(feature = "with-mandala-runtime")] - Self::Mandala(client) => client.status(id), + Self::Mandala(client) => client.status(hash), #[cfg(feature = "with-karura-runtime")] - Self::Karura(client) => client.status(id), + Self::Karura(client) => client.status(hash), #[cfg(feature = "with-acala-runtime")] - Self::Acala(client) => client.status(id), + Self::Acala(client) => client.status(hash), } } diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index 3c7f2e784a..3af4288b73 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -36,7 +36,7 @@ use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface, RelayC use cumulus_relay_chain_minimal_node::build_minimal_relay_chain_node; pub use futures::stream::StreamExt; use jsonrpsee::RpcModule; -use sc_consensus::LongestChain; +use sc_consensus::{ImportQueue, LongestChain}; use sc_consensus_aura::{ImportQueueParams, StartAuraParams}; use sc_executor::WasmExecutor; use sc_network::NetworkService; @@ -176,7 +176,7 @@ type FullBackend = TFullBackend; /// Acala's full client. type FullClient = TFullClient>; -type ParachainBlockImport = TParachainBlockImport>>; +type ParachainBlockImport = TParachainBlockImport>, FullBackend>; /// Maybe Mandala Dev full select chain. type MaybeFullSelectChain = Option>; @@ -248,7 +248,7 @@ where client.clone(), ); - let block_import = ParachainBlockImport::new(client.clone()); + let block_import = ParachainBlockImport::new(client.clone(), backend.clone()); let select_chain = if dev { Some(LongestChain::new(backend.clone())) @@ -350,6 +350,9 @@ where }) } +/// Build a relay chain interface. +/// Will return a minimal relay chain node with RPC +/// client or an inprocess node, based on the [`CollatorOptions`] passed in. async fn build_relay_chain_interface( polkadot_config: Configuration, parachain_config: &Configuration, @@ -357,15 +360,16 @@ async fn build_relay_chain_interface( task_manager: &mut TaskManager, collator_options: CollatorOptions, ) -> RelayChainResult<(Arc<(dyn RelayChainInterface + 'static)>, Option)> { - match collator_options.relay_chain_rpc_url { - Some(relay_chain_url) => build_minimal_relay_chain_node(polkadot_config, task_manager, relay_chain_url).await, - None => build_inprocess_relay_chain( + if !collator_options.relay_chain_rpc_urls.is_empty() { + build_minimal_relay_chain_node(polkadot_config, task_manager, collator_options.relay_chain_rpc_urls).await + } else { + build_inprocess_relay_chain( polkadot_config, parachain_config, telemetry_worker_handle, task_manager, None, - ), + ) } } @@ -428,14 +432,14 @@ where let validator = parachain_config.role.is_authority(); let prometheus_registry = parachain_config.prometheus_registry().cloned(); let transaction_pool = params.transaction_pool.clone(); - let import_queue = cumulus_client_service::SharedImportQueue::new(params.import_queue); + let import_queue_service = params.import_queue.service(); let (network, system_rpc_tx, tx_handler_controller, start_network) = sc_service::build_network(sc_service::BuildNetworkParams { config: ¶chain_config, client: client.clone(), transaction_pool: transaction_pool.clone(), spawn_handle: task_manager.spawn_handle(), - import_queue: import_queue.clone(), + import_queue: params.import_queue, block_announce_validator_builder: Some(Box::new(|_| Box::new(block_announce_validator))), warp_sync: None, })?; @@ -511,7 +515,7 @@ where relay_chain_interface, spawner, parachain_consensus, - import_queue, + import_queue: import_queue_service, collator_key: collator_key.expect("Command line arguments do not allow this. qed"), relay_chain_slot_duration, }; @@ -525,7 +529,7 @@ where para_id, relay_chain_interface, relay_chain_slot_duration, - import_queue, + import_queue: import_queue_service, }; start_full_node(params)?; diff --git a/orml b/orml index dc39cfddef..16b6c1149a 160000 --- a/orml +++ b/orml @@ -1 +1 @@ -Subproject commit dc39cfddefb10ef0de23655e2c3dcdab66a19404 +Subproject commit 16b6c1149a15674d21c87244b7988a667e2c14d9 diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index e3ebcc96e9..840aca46f4 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -10,18 +10,17 @@ bstringify = "0.1.2" serde = { version = "1.0.145", optional = true } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["max-encoded-len"] } num_enum = { version = "0.5.1", default-features = false } -parity-util-mem = { version = "0.12.0", default-features = false, features = ["primitive-types"] } scale-info = { version = "2.1", default-features = false, features = ["derive"] } enumflags2 = { version = "0.6.3" } paste = "1.0" -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } orml-traits = { path = "../orml/traits", default-features = false } @@ -39,7 +38,6 @@ std = [ "serde", "codec/std", "num_enum/std", - "parity-util-mem/std", "scale-info/std", "enumflags2/serde", "sp-runtime/std", @@ -55,3 +53,4 @@ std = [ "nutsfinance-stable-asset/std", ] evm-tests = [] +try-runtime = [] diff --git a/primitives/src/bonding/controller.rs b/primitives/src/bonding/controller.rs index dc089da432..85bdc68f7b 100644 --- a/primitives/src/bonding/controller.rs +++ b/primitives/src/bonding/controller.rs @@ -73,7 +73,7 @@ where let ledger = ledger.bond(bond_amount).map_err(Self::convert_error)?; - Self::Ledger::insert(&who, &ledger); + Self::Ledger::insert(who, &ledger); Self::apply_ledger(who, &ledger)?; Ok(Some(BondChange { @@ -93,7 +93,7 @@ where return Ok(None); } - Self::Ledger::insert(&who, &ledger); + Self::Ledger::insert(who, &ledger); Self::apply_ledger(who, &ledger)?; Ok(Some(BondChange { @@ -113,7 +113,7 @@ where return Ok(None); } - Self::Ledger::insert(&who, &ledger); + Self::Ledger::insert(who, &ledger); Self::apply_ledger(who, &ledger)?; Ok(Some(BondChange { @@ -133,7 +133,7 @@ where return Ok(None); } - Self::Ledger::insert(&who, &ledger); + Self::Ledger::insert(who, &ledger); Self::apply_ledger(who, &ledger)?; Ok(Some(BondChange { @@ -158,9 +158,9 @@ where } if new_total == 0 { - Self::Ledger::remove(&who); + Self::Ledger::remove(who); } else { - Self::Ledger::insert(&who, &ledger); + Self::Ledger::insert(who, &ledger); } Self::apply_ledger(who, &ledger)?; diff --git a/primitives/src/unchecked_extrinsic.rs b/primitives/src/unchecked_extrinsic.rs index c3f92f688b..789ee5685a 100644 --- a/primitives/src/unchecked_extrinsic.rs +++ b/primitives/src/unchecked_extrinsic.rs @@ -50,18 +50,6 @@ pub struct AcalaUncheckedExtrinsic< PhantomData<(ConvertEthTx, StorageDepositPerByte, TxFeePerGas, CheckPayerTx)>, ); -#[cfg(feature = "std")] -impl parity_util_mem::MallocSizeOf - for AcalaUncheckedExtrinsic -where - Extra: SignedExtension, -{ - fn size_of(&self, _ops: &mut parity_util_mem::MallocSizeOfOps) -> usize { - // Instantiated only in runtime. - 0 - } -} - impl Extrinsic for AcalaUncheckedExtrinsic { @@ -237,6 +225,14 @@ where _ => self.0.check(lookup), } } + + #[cfg(feature = "try-runtime")] + fn unchecked_into_checked_i_know_what_i_am_doing( + self, + _lookup: &Lookup, + ) -> Result { + unreachable!(); + } } impl GetDispatchInfo diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 66b6e340ef..8257061535 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -6,20 +6,20 @@ edition = "2021" [dependencies] futures = "0.3.21" -jsonrpsee = { version = "0.15.1", features = ["server", "macros"] } +jsonrpsee = { version = "0.16.2", features = ["server", "macros"] } codec = { package = "parity-scale-codec", version = "3.0.0" } primitives = { package = "acala-primitives", path = "../primitives" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } orml-oracle-rpc = { path = "../orml/oracle/rpc" } runtime-common = { path = "../runtime/common" } diff --git a/runtime/acala/Cargo.toml b/runtime/acala/Cargo.toml index 6e6e1bb2bd..b288019e2a 100644 --- a/runtime/acala/Cargo.toml +++ b/runtime/acala/Cargo.toml @@ -14,62 +14,62 @@ hex = { version = "0.4", default-features = false } hex-literal = { version = "0.3.1" } # substrate -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, optional = true } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false} -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false} -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features =false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, features = ["historical"] } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, optional = true } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false} +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false} +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features =false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, features = ["historical"] } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } # cumulus -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } # orml orml-auction = { path = "../../orml/auction", default-features = false } @@ -125,15 +125,15 @@ nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path = # benchmarking deps libsecp256k1 = { version = "0.7", default-features = false, optional = true } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, optional = true } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, optional = true } -pallet-bags-list = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, optional = true } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, optional = true } +pallet-bags-list = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, optional = true } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } [features] default = ["std"] @@ -378,6 +378,8 @@ try-runtime = [ "module-transaction-payment/try-runtime", "module-xcm-interface/try-runtime", + "primitives/try-runtime", + "nutsfinance-stable-asset/try-runtime", ] # By default some types have documentation, `no-metadata-docs` allows to reduce the documentation diff --git a/runtime/acala/src/constants.rs b/runtime/acala/src/constants.rs index e2773a81fd..2e28ddb9de 100644 --- a/runtime/acala/src/constants.rs +++ b/runtime/acala/src/constants.rs @@ -41,7 +41,7 @@ pub mod time { /// Fee-related pub mod fee { use frame_support::weights::{ - constants::{ExtrinsicBaseWeight, WEIGHT_PER_SECOND}, + constants::{ExtrinsicBaseWeight, WEIGHT_REF_TIME_PER_SECOND}, WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial, }; use primitives::Balance; @@ -82,7 +82,7 @@ pub mod fee { pub fn aca_per_second() -> u128 { let base_weight = Balance::from(ExtrinsicBaseWeight::get().ref_time()); - let base_tx_per_second = (WEIGHT_PER_SECOND.ref_time() as u128) / base_weight; + let base_tx_per_second = (WEIGHT_REF_TIME_PER_SECOND as u128) / base_weight; base_tx_per_second * base_tx_in_aca() } diff --git a/runtime/acala/src/lib.rs b/runtime/acala/src/lib.rs index 6fe38c179d..40fc9bc765 100644 --- a/runtime/acala/src/lib.rs +++ b/runtime/acala/src/lib.rs @@ -1794,7 +1794,10 @@ pub type Executive = frame_executive::Executive< frame_system::ChainContext, Runtime, AllPalletsWithSystem, - (module_cdp_treasury::InitializeDebitOffsetBuffer,), + ( + pallet_balances::migration::MigrateToTrackInactive, + pallet_scheduler::migration::v4::CleanupAgendas, + ), >; #[cfg(feature = "runtime-benchmarks")] @@ -2061,25 +2064,27 @@ impl_runtime_apis! { #[cfg(feature = "try-runtime")] impl frame_try_runtime::TryRuntime for Runtime { - fn on_runtime_upgrade() -> (Weight, Weight) { + fn on_runtime_upgrade(checks: frame_try_runtime::UpgradeCheckSelect) -> (Weight, Weight) { log::info!("try-runtime::on_runtime_upgrade"); - let weight = Executive::try_runtime_upgrade().unwrap(); + let weight = Executive::try_runtime_upgrade(checks).unwrap(); (weight, RuntimeBlockWeights::get().max_block) } fn execute_block( block: Block, state_root_check: bool, + signature_check: bool, select: frame_try_runtime::TryStateSelect ) -> Weight { log::info!( target: "node-runtime", - "try-runtime: executing block {:?} / root checks: {:?} / try-state-select: {:?}", + "try-runtime: executing block {:?} / root checks: {:?} / signature check: {:?} / try-state-select: {:?}", block.header.hash(), state_root_check, + signature_check, select, ); - Executive::try_execute_block(block, state_root_check, select).expect("try_execute_block failed") + Executive::try_execute_block(block, state_root_check, signature_check, select).expect("try_execute_block failed") } } diff --git a/runtime/acala/src/xcm_config.rs b/runtime/acala/src/xcm_config.rs index d4ecdb2465..74bb309674 100644 --- a/runtime/acala/src/xcm_config.rs +++ b/runtime/acala/src/xcm_config.rs @@ -58,6 +58,7 @@ parameter_types! { pub const RelayNetwork: NetworkId = NetworkId::Polkadot; pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into(); pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into(); + pub CheckingAccount: AccountId = PolkadotXcm::check_account(); } /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 027fed7c20..cc4ac8fb2c 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -20,30 +20,30 @@ ethabi = { version = "18.0.0", default-features = false } scale-info = { version = "2.2.0", default-features = false, features = ["derive"] } # substrate -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, features = ["tuples-96"] } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, optional = true } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, optional = true } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, optional = true } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, optional = true } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, features = ["tuples-96"] } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, optional = true } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, optional = true } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, optional = true } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, optional = true } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } # cumulus -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } # polkadot -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false, optional = true } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false, optional = true } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } # modules module-currencies = { path = "../../modules/currencies", default-features = false } diff --git a/runtime/common/src/check_nonce.rs b/runtime/common/src/check_nonce.rs index a735a9bcdb..acaaa537bb 100644 --- a/runtime/common/src/check_nonce.rs +++ b/runtime/common/src/check_nonce.rs @@ -116,7 +116,7 @@ where // should check evm nonce let address = ::AddressMapping::get_evm_address(who) .unwrap_or_else(|| ::AddressMapping::get_default_evm_address(who)); - let evm_nonce = module_evm::Accounts::::get(&address) + let evm_nonce = module_evm::Accounts::::get(address) .map(|x| x.nonce) .unwrap_or_default(); if self.nonce != evm_nonce { @@ -151,7 +151,7 @@ where // should check evm nonce let address = ::AddressMapping::get_evm_address(who) .unwrap_or_else(|| ::AddressMapping::get_default_evm_address(who)); - let evm_nonce = module_evm::Accounts::::get(&address) + let evm_nonce = module_evm::Accounts::::get(address) .map(|x| x.nonce) .unwrap_or_default(); if self.nonce < evm_nonce { diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index d349fa750f..49655ffce0 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -27,7 +27,7 @@ use frame_support::{ dispatch::{DispatchClass, Weight}, parameter_types, traits::{Contains, EitherOfDiverse, Get}, - weights::constants::{BlockExecutionWeight, ExtrinsicBaseWeight, WEIGHT_PER_SECOND}, + weights::constants::{BlockExecutionWeight, ExtrinsicBaseWeight, WEIGHT_REF_TIME_PER_SECOND}, RuntimeDebug, }; use frame_system::{limits, EnsureRoot}; @@ -162,9 +162,10 @@ pub const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10); /// The ratio that `Normal` extrinsics should occupy. Start from a conservative value. const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(70); /// We allow for 0.5 seconds of compute with a 12 second average block time. -pub const MAXIMUM_BLOCK_WEIGHT: Weight = WEIGHT_PER_SECOND - .saturating_div(2) - .set_proof_size(polkadot_primitives::v2::MAX_POV_SIZE as u64); +pub const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_parts( + WEIGHT_REF_TIME_PER_SECOND.saturating_div(2), + polkadot_primitives::v2::MAX_POV_SIZE as u64, +); const_assert!(NORMAL_DISPATCH_RATIO.deconstruct() >= AVERAGE_ON_INITIALIZE_RATIO.deconstruct()); diff --git a/runtime/common/src/xcm_impl.rs b/runtime/common/src/xcm_impl.rs index 108b90c2ad..1865ebb915 100644 --- a/runtime/common/src/xcm_impl.rs +++ b/runtime/common/src/xcm_impl.rs @@ -19,7 +19,7 @@ //! Common xcm implementation use codec::Encode; -use frame_support::{traits::Get, weights::constants::WEIGHT_PER_SECOND}; +use frame_support::{traits::Get, weights::constants::WEIGHT_REF_TIME_PER_SECOND}; use module_support::BuyWeightRate; use orml_traits::GetByKey; use primitives::{Balance, CurrencyId}; @@ -161,9 +161,9 @@ impl, R: TakeRevenue, M: BuyWeightRate> WeightTrader for Fi log::debug!(target: "xcm::weight", "buy_weight multi_location: {:?}", multi_location); if let Some(ratio) = M::calculate_rate(multi_location.clone()) { - // The WEIGHT_PER_SECOND is non-zero. + // The WEIGHT_REF_TIME_PER_SECOND is non-zero. let weight_ratio = - FixedU128::saturating_from_rational(weight as u128, WEIGHT_PER_SECOND.ref_time() as u128); + FixedU128::saturating_from_rational(weight as u128, WEIGHT_REF_TIME_PER_SECOND as u128); let amount = ratio.saturating_mul_int(weight_ratio.saturating_mul_int(FixedRate::get())); let required = MultiAsset { @@ -197,7 +197,7 @@ impl, R: TakeRevenue, M: BuyWeightRate> WeightTrader for Fi weight, self.weight, self.amount, self.ratio, self.multi_location ); let weight = weight.min(self.weight); - let weight_ratio = FixedU128::saturating_from_rational(weight as u128, WEIGHT_PER_SECOND.ref_time() as u128); + let weight_ratio = FixedU128::saturating_from_rational(weight as u128, WEIGHT_REF_TIME_PER_SECOND as u128); let amount = self .ratio .saturating_mul_int(weight_ratio.saturating_mul_int(FixedRate::get())); @@ -355,11 +355,11 @@ mod tests { let asset: MultiAsset = (Parent, 100).into(); let assets: Assets = asset.into(); let mut trader = >::new(); - let buy_weight = trader.buy_weight(WEIGHT_PER_SECOND.ref_time(), assets.clone()); + let buy_weight = trader.buy_weight(WEIGHT_REF_TIME_PER_SECOND, assets.clone()); assert_noop!(buy_weight, XcmError::TooExpensive); let mut trader = >>::new(); - let buy_weight = trader.buy_weight(WEIGHT_PER_SECOND.ref_time(), assets.clone()); + let buy_weight = trader.buy_weight(WEIGHT_REF_TIME_PER_SECOND, assets.clone()); let asset: MultiAsset = (Parent, 90).into(); let assets: Assets = asset.into(); assert_ok!(buy_weight, assets.clone()); diff --git a/runtime/integration-tests/Cargo.toml b/runtime/integration-tests/Cargo.toml index f217b92bbd..5cae1ebf85 100644 --- a/runtime/integration-tests/Cargo.toml +++ b/runtime/integration-tests/Cargo.toml @@ -13,61 +13,61 @@ hex-literal = { version = "0.3.1" } libsecp256k1 = { version = "0.7" } # substrate -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33"} -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33"} -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", features = ["historical"] } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", features = ["historical"] } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } # cumulus -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } # orml orml-auction = { path = "../../orml/auction" } @@ -124,23 +124,23 @@ ecosystem-renvm-bridge = { path = "../../ecosystem-modules/ren/renvm-bridge" } [dev-dependencies] env_logger = "0.9.0" log = "0.4.17" -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -statemine-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -statemint-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +statemine-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +statemint-runtime = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } -polkadot-runtime-constants = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +polkadot-runtime-constants = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } -xcm-emulator = { git = "https://github.com/shaunxw/xcm-simulator", rev = "c62dbf8e247c03d9797dbf3f1886f74973f2b22a" } +xcm-emulator = { git = "https://github.com/shaunxw/xcm-simulator", rev = "64d8822f6ebc1af50092677a80a9bdb74860e9a9" } acala-service = { path = "../../node/service", features = ["with-all-runtime"] } module-aggregated-dex = { path = "../../modules/aggregated-dex" } diff --git a/runtime/integration-tests/src/authority.rs b/runtime/integration-tests/src/authority.rs index ac773f1e2b..7b800e8c95 100644 --- a/runtime/integration-tests/src/authority.rs +++ b/runtime/integration-tests/src/authority.rs @@ -44,9 +44,7 @@ fn test_authority_module() { ]) .build() .execute_with(|| { - let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block { - ratio: Perbill::from_percent(50), - }); + let ensure_root_call = RuntimeCall::System(frame_system::Call::remark { remark: vec![] }); let call = RuntimeCall::Authority(orml_authority::Call::dispatch_as { as_origin: AuthoritysOriginId::Root, call: Box::new(ensure_root_call.clone()), diff --git a/runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs b/runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs index d92fc4aab1..2c84b40414 100644 --- a/runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs +++ b/runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs @@ -83,7 +83,7 @@ fn transfer_to_relay_chain() { let weight: XcmWeight = 298_368_000; let fee = WeightToFee::weight_to_fee(&Weight::from_ref_time(weight)); - assert_eq!(10_481_299, fee); + assert_eq!(104_571_645, fee); Karura::execute_with(|| { assert_ok!(XTokens::transfer( @@ -950,7 +950,7 @@ fn unspent_xcm_fee_is_returned_correctly() { // Unspent fund from the 1 dollar XCM fee is returned to the sovereign account. assert_eq!( kusama_runtime::Balances::free_balance(¶chain_account.clone()), - 1_000 * dollar_r + 999_637_790_757 + 1_000 * dollar_r + 996_386_247_925 ); }); } @@ -990,7 +990,7 @@ fn trapped_asset() -> MultiAsset { let asset = MultiAsset { id: Concrete(MultiLocation::here()), - fun: Fungibility::Fungible(999_994_348_059), + fun: Fungibility::Fungible(999_943_610_737), }; KusamaNet::execute_with(|| { @@ -1049,7 +1049,7 @@ fn claim_asset(asset: MultiAsset, recipient: [u8; 32]) { #[test] fn claim_trapped_asset_works() { - let claimed_amount = 999_984_441_185u128; + let claimed_amount = 999_844_770_121; let asset = trapped_asset(); claim_asset(asset, BOB.into()); diff --git a/runtime/integration-tests/src/relaychain/mod.rs b/runtime/integration-tests/src/relaychain/mod.rs index 7d87863ca0..790a6c8e6d 100644 --- a/runtime/integration-tests/src/relaychain/mod.rs +++ b/runtime/integration-tests/src/relaychain/mod.rs @@ -35,13 +35,13 @@ pub mod polkadot_test_net; mod statemint; pub use fee_test::{relay_per_second_as_fee, token_per_second_as_fee}; -use frame_support::weights::{constants::WEIGHT_PER_SECOND, Weight}; +use frame_support::weights::{constants::WEIGHT_REF_TIME_PER_SECOND, Weight}; use sp_runtime::{FixedPointNumber, FixedU128}; // N * unit_weight * (weight/10^12) * token_per_second fn weight_calculation(instruction_count: u32, unit_weight: Weight, per_second: u128) -> u128 { let weight = unit_weight.saturating_mul(instruction_count as u64); - let weight_ratio = FixedU128::saturating_from_rational(weight.ref_time(), WEIGHT_PER_SECOND.ref_time()); + let weight_ratio = FixedU128::saturating_from_rational(weight.ref_time(), WEIGHT_REF_TIME_PER_SECOND); weight_ratio.saturating_mul_int(per_second) } @@ -199,12 +199,12 @@ fn weight_to_fee_works() { let weight: Weight = base_weight.saturating_mul(4); let fee = WeightToFee::weight_to_fee(&weight); - assert_eq!(140_515_056, fee); + assert_eq!(1_401_915_012, fee); // transfer_to_relay_chain weight in KusamaNet let weight: Weight = Weight::from_ref_time(298_368_000); let fee = WeightToFee::weight_to_fee(&weight); - assert_eq!(10_481_299, fee); + assert_eq!(104_571_645, fee); } // Polkadot @@ -217,12 +217,12 @@ fn weight_to_fee_works() { let weight: Weight = base_weight.saturating_mul(4); let fee = WeightToFee::weight_to_fee(&weight); - assert_eq!(418_940_288, fee); + assert_eq!(421_434_140, fee); // transfer_to_relay_chain weight in KusamaNet let weight: Weight = Weight::from_ref_time(298_368_000); let fee = WeightToFee::weight_to_fee(&weight); - assert_eq!(31_249_594, fee); + assert_eq!(31_435_615, fee); } // Statemine @@ -234,7 +234,7 @@ fn weight_to_fee_works() { let weight: Weight = base_weight.saturating_mul(4); let fee = WeightToFee::weight_to_fee(&weight); - assert_eq!(13_471_548, fee); + assert_eq!(134_715_512, fee); } // Statemint diff --git a/runtime/integration-tests/src/relaychain/polkadot_cross_chain_transfer.rs b/runtime/integration-tests/src/relaychain/polkadot_cross_chain_transfer.rs index 7564efad25..bf8a931fa7 100644 --- a/runtime/integration-tests/src/relaychain/polkadot_cross_chain_transfer.rs +++ b/runtime/integration-tests/src/relaychain/polkadot_cross_chain_transfer.rs @@ -94,7 +94,9 @@ fn transfer_to_relay_chain() { // v0.9.22: 49_530_582_548 // v0.9.31: 49_573_469_824 // v0.9.33: 49_581_059_712 - 49_581_059_712, + // v0.9.36: 49_591_353_032 + // v0.9.37: 49_578_565_860 + 49_578_565_860, polkadot_runtime::Balances::free_balance(&AccountId::from(BOB)) ); assert_eq!( diff --git a/runtime/integration-tests/src/relaychain/relay_chain.rs b/runtime/integration-tests/src/relaychain/relay_chain.rs index 778d320476..bcb7b8034c 100644 --- a/runtime/integration-tests/src/relaychain/relay_chain.rs +++ b/runtime/integration-tests/src/relaychain/relay_chain.rs @@ -97,7 +97,7 @@ mod karura_tests { // Call withdraw_unbonded as the homa-lite subaccount let xcm_message = KusamaCallBuilder::utility_as_derivative_call(KusamaCallBuilder::staking_withdraw_unbonded(5), 0); - let msg = KusamaCallBuilder::finalize_call_into_xcm_message(xcm_message, 2_000_000_000, 10_000_000_000); + let msg = KusamaCallBuilder::finalize_call_into_xcm_message(xcm_message, 20_000_000_000, 10_000_000_000); // Withdraw unbonded assert_ok!(pallet_xcm::Pallet::::send_xcm(Here, Parent, msg)); @@ -109,7 +109,6 @@ mod karura_tests { 1_001_000_000_000_000 ); - // Transfer fails because liquidity is locked. assert_ok!(kusama_runtime::Balances::transfer( kusama_runtime::RuntimeOrigin::signed(homa_lite_sub_account.clone()), MultiAddress::Id(ALICE.into()), @@ -142,9 +141,9 @@ mod karura_tests { Karura::execute_with(|| { // Transfer all remaining, but leave enough fund to pay for the XCM transaction. - let xcm_message = KusamaCallBuilder::balances_transfer_keep_alive(ALICE.into(), 1_990_000_000_000); + let xcm_message = KusamaCallBuilder::balances_transfer_keep_alive(ALICE.into(), 1_970_000_000_000); - let msg = KusamaCallBuilder::finalize_call_into_xcm_message(xcm_message, 2_000_000_000, 10_000_000_000); + let msg = KusamaCallBuilder::finalize_call_into_xcm_message(xcm_message, 20_000_000_000, 10_000_000_000); // Withdraw unbonded assert_ok!(pallet_xcm::Pallet::::send_xcm(Here, Parent, msg)); @@ -153,12 +152,12 @@ mod karura_tests { KusamaNet::execute_with(|| { assert_eq!( kusama_runtime::Balances::free_balance(AccountId::from(ALICE)), - 2_003_990_000_000_000 + 2_003_970_000_000_000 ); // Only leftover XCM fee remains in the account assert_eq!( kusama_runtime::Balances::free_balance(¶chain_account.clone()), - 9_637_790_757 + 26_386_247_925 ); }); } diff --git a/runtime/integration-tests/src/relaychain/statemine.rs b/runtime/integration-tests/src/relaychain/statemine.rs index 0b4a9c2f6b..a8e471f634 100644 --- a/runtime/integration-tests/src/relaychain/statemine.rs +++ b/runtime/integration-tests/src/relaychain/statemine.rs @@ -32,9 +32,9 @@ use xcm_emulator::TestExt; pub const UNIT: Balance = 1_000_000_000_000; pub const TEN: Balance = 10_000_000_000_000; -pub const FEE_WEIGHT: Balance = 4_000_000_000; -pub const FEE: Balance = 20_000_000; -pub const FEE_STATEMINE: Balance = 4_521_058; +pub const FEE_WEIGHT: Balance = 40_000_000_000; +pub const FEE: Balance = 200_000_000; +pub const FEE_STATEMINE: Balance = 44_754_547; pub const FEE_KUSAMA: Balance = 11_492_737; const ASSET_ID: u32 = 100; @@ -43,7 +43,7 @@ fn init_statemine_xcm_interface() { module_xcm_interface::XcmInterfaceOperation::ParachainFee(Box::new((1, Parachain(1000)).into())); assert_ok!(>::update_xcm_dest_weight_and_fee( RuntimeOrigin::root(), - vec![(xcm_operation.clone(), Some(4_000_000_000), Some(20_000_000),)], + vec![(xcm_operation.clone(), Some(4_000_000_000), Some(200_000_000),)], )); System::assert_has_event(RuntimeEvent::XcmInterface( module_xcm_interface::Event::XcmDestWeightUpdated { @@ -53,7 +53,7 @@ fn init_statemine_xcm_interface() { )); System::assert_has_event(RuntimeEvent::XcmInterface(module_xcm_interface::Event::XcmFeeUpdated { xcm_operation, - new_xcm_dest_weight: 20_000_000, + new_xcm_dest_weight: 200_000_000, })); } @@ -173,7 +173,7 @@ fn karura_transfer_ksm_to_statemine_should_not_allowed() { // source parachain sovereign account withrawn. assert_eq!(UNIT, kusama_runtime::Balances::free_balance(&child_2000)); // destination parachain sovereign account deposited. - assert_eq!(999_973_037_444, kusama_runtime::Balances::free_balance(&child_1000)); + assert_eq!(999_730_995_290, kusama_runtime::Balances::free_balance(&child_1000)); }); // In receiver, xm execution error: UntrustedReserveLocation. @@ -203,7 +203,7 @@ fn karura_transfer_asset_to_statemine_works() { // https://github.com/paritytech/cumulus/pull/1278 support using self sufficient asset // for paying xcm execution fee on Statemine. - assert_eq!(988_088_276_809, Assets::balance(ASSET_ID, &AccountId::from(BOB))); + assert_eq!(988_163_901_882, Assets::balance(ASSET_ID, &AccountId::from(BOB))); }); } @@ -245,7 +245,7 @@ fn karura_statemine_transfer_use_ksm_as_fee() { UNIT + FEE - FEE_STATEMINE, Balances::free_balance(&AccountId::from(BOB)) ); - assert_eq!(1_003_992_573_678, Balances::free_balance(¶_2000)); + assert_eq!(1_039_359_656_150, Balances::free_balance(¶_2000)); }); } @@ -334,7 +334,7 @@ fn statemine_transfer_asset_to_karura() { // We're using force_create here to make sure asset is sufficient. assert_ok!(Assets::force_create( RuntimeOrigin::root(), - ASSET_ID, + ASSET_ID.into(), MultiAddress::Id(ALICE.into()), true, UNIT / 100 @@ -342,7 +342,7 @@ fn statemine_transfer_asset_to_karura() { assert_ok!(Assets::mint( origin.clone(), - ASSET_ID, + ASSET_ID.into(), MultiAddress::Id(ALICE.into()), 1000 * UNIT )); diff --git a/runtime/integration-tests/src/relaychain/statemint.rs b/runtime/integration-tests/src/relaychain/statemint.rs index 0ade2a7107..28752f400c 100644 --- a/runtime/integration-tests/src/relaychain/statemint.rs +++ b/runtime/integration-tests/src/relaychain/statemint.rs @@ -33,7 +33,7 @@ pub const UNIT: Balance = 1_000_000_000_000; pub const TEN: Balance = 10_000_000_000_000; pub const FEE_WEIGHT: Balance = 4_000_000_000; pub const FEE: Balance = 50_000_000; -pub const FEE_STATEMINT: Balance = 10_339_270; +pub const FEE_STATEMINT: Balance = 10_312_677; fn init_statemine_xcm_interface() { let xcm_operation = @@ -132,8 +132,8 @@ fn acala_statemint_transfer_works() { // and withdraw sibling parachain sovereign account assert_eq!(9 * UNIT, Assets::balance(0, ¶_2000)); - assert_eq!(1_000_036_465_466, Balances::free_balance(&AccountId::from(BOB))); - assert_eq!(1_003_533_696_686, Balances::free_balance(¶_2000)); + assert_eq!(10_000_36_577_567, Balances::free_balance(&AccountId::from(BOB))); + assert_eq!(1_003_531_229_427, Balances::free_balance(¶_2000)); }); } @@ -193,7 +193,7 @@ fn statemint_side(para_2000_init_amount: u128) { // create custom asset cost 1 DOT assert_ok!(Assets::create( origin.clone(), - 0, + 0.into(), MultiAddress::Id(ALICE.into()), UNIT / 100 )); @@ -201,7 +201,7 @@ fn statemint_side(para_2000_init_amount: u128) { assert_ok!(Assets::mint( origin.clone(), - 0, + 0.into(), MultiAddress::Id(ALICE.into()), 1000 * UNIT )); diff --git a/runtime/integration-tests/src/weights.rs b/runtime/integration-tests/src/weights.rs index dcd0c352d3..cf07920dc0 100644 --- a/runtime/integration-tests/src/weights.rs +++ b/runtime/integration-tests/src/weights.rs @@ -24,14 +24,14 @@ //! some sort of indicator that calls we consider important (e.g //! Balances::transfer) have not suddenly changed from under us. -use frame_support::weights::{constants::*, Weight}; +use frame_support::weights::constants::*; #[test] fn sanity_check_weight_per_time_constants_are_as_expected() { // These values comes from Substrate, we want to make sure that if it // ever changes we don't accidently break Polkadot - assert_eq!(WEIGHT_PER_SECOND, Weight::from_ref_time(1_000_000_000_000)); - assert_eq!(WEIGHT_PER_MILLIS, WEIGHT_PER_SECOND / 1000); - assert_eq!(WEIGHT_PER_MICROS, WEIGHT_PER_MILLIS / 1000); - assert_eq!(WEIGHT_PER_NANOS, WEIGHT_PER_MICROS / 1000); + assert_eq!(WEIGHT_REF_TIME_PER_SECOND, 1_000_000_000_000); + assert_eq!(WEIGHT_REF_TIME_PER_MILLIS, WEIGHT_REF_TIME_PER_SECOND / 1000); + assert_eq!(WEIGHT_REF_TIME_PER_MICROS, WEIGHT_REF_TIME_PER_MILLIS / 1000); + assert_eq!(WEIGHT_REF_TIME_PER_NANOS, WEIGHT_REF_TIME_PER_MICROS / 1000); } diff --git a/runtime/integration-tests/src/xcm_interface.rs b/runtime/integration-tests/src/xcm_interface.rs index f88ffd3f88..adde2d2068 100644 --- a/runtime/integration-tests/src/xcm_interface.rs +++ b/runtime/integration-tests/src/xcm_interface.rs @@ -32,26 +32,28 @@ use xcm_emulator::TestExt; // Weight and fee cost is related to the XCM_WEIGHT passed in. const XCM_WEIGHT: XcmWeight = 20_000_000_000; const XCM_FEE: Balance = 10_000_000_000; -const ACTUAL_XCM_FEE: Balance = 713_496_883; +const XCM_BOND_FEE: Balance = 7_118_539_605; +const XCM_UNBOND_FEE: Balance = 5_423_483_202; +const XCM_TRANSFER_FEE: Balance = 104_571_645; fn get_xcm_weight() -> Vec<(XcmInterfaceOperation, Option, Option)> { vec![ - // Xcm weight = 400_000_000, fee = ACTUAL_XCM_FEE + // Xcm weight = 400_000_000, fee = XCM_BOND_FEE (XcmInterfaceOperation::XtokensTransfer, Some(XCM_WEIGHT), Some(XCM_FEE)), ( XcmInterfaceOperation::ParachainFee(Box::new((1, Parachain(1000)).into())), Some(XCM_WEIGHT), Some(XCM_FEE), ), - // Xcm weight = 14_000_000_000, fee = ACTUAL_XCM_FEE + // Xcm weight = 14_000_000_000, fee = XCM_BOND_FEE ( XcmInterfaceOperation::HomaWithdrawUnbonded, Some(XCM_WEIGHT), Some(XCM_FEE), ), - // Xcm weight = 14_000_000_000, fee = ACTUAL_XCM_FEE + // Xcm weight = 14_000_000_000, fee = XCM_BOND_FEE (XcmInterfaceOperation::HomaBondExtra, Some(XCM_WEIGHT), Some(XCM_FEE)), - // Xcm weight = 14_000_000_000, fee = ACTUAL_XCM_FEE + // Xcm weight = 14_000_000_000, fee = XCM_BOND_FEE (XcmInterfaceOperation::HomaUnbond, Some(XCM_WEIGHT), Some(XCM_FEE)), ] } @@ -146,12 +148,12 @@ fn xcm_interface_transfer_staking_to_sub_account_works() { // 1000 dollars (minus fee) are transferred into the Kusama chain assert_eq!( kusama_runtime::Balances::free_balance(&homa_lite_sub_account), - 999_999_989_518_701 + 999_999_895_428_355 ); // XCM fee is paid by the parachain account. assert_eq!( kusama_runtime::Balances::free_balance(¶chain_account), - 1003 * dollar(RELAY_CHAIN_CURRENCY) - ACTUAL_XCM_FEE + 1003 * dollar(RELAY_CHAIN_CURRENCY) - XCM_BOND_FEE ); }); } @@ -247,7 +249,7 @@ fn xcm_interface_withdraw_unbonded_from_sub_account_works() { // Final parachain balance is: unbond_withdrew($1000) + initial_endowment($2) - xcm_fee assert_eq!( kusama_runtime::Balances::free_balance(¶chain_account.clone()), - 1002 * dollar(RELAY_CHAIN_CURRENCY) - ACTUAL_XCM_FEE + 1002 * dollar(RELAY_CHAIN_CURRENCY) - XCM_BOND_FEE ); }); } @@ -267,6 +269,22 @@ fn xcm_interface_bond_extra_on_sub_account_works() { 1_001 * dollar(RELAY_CHAIN_CURRENCY) )); + // Transfer some KSM into the parachain. + assert_ok!(kusama_runtime::XcmPallet::reserve_transfer_assets( + kusama_runtime::RuntimeOrigin::signed(ALICE.into()), + Box::new(Parachain(2000).into().into()), + Box::new( + Junction::AccountId32 { + id: alice().into(), + network: NetworkId::Any + } + .into() + .into() + ), + Box::new((Here, 1_000 * dollar(RELAY_CHAIN_CURRENCY)).into()), + 0 + )); + // Bond some money assert_ok!(kusama_runtime::Staking::bond( kusama_runtime::RuntimeOrigin::signed(homa_lite_sub_account.clone()), @@ -292,7 +310,7 @@ fn xcm_interface_bond_extra_on_sub_account_works() { ); assert_eq!( kusama_runtime::Balances::free_balance(¶chain_account), - 2 * dollar(RELAY_CHAIN_CURRENCY) + 1002 * dollar(RELAY_CHAIN_CURRENCY) ); }); @@ -328,12 +346,12 @@ fn xcm_interface_bond_extra_on_sub_account_works() { ); assert_eq!( kusama_runtime::Balances::free_balance(&homa_lite_sub_account), - 1001 * dollar(RELAY_CHAIN_CURRENCY) + 1501 * dollar(RELAY_CHAIN_CURRENCY) - XCM_TRANSFER_FEE ); // XCM fee is paid by the sovereign account. assert_eq!( kusama_runtime::Balances::free_balance(¶chain_account), - 2 * dollar(RELAY_CHAIN_CURRENCY) - ACTUAL_XCM_FEE + 502 * dollar(RELAY_CHAIN_CURRENCY) - XCM_BOND_FEE ); }); } @@ -353,6 +371,22 @@ fn xcm_interface_unbond_on_sub_account_works() { 1_001 * dollar(RELAY_CHAIN_CURRENCY) )); + // Transfer some KSM into the parachain. + assert_ok!(kusama_runtime::XcmPallet::reserve_transfer_assets( + kusama_runtime::RuntimeOrigin::signed(ALICE.into()), + Box::new(Parachain(2000).into().into()), + Box::new( + Junction::AccountId32 { + id: alice().into(), + network: NetworkId::Any + } + .into() + .into() + ), + Box::new((Here, 1_000 * dollar(RELAY_CHAIN_CURRENCY)).into()), + 0 + )); + // Bond some tokens. assert_ok!(kusama_runtime::Staking::bond( kusama_runtime::RuntimeOrigin::signed(homa_lite_sub_account.clone()), @@ -378,7 +412,7 @@ fn xcm_interface_unbond_on_sub_account_works() { ); assert_eq!( kusama_runtime::Balances::free_balance(¶chain_account), - 2 * dollar(RELAY_CHAIN_CURRENCY) + 1_002 * dollar(RELAY_CHAIN_CURRENCY) ); }); @@ -399,6 +433,7 @@ fn xcm_interface_unbond_on_sub_account_works() { RuntimeOrigin::signed(bob()), 1_000 * dollar(RELAY_CHAIN_CURRENCY), )); + // Update internal storage in Homa assert_ok!(Homa::bump_current_era(1)); @@ -415,18 +450,18 @@ fn xcm_interface_unbond_on_sub_account_works() { KusamaNet::execute_with(|| { // Ensure the correct amount of fund is unbonded let ledger = kusama_runtime::Staking::ledger(&homa_lite_sub_account).expect("record should exist"); - assert_eq!(ledger.total, 1001 * dollar(RELAY_CHAIN_CURRENCY) - XCM_FEE); - assert_eq!(ledger.active, dollar(RELAY_CHAIN_CURRENCY)); + assert_eq!(ledger.total, 1_001 * dollar(RELAY_CHAIN_CURRENCY) - XCM_FEE); + assert_eq!(ledger.active, 1 * dollar(RELAY_CHAIN_CURRENCY)); assert_eq!( kusama_runtime::Balances::free_balance(&homa_lite_sub_account), - 1_001 * dollar(RELAY_CHAIN_CURRENCY) + 2_001 * dollar(RELAY_CHAIN_CURRENCY) - XCM_TRANSFER_FEE ); // 2 x XCM fee is paid: for Mint and Redeem assert_eq!( kusama_runtime::Balances::free_balance(¶chain_account), - 2 * dollar(RELAY_CHAIN_CURRENCY) - ACTUAL_XCM_FEE * 2 + 2 * dollar(RELAY_CHAIN_CURRENCY) - XCM_BOND_FEE - XCM_UNBOND_FEE ); }); } @@ -541,10 +576,10 @@ fn homa_mint_and_redeem_works() { assert_eq!(ledger.total, 2001 * dollar(RELAY_CHAIN_CURRENCY) - XCM_FEE); assert_eq!(ledger.active, 2001 * dollar(RELAY_CHAIN_CURRENCY) - XCM_FEE); - // 2 x XCM fee is paid: for Mint and Redeem + // XCM fee is paid: for Mint assert_eq!( kusama_runtime::Balances::free_balance(¶chain_account), - 3 * dollar(RELAY_CHAIN_CURRENCY) - ACTUAL_XCM_FEE + 3 * dollar(RELAY_CHAIN_CURRENCY) - XCM_BOND_FEE ); }); diff --git a/runtime/karura/Cargo.toml b/runtime/karura/Cargo.toml index e5a5a72c5f..beeda2d467 100644 --- a/runtime/karura/Cargo.toml +++ b/runtime/karura/Cargo.toml @@ -14,62 +14,62 @@ hex = { version = "0.4", default-features = false } hex-literal = { version = "0.3.1" } # substrate -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, optional = true } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false} -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false} -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features =false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, features = ["historical"] } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, optional = true } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false} +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false} +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features =false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, features = ["historical"] } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } # cumulus -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } # orml orml-auction = { path = "../../orml/auction", default-features = false } @@ -126,15 +126,15 @@ nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path = # benchmarking deps libsecp256k1 = { version = "0.7", default-features = false, optional = true } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, optional = true } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, optional = true } -pallet-bags-list = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, optional = true } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, optional = true } +pallet-bags-list = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, optional = true } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } [features] default = ["std"] @@ -381,6 +381,8 @@ try-runtime = [ "module-transaction-payment/try-runtime", "module-xcm-interface/try-runtime", + "primitives/try-runtime", + "nutsfinance-stable-asset/try-runtime", ] # By default some types have documentation, `no-metadata-docs` allows to reduce the documentation diff --git a/runtime/karura/src/constants.rs b/runtime/karura/src/constants.rs index b870ae3ce0..b20491f322 100644 --- a/runtime/karura/src/constants.rs +++ b/runtime/karura/src/constants.rs @@ -41,7 +41,7 @@ pub mod time { /// Fee-related pub mod fee { use frame_support::weights::{ - constants::{ExtrinsicBaseWeight, WEIGHT_PER_SECOND}, + constants::{ExtrinsicBaseWeight, WEIGHT_REF_TIME_PER_SECOND}, WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial, }; use primitives::Balance; @@ -82,7 +82,7 @@ pub mod fee { pub fn kar_per_second() -> u128 { let base_weight = Balance::from(ExtrinsicBaseWeight::get().ref_time()); - let base_tx_per_second = (WEIGHT_PER_SECOND.ref_time() as u128) / base_weight; + let base_tx_per_second = (WEIGHT_REF_TIME_PER_SECOND as u128) / base_weight; base_tx_per_second * base_tx_in_kar() } diff --git a/runtime/karura/src/lib.rs b/runtime/karura/src/lib.rs index c82033ea3d..59be0e38c8 100644 --- a/runtime/karura/src/lib.rs +++ b/runtime/karura/src/lib.rs @@ -1796,8 +1796,17 @@ pub type SignedPayload = generic::SignedPayload; /// Extrinsic type that has already been checked. pub type CheckedExtrinsic = generic::CheckedExtrinsic; /// Executive: handles dispatch to the various modules. -pub type Executive = - frame_executive::Executive, Runtime, AllPalletsWithSystem, ()>; +pub type Executive = frame_executive::Executive< + Runtime, + Block, + frame_system::ChainContext, + Runtime, + AllPalletsWithSystem, + ( + pallet_balances::migration::MigrateToTrackInactive, + pallet_scheduler::migration::v4::CleanupAgendas, + ), +>; #[cfg(feature = "runtime-benchmarks")] #[macro_use] @@ -2064,25 +2073,27 @@ impl_runtime_apis! { #[cfg(feature = "try-runtime")] impl frame_try_runtime::TryRuntime for Runtime { - fn on_runtime_upgrade() -> (Weight, Weight) { + fn on_runtime_upgrade(checks: frame_try_runtime::UpgradeCheckSelect) -> (Weight, Weight) { log::info!("try-runtime::on_runtime_upgrade"); - let weight = Executive::try_runtime_upgrade().unwrap(); + let weight = Executive::try_runtime_upgrade(checks).unwrap(); (weight, RuntimeBlockWeights::get().max_block) } fn execute_block( block: Block, state_root_check: bool, + signature_check: bool, select: frame_try_runtime::TryStateSelect ) -> Weight { log::info!( target: "node-runtime", - "try-runtime: executing block {:?} / root checks: {:?} / try-state-select: {:?}", + "try-runtime: executing block {:?} / root checks: {:?} / signature check: {:?} / try-state-select: {:?}", block.header.hash(), state_root_check, + signature_check, select, ); - Executive::try_execute_block(block, state_root_check, select).expect("try_execute_block failed") + Executive::try_execute_block(block, state_root_check, signature_check, select).expect("try_execute_block failed") } } diff --git a/runtime/karura/src/xcm_config.rs b/runtime/karura/src/xcm_config.rs index 82e0c82fce..471ba112a6 100644 --- a/runtime/karura/src/xcm_config.rs +++ b/runtime/karura/src/xcm_config.rs @@ -55,6 +55,7 @@ parameter_types! { pub const RelayNetwork: NetworkId = NetworkId::Kusama; pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into(); pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into(); + pub CheckingAccount: AccountId = PolkadotXcm::check_account(); } /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used diff --git a/runtime/mandala/Cargo.toml b/runtime/mandala/Cargo.toml index 82c753e973..88e493eb91 100644 --- a/runtime/mandala/Cargo.toml +++ b/runtime/mandala/Cargo.toml @@ -14,65 +14,66 @@ hex = { version = "0.4", default-features = false } hex-literal = { version = "0.3.1" } # substrate -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, optional = true } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false} -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false} -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features =false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, features = ["historical"] } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, optional = true } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false} +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false} +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features =false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-root-testing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, features = ["historical"] } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false } # cumulus -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } # polkadot -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37", default-features = false } # orml orml-auction = { path = "../../orml/auction", default-features = false } @@ -133,19 +134,19 @@ nutsfinance-stable-asset = { version = "0.1.0", default-features = false, path = # benchmarking deps libsecp256k1 = { version = "0.7", default-features = false, optional = true } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, optional = true } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, optional = true } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37", default-features = false, optional = true } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.33" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } acala-service = { path = "../../node/service", features = ["with-mandala-runtime"] } @@ -417,6 +418,8 @@ try-runtime = [ "module-transaction-payment/try-runtime", "module-xcm-interface/try-runtime", + "primitives/try-runtime", + "ecosystem-renvm-bridge/try-runtime", "nutsfinance-stable-asset/try-runtime", ] diff --git a/runtime/mandala/src/benchmarking/authority.rs b/runtime/mandala/src/benchmarking/authority.rs index ba0c7f15fa..bb82201f6a 100644 --- a/runtime/mandala/src/benchmarking/authority.rs +++ b/runtime/mandala/src/benchmarking/authority.rs @@ -18,7 +18,7 @@ use crate::{AccountId, Authority, AuthoritysOriginId, BlockNumber, Runtime, RuntimeCall, RuntimeOrigin, System}; -use sp_runtime::{traits::Hash, Perbill}; +use sp_runtime::traits::Hash; use sp_std::prelude::*; use frame_support::{ @@ -33,12 +33,12 @@ runtime_benchmarks! { // dispatch a dispatchable as other origin dispatch_as { - let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block { ratio: Perbill::from_percent(1) }); + let ensure_root_call = RuntimeCall::System(frame_system::Call::remark { remark: vec![] }); }: _(RawOrigin::Root, AuthoritysOriginId::Root, Box::new(ensure_root_call.clone())) // schdule a dispatchable to be dispatched at later block. schedule_dispatch_without_delay { - let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block { ratio: Perbill::from_percent(1) }); + let ensure_root_call = RuntimeCall::System(frame_system::Call::remark { remark: vec![] }); let call = RuntimeCall::Authority(orml_authority::Call::dispatch_as { as_origin: AuthoritysOriginId::Root, call: Box::new(ensure_root_call.clone()), @@ -48,7 +48,7 @@ runtime_benchmarks! { // schdule a dispatchable to be dispatched at later block. // ensure that the delay is reached when scheduling schedule_dispatch_with_delay { - let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block { ratio: Perbill::from_percent(1) }); + let ensure_root_call = RuntimeCall::System(frame_system::Call::remark { remark: vec![] }); let call = RuntimeCall::Authority(orml_authority::Call::dispatch_as { as_origin: AuthoritysOriginId::Root, call: Box::new(ensure_root_call.clone()), @@ -57,7 +57,7 @@ runtime_benchmarks! { // fast track a scheduled dispatchable. fast_track_scheduled_dispatch { - let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block { ratio: Perbill::from_percent(1) }); + let ensure_root_call = RuntimeCall::System(frame_system::Call::remark { remark: vec![] }); let call = RuntimeCall::Authority(orml_authority::Call::dispatch_as { as_origin: AuthoritysOriginId::Root, call: Box::new(ensure_root_call.clone()), @@ -85,7 +85,7 @@ runtime_benchmarks! { // delay a scheduled dispatchable. delay_scheduled_dispatch { - let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block { ratio: Perbill::from_percent(1) }); + let ensure_root_call = RuntimeCall::System(frame_system::Call::remark { remark: vec![] }); let call = RuntimeCall::Authority(orml_authority::Call::dispatch_as { as_origin: AuthoritysOriginId::Root, call: Box::new(ensure_root_call.clone()), @@ -113,7 +113,7 @@ runtime_benchmarks! { // cancel a scheduled dispatchable cancel_scheduled_dispatch { - let ensure_root_call = RuntimeCall::System(frame_system::Call::fill_block { ratio: Perbill::from_percent(1) }); + let ensure_root_call = RuntimeCall::System(frame_system::Call::remark { remark: vec![] }); let call = RuntimeCall::Authority(orml_authority::Call::dispatch_as { as_origin: AuthoritysOriginId::Root, call: Box::new(ensure_root_call.clone()), @@ -142,7 +142,7 @@ runtime_benchmarks! { // authorize a call that can be triggered later authorize_call { let caller: AccountId = whitelisted_caller(); - let call = RuntimeCall::System(frame_system::Call::fill_block { ratio: Perbill::from_percent(1) }); + let call = RuntimeCall::System(frame_system::Call::remark { remark: vec![] }); let hash = ::Hashing::hash_of(&call); System::set_block_number(1u32); }: _(RawOrigin::Root, Box::new(call.clone()), Some(caller.clone())) @@ -152,7 +152,7 @@ runtime_benchmarks! { remove_authorized_call { let caller: AccountId = whitelisted_caller(); - let call = RuntimeCall::System(frame_system::Call::fill_block { ratio: Perbill::from_percent(1) }); + let call = RuntimeCall::System(frame_system::Call::remark { remark: vec![] }); let hash = ::Hashing::hash_of(&call); System::set_block_number(1u32); Authority::authorize_call(RuntimeOrigin::root(), Box::new(call.clone()), Some(caller.clone()))?; @@ -163,7 +163,7 @@ runtime_benchmarks! { trigger_call { let caller: AccountId = whitelisted_caller(); - let call = RuntimeCall::System(frame_system::Call::fill_block { ratio: Perbill::from_percent(1) }); + let call = RuntimeCall::System(frame_system::Call::remark { remark: vec![] }); let hash = ::Hashing::hash_of(&call); let call_weight_bound = call.get_dispatch_info().weight; System::set_block_number(1u32); diff --git a/runtime/mandala/src/constants.rs b/runtime/mandala/src/constants.rs index dd117ef729..3b10da8424 100644 --- a/runtime/mandala/src/constants.rs +++ b/runtime/mandala/src/constants.rs @@ -41,7 +41,7 @@ pub mod time { /// Fee-related pub mod fee { use frame_support::weights::{ - constants::{ExtrinsicBaseWeight, WEIGHT_PER_SECOND}, + constants::{ExtrinsicBaseWeight, WEIGHT_REF_TIME_PER_SECOND}, WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial, }; use primitives::Balance; @@ -82,7 +82,7 @@ pub mod fee { pub fn aca_per_second() -> u128 { let base_weight = Balance::from(ExtrinsicBaseWeight::get().ref_time()); - let base_tx_per_second = (WEIGHT_PER_SECOND.ref_time() as u128) / base_weight; + let base_tx_per_second = (WEIGHT_REF_TIME_PER_SECOND as u128) / base_weight; base_tx_per_second * base_tx_in_aca() } diff --git a/runtime/mandala/src/lib.rs b/runtime/mandala/src/lib.rs index 18d3332727..aba4f2c447 100644 --- a/runtime/mandala/src/lib.rs +++ b/runtime/mandala/src/lib.rs @@ -44,7 +44,7 @@ pub use frame_support::{ U128CurrencyToVote, WithdrawReasons, }, weights::{ - constants::{BlockExecutionWeight, RocksDbWeight, WEIGHT_PER_SECOND}, + constants::{BlockExecutionWeight, RocksDbWeight, WEIGHT_REF_TIME_PER_SECOND}, IdentityFee, Weight, }, PalletId, RuntimeDebug, StorageValue, @@ -1897,8 +1897,17 @@ pub type SignedPayload = generic::SignedPayload; /// Extrinsic type that has already been checked. pub type CheckedExtrinsic = generic::CheckedExtrinsic; /// Executive: handles dispatch to the various modules. -pub type Executive = - frame_executive::Executive, Runtime, AllPalletsWithSystem, ()>; +pub type Executive = frame_executive::Executive< + Runtime, + Block, + frame_system::ChainContext, + Runtime, + AllPalletsWithSystem, + ( + pallet_balances::migration::MigrateToTrackInactive, + pallet_scheduler::migration::v4::CleanupAgendas, + ), +>; construct_runtime!( pub enum Runtime where @@ -2292,25 +2301,27 @@ impl_runtime_apis! { #[cfg(feature = "try-runtime")] impl frame_try_runtime::TryRuntime for Runtime { - fn on_runtime_upgrade() -> (Weight, Weight) { + fn on_runtime_upgrade(checks: frame_try_runtime::UpgradeCheckSelect) -> (Weight, Weight) { log::info!("try-runtime::on_runtime_upgrade"); - let weight = Executive::try_runtime_upgrade().unwrap(); + let weight = Executive::try_runtime_upgrade(checks).unwrap(); (weight, RuntimeBlockWeights::get().max_block) } fn execute_block( block: Block, state_root_check: bool, + signature_check: bool, select: frame_try_runtime::TryStateSelect ) -> Weight { log::info!( target: "node-runtime", - "try-runtime: executing block {:?} / root checks: {:?} / try-state-select: {:?}", + "try-runtime: executing block {:?} / root checks: {:?} / signature check: {:?} / try-state-select: {:?}", block.header.hash(), state_root_check, + signature_check, select, ); - Executive::try_execute_block(block, state_root_check, select).expect("try_execute_block failed") + Executive::try_execute_block(block, state_root_check, signature_check, select).expect("try_execute_block failed") } } diff --git a/runtime/mandala/src/xcm_config.rs b/runtime/mandala/src/xcm_config.rs index fb3b21ba36..cc742dfc65 100644 --- a/runtime/mandala/src/xcm_config.rs +++ b/runtime/mandala/src/xcm_config.rs @@ -53,6 +53,7 @@ parameter_types! { pub const RelayNetwork: NetworkId = NetworkId::Polkadot; pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into(); pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into(); + pub CheckingAccount: AccountId = PolkadotXcm::check_account(); } /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used diff --git a/scripts/Dockerfile b/scripts/Dockerfile index 9abb835765..ed45846155 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -1,8 +1,8 @@ FROM rust:buster as builder WORKDIR /app -RUN rustup default nightly-2022-08-05 && \ - rustup target add wasm32-unknown-unknown --toolchain nightly-2022-08-05 +RUN rustup default nightly-2022-10-30 && \ + rustup target add wasm32-unknown-unknown --toolchain nightly-2022-10-30 RUN apt-get update && \ apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \ diff --git a/scripts/init.sh b/scripts/init.sh index 117b467341..04ba04880a 100755 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -4,6 +4,6 @@ set -e echo "*** Initializing WASM build environment" -rustup default nightly-2022-08-05 +rustup default nightly-2022-10-30 -rustup target add wasm32-unknown-unknown --toolchain nightly-2022-08-05 +rustup target add wasm32-unknown-unknown --toolchain nightly-2022-10-30 diff --git a/scripts/profiling/Dockerfile b/scripts/profiling/Dockerfile index d4639702e0..65d1dfe477 100644 --- a/scripts/profiling/Dockerfile +++ b/scripts/profiling/Dockerfile @@ -1,8 +1,8 @@ FROM rust:buster as builder WORKDIR /app -RUN rustup default nightly-2022-08-05 && \ - rustup target add wasm32-unknown-unknown --toolchain nightly-2022-08-05 +RUN rustup default nightly-2022-10-30 && \ + rustup target add wasm32-unknown-unknown --toolchain nightly-2022-10-30 RUN apt-get update && \ apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \