From 3c717473946730db5c4d54a27915617927092956 Mon Sep 17 00:00:00 2001 From: jasl Date: Sat, 13 May 2023 08:08:02 +0800 Subject: [PATCH] Upgrade to Polkadot v0.9.42 --- Cargo.lock | 1520 ++++++++++------- crates/phala-mq/Cargo.toml | 2 +- crates/phala-node-rpc-ext/Cargo.toml | 12 +- crates/phala-pallet-common/Cargo.toml | 28 +- crates/phala-serde-more/Cargo.toml | 2 +- crates/phala-trie-storage/Cargo.toml | 10 +- crates/phala-types/Cargo.toml | 2 +- node/Cargo.toml | 118 +- node/src/service/mod.rs | 32 +- node/src/service/shell.rs | 12 +- pallets/assets-registry/Cargo.toml | 81 +- pallets/assets-registry/src/lib.rs | 32 +- pallets/assets-registry/src/mock.rs | 4 + pallets/index/Cargo.toml | 43 +- pallets/index/src/lib.rs | 10 +- pallets/index/src/mock.rs | 4 + pallets/parachain-info/Cargo.toml | 6 +- pallets/phala-world/Cargo.toml | 32 +- pallets/phala-world/src/incubation.rs | 8 +- pallets/phala-world/src/marketplace.rs | 4 +- pallets/phala-world/src/mock.rs | 4 + pallets/phala-world/src/nft_sale.rs | 22 +- pallets/phala-world/src/tests.rs | 4 +- pallets/phala/Cargo.toml | 42 +- pallets/phala/mq-runtime-api/Cargo.toml | 2 +- pallets/phala/src/compute/base_pool.rs | 21 +- pallets/phala/src/compute/computation.rs | 18 +- pallets/phala/src/compute/stake_pool_v2.rs | 51 +- pallets/phala/src/compute/vault.rs | 16 +- pallets/phala/src/compute/wrapped_balances.rs | 23 +- pallets/phala/src/mock.rs | 4 + pallets/phala/src/ott.rs | 2 +- pallets/phala/src/phat.rs | 18 +- pallets/phala/src/phat_tokenomic.rs | 2 +- ...ests__can_restake_without_any_changes.snap | 2 - ...omic__tests__should_be_happy_to_stake.snap | 2 - pallets/phala/src/phat_tokenomic/tests.rs | 4 +- .../phala/src/phat_tokenomic/tests/mock.rs | 4 + pallets/phala/src/registry.rs | 18 +- pallets/phala/src/test.rs | 3 +- pallets/subbridge/Cargo.toml | 84 +- pallets/subbridge/src/chainbridge.rs | 18 +- pallets/subbridge/src/mock/para.rs | 4 + pallets/subbridge/src/mock/relay.rs | 5 + pallets/subbridge/src/xtransfer.rs | 4 +- parachains-common/Cargo.toml | 40 +- parachains-common/src/impls.rs | 16 +- parachains-common/src/xcm_config.rs | 20 +- polkadot/node/service/Cargo.toml | 202 +-- polkadot/node/service/chain-specs/kusama.json | 4 +- .../node/service/chain-specs/polkadot.json | 4 +- polkadot/node/service/chain-specs/rococo.json | 26 +- .../node/service/chain-specs/westend.json | 4 +- polkadot/node/service/src/chain_spec.rs | 18 +- polkadot/node/service/src/grandpa_support.rs | 2 +- polkadot/node/service/src/lib.rs | 60 +- polkadot/node/service/src/overseer.rs | 2 +- .../node/service/src/parachains_db/mod.rs | 2 +- .../node/service/src/parachains_db/upgrade.rs | 2 +- .../node/service/src/relay_chain_selection.rs | 53 +- polkadot/node/service/src/tests.rs | 25 +- runtime/khala/Cargo.toml | 140 +- runtime/khala/src/lib.rs | 16 + runtime/khala/src/weights/pallet_xcm.rs | 150 +- runtime/phala/Cargo.toml | 140 +- runtime/phala/src/lib.rs | 16 + runtime/phala/src/weights/pallet_xcm.rs | 150 +- runtime/rhala/Cargo.toml | 152 +- runtime/rhala/src/lib.rs | 20 + runtime/rhala/src/weights/pallet_xcm.rs | 150 +- runtime/shell/Cargo.toml | 56 +- runtime/shell/src/lib.rs | 19 +- runtime/shell/src/weights/pallet_xcm.rs | 150 +- runtime/shell/src/xcm_config.rs | 2 + runtime/thala/Cargo.toml | 150 +- runtime/thala/src/lib.rs | 20 + runtime/thala/src/weights/pallet_xcm.rs | 150 +- 77 files changed, 2429 insertions(+), 1871 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f2e7c5fb..cf8142ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -205,42 +205,51 @@ dependencies = [ [[package]] name = "anstream" -version = "0.2.6" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" dependencies = [ "anstyle", "anstyle-parse", + "anstyle-query", "anstyle-wincon", - "concolor-override", - "concolor-query", + "colorchoice", "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "0.3.5" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" [[package]] name = "anstyle-parse" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" dependencies = [ "utf8parse", ] +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + [[package]] name = "anstyle-wincon" -version = "0.2.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" dependencies = [ "anstyle", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -388,7 +397,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "hex-literal", + "hex-literal 0.4.1", "log", "pallet-assets", "pallet-balances", @@ -456,6 +465,17 @@ dependencies = [ "futures-lite", ] +[[package]] +name = "async-recursion" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + [[package]] name = "async-trait" version = "0.1.68" @@ -464,7 +484,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.12", + "syn 2.0.15", ] [[package]] @@ -537,10 +557,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" [[package]] -name = "base58" +name = "base16ct" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base64" @@ -581,7 +601,7 @@ dependencies = [ [[package]] name = "binary-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "hash-db", "log", @@ -856,9 +876,9 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.15.3" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a1ec454bc3eead8719cb56e15dbbfecdbc14e4b3a3ae4936cc6e31f5fc0d07" +checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", @@ -1021,9 +1041,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.2.1" +version = "4.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" +checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" dependencies = [ "clap_builder", "clap_derive", @@ -1032,9 +1052,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.2.1" +version = "4.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" +checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" dependencies = [ "anstream", "anstyle", @@ -1052,7 +1072,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.12", + "syn 2.0.15", ] [[package]] @@ -1083,6 +1103,12 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + [[package]] name = "comfy-table" version = "6.1.4" @@ -1094,21 +1120,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "concolor-override" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" - -[[package]] -name = "concolor-query" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" -dependencies = [ - "windows-sys 0.45.0", -] - [[package]] name = "concurrent-queue" version = "2.1.0" @@ -1203,18 +1214,18 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.93.1" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7379abaacee0f14abf3204a7606118f0465785252169d186337bcb75030815a" +checksum = "2bc42ba2e232e5b20ff7dc299a812d53337dadce9a7e39a238e6a5cb82d2e57b" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.93.1" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9489fa336927df749631f1008007ced2871068544f40a202ce6d93fbf2366a7b" +checksum = "253531aca9b6f56103c9420369db3263e784df39aa1c90685a1f69cfbba0623e" dependencies = [ "arrayvec 0.7.2", "bumpalo", @@ -1233,33 +1244,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.93.1" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05bbb67da91ec721ed57cef2f7c5ef7728e1cd9bde9ffd3ef8601022e73e3239" +checksum = "72f2154365e2bff1b1b8537a7181591fdff50d8e27fa6e40d5c69c3bad0ca7c8" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.93.1" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418ecb2f36032f6665dc1a5e2060a143dbab41d83b784882e97710e890a7a16d" +checksum = "687e14e3f5775248930e0d5a84195abef8b829958e9794bf8d525104993612b4" [[package]] name = "cranelift-entity" -version = "0.93.1" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cf583f7b093f291005f9fb1323e2c37f6ee4c7909e39ce016b2e8360d461705" +checksum = "f42ea692c7b450ad18b8c9889661505d51c09ec4380cf1c2d278dbb2da22cae1" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.93.1" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b66bf9e916f57fbbd0f7703ec6286f4624866bf45000111627c70d272c8dda1" +checksum = "8483c2db6f45fe9ace984e5adc5d058102227e4c62e5aa2054e16b0275fd3a6e" dependencies = [ "cranelift-codegen", "log", @@ -1269,15 +1280,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.93.1" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "649782a39ce99798dd6b4029e2bb318a2fbeaade1b4fa25330763c10c65bc358" +checksum = "e9793158837678902446c411741d87b43f57dadfb944f2440db4287cda8cbd59" [[package]] name = "cranelift-native" -version = "0.93.1" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "937e021e089c51f9749d09e7ad1c4f255c2f8686cb8c3df63a34b3ec9921bc41" +checksum = "72668c7755f2b880665cb422c8ad2d56db58a88b9bebfef0b73edc2277c13c49" dependencies = [ "cranelift-codegen", "libc", @@ -1286,9 +1297,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.93.1" +version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d850cf6775477747c9dfda9ae23355dd70512ffebc70cf82b85a5b111ae668b5" +checksum = "3852ce4b088b44ac4e29459573943009a70d1b192c8d77ef949b4e814f656fc1" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1395,6 +1406,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "crypto-bigint" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" +dependencies = [ + "generic-array 0.14.6", + "rand_core 0.6.4", + "subtle", + "zeroize", +] + [[package]] name = "crypto-common" version = "0.1.6" @@ -1457,7 +1480,7 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "clap", "parity-scale-codec", @@ -1472,7 +1495,7 @@ dependencies = [ [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", @@ -1495,7 +1518,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -1524,7 +1547,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "async-trait", "cumulus-client-pov-recovery", @@ -1548,7 +1571,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-relay-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -1571,7 +1594,7 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "async-trait", "cumulus-relay-chain-interface", @@ -1594,7 +1617,7 @@ dependencies = [ [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -1618,7 +1641,7 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", @@ -1653,7 +1676,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "frame-support", "frame-system", @@ -1669,7 +1692,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1686,7 +1709,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "bytes", "cumulus-pallet-parachain-system-proc-macro", @@ -1715,18 +1738,18 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] name = "cumulus-pallet-session-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "frame-benchmarking", "frame-support", @@ -1740,7 +1763,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1756,7 +1779,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1776,12 +1799,13 @@ dependencies = [ [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", + "scale-info", "sp-api", "sp-runtime", "sp-std", @@ -1792,7 +1816,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -1815,7 +1839,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "cumulus-primitives-core", "futures", @@ -1828,7 +1852,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1846,7 +1870,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-inprocess-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -1871,7 +1895,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -1889,7 +1913,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-minimal-node" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "array-bytes 6.0.0", "async-trait", @@ -1898,13 +1922,16 @@ dependencies = [ "cumulus-relay-chain-rpc-interface", "futures", "lru 0.9.0", + "polkadot-availability-recovery", + "polkadot-collator-protocol", "polkadot-core-primitives", "polkadot-network-bridge", + "polkadot-node-collation-generation", + "polkadot-node-core-runtime-api", "polkadot-node-network-protocol", "polkadot-node-subsystem-util", "polkadot-overseer", "polkadot-primitives", - "polkadot-service", "sc-authority-discovery", "sc-client-api", "sc-network", @@ -1924,7 +1951,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-rpc-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -1954,7 +1981,7 @@ dependencies = [ [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", @@ -1992,9 +2019,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-rc.0" +version = "4.0.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da00a7a9a4eb92a0a0f8e75660926d48f0d0f3c537e455c457bcdaa1e16b1ac" +checksum = "8d4ba9852b42210c7538b75484f9daa0655e9a3ac04f693747bb0f02cf3cfe16" dependencies = [ "cfg-if", "fiat-crypto", @@ -2120,6 +2147,16 @@ dependencies = [ "zeroize", ] +[[package]] +name = "der" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05e58dffcdcc8ee7b22f0c1f71a69243d7c2d9ad87b5a14361f2424a1565c219" +dependencies = [ + "const-oid", + "zeroize", +] + [[package]] name = "der-parser" version = "7.0.0" @@ -2251,6 +2288,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer 0.10.3", + "const-oid", "crypto-common", "subtle", ] @@ -2364,10 +2402,24 @@ version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" dependencies = [ - "der", - "elliptic-curve", - "rfc6979", - "signature", + "der 0.6.1", + "elliptic-curve 0.12.3", + "rfc6979 0.3.1", + "signature 1.6.4", +] + +[[package]] +name = "ecdsa" +version = "0.16.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428" +dependencies = [ + "der 0.7.5", + "digest 0.10.6", + "elliptic-curve 0.13.4", + "rfc6979 0.4.0", + "signature 2.1.0", + "spki 0.7.2", ] [[package]] @@ -2376,7 +2428,7 @@ version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ - "signature", + "signature 1.6.4", ] [[package]] @@ -2419,18 +2471,37 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ - "base16ct", - "crypto-bigint", - "der", + "base16ct 0.1.1", + "crypto-bigint 0.4.9", + "der 0.6.1", "digest 0.10.6", - "ff", + "ff 0.12.1", "generic-array 0.14.6", - "group", + "group 0.12.1", "hkdf", "pem-rfc7468", - "pkcs8", + "pkcs8 0.9.0", "rand_core 0.6.4", - "sec1", + "sec1 0.3.0", + "subtle", + "zeroize", +] + +[[package]] +name = "elliptic-curve" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75c71eaa367f2e5d556414a8eea812bc62985c879748d6403edabd9cb03f16e7" +dependencies = [ + "base16ct 0.2.0", + "crypto-bigint 0.5.2", + "digest 0.10.6", + "ff 0.13.0", + "generic-array 0.14.6", + "group 0.13.0", + "pkcs8 0.10.2", + "rand_core 0.6.4", + "sec1 0.7.1", "subtle", "zeroize", ] @@ -2455,22 +2526,22 @@ dependencies = [ [[package]] name = "enumflags2" -version = "0.7.5" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e75d4cd21b95383444831539909fbb14b9dc3fdceb2a6f5d36577329a1f55ccb" +checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" dependencies = [ "enumflags2_derive", ] [[package]] name = "enumflags2_derive" -version = "0.7.4" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae" +checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] @@ -2611,7 +2682,6 @@ dependencies = [ "fs-err", "proc-macro2", "quote", - "syn 1.0.109", ] [[package]] @@ -2627,6 +2697,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "expander" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f86a749cf851891866c10515ef6c299b5c69661465e9c3bbe7e07a2b77fb0f7" +dependencies = [ + "blake2", + "fs-err", + "proc-macro2", + "quote", + "syn 2.0.15", +] + [[package]] name = "fake-simd" version = "0.1.2" @@ -2692,6 +2775,16 @@ dependencies = [ "subtle", ] +[[package]] +name = "ff" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "fiat-crypto" version = "0.1.17" @@ -2722,9 +2815,9 @@ dependencies = [ [[package]] name = "finality-grandpa" -version = "0.16.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e24e6c429951433ccb7c87fd528c60084834dcd14763182c1f83291bcde24c34" +checksum = "36530797b9bf31cd4ff126dcfee8170f86b00cfdcea3269d73133cc0415945c3" dependencies = [ "either", "futures", @@ -2841,7 +2934,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "parity-scale-codec", ] @@ -2864,7 +2957,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-support", "frame-support-procedural", @@ -2889,7 +2982,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "Inflector", "array-bytes 4.2.0", @@ -2936,18 +3029,18 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -2964,7 +3057,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-support", "frame-system", @@ -2980,9 +3073,9 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "15.0.0" +version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df6bb8542ef006ef0de09a5c4420787d79823c0ed7924225822362fd2bf2ff2d" +checksum = "878babb0b136e731cc77ec2fd883ff02745ff21e6fb662729953d44923df009c" dependencies = [ "cfg-if", "parity-scale-codec", @@ -2993,9 +3086,11 @@ dependencies = [ [[package]] name = "frame-remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ + "async-recursion", "futures", + "jsonrpsee", "log", "parity-scale-codec", "serde", @@ -3009,7 +3104,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "bitflags", "environmental", @@ -3042,44 +3137,45 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "Inflector", "cfg-expr", "derive-syn-parse", "frame-support-procedural-tools", "itertools", + "proc-macro-warning", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -3090,6 +3186,7 @@ dependencies = [ "rustversion", "scale-info", "serde", + "sp-api", "sp-arithmetic", "sp-core", "sp-io", @@ -3103,7 +3200,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-support", "frame-system", @@ -3114,7 +3211,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-support", "log", @@ -3132,7 +3229,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -3147,7 +3244,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "parity-scale-codec", "sp-api", @@ -3156,7 +3253,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-support", "parity-scale-codec", @@ -3276,7 +3373,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.12", + "syn 2.0.15", ] [[package]] @@ -3352,6 +3449,7 @@ checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ "typenum", "version_check", + "zeroize", ] [[package]] @@ -3448,7 +3546,18 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" dependencies = [ - "ff", + "ff 0.12.1", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff 0.13.0", "rand_core 0.6.4", "subtle", ] @@ -3570,6 +3679,12 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" +[[package]] +name = "hex-literal" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" + [[package]] name = "hkdf" version = "0.12.3" @@ -3713,6 +3828,7 @@ dependencies = [ "rustls-native-certs", "tokio", "tokio-rustls", + "webpki-roots", ] [[package]] @@ -3918,7 +4034,7 @@ dependencies = [ [[package]] name = "invarch-xcm-builder" version = "0.1.0" -source = "git+https://github.com/InvArch/InvArch-XCM-Builder?branch=polkadot-v0.9.41#5180afa6fdb44f8758711c198a0085fcec8e2682" +source = "git+https://github.com/InvArch/InvArch-XCM-Builder?branch=polkadot-v0.9.42#f6c5919c75678bd0f5b8aadf39906d8b789d47b5" dependencies = [ "frame-support", "log", @@ -4021,6 +4137,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e" dependencies = [ "jsonrpsee-core", + "jsonrpsee-http-client", "jsonrpsee-proc-macros", "jsonrpsee-server", "jsonrpsee-types", @@ -4077,6 +4194,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-http-client" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc345b0a43c6bc49b947ebeb936e886a419ee3d894421790c969cc56040542ad" +dependencies = [ + "async-trait", + "hyper", + "hyper-rustls", + "jsonrpsee-core", + "jsonrpsee-types", + "rustc-hash", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", +] + [[package]] name = "jsonrpsee-proc-macros" version = "0.16.2" @@ -4140,13 +4276,14 @@ dependencies = [ [[package]] name = "k256" -version = "0.11.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b" +checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" dependencies = [ "cfg-if", - "ecdsa", - "elliptic-curve", + "ecdsa 0.16.7", + "elliptic-curve 0.13.4", + "once_cell", "sha2 0.10.6", ] @@ -4187,7 +4324,7 @@ dependencies = [ "frame-benchmarking", "frame-benchmarking-cli", "futures", - "hex-literal", + "hex-literal 0.4.1", "jsonrpsee", "khala-parachain-runtime", "log", @@ -4273,7 +4410,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal", + "hex-literal 0.4.1", "log", "pallet-assets", "pallet-aura", @@ -4345,8 +4482,8 @@ dependencies = [ [[package]] name = "kusama-runtime" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "bitvec", "frame-benchmarking", @@ -4357,7 +4494,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal", + "hex-literal 0.4.1", "kusama-runtime-constants", "log", "pallet-authority-discovery", @@ -4443,8 +4580,8 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "frame-support", "polkadot-primitives", @@ -4476,9 +4613,9 @@ dependencies = [ [[package]] name = "kvdb-rocksdb" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2182b8219fee6bd83aacaab7344e840179ae079d5216aa4e249b4d704646a844" +checksum = "fe7a749456510c45f795e8b04a6a3e0976d0139213ecbf465843830ad55e2217" dependencies = [ "kvdb", "num_cpus", @@ -4587,7 +4724,7 @@ dependencies = [ "prost-build", "rand 0.8.5", "rw-stream-sink", - "sec1", + "sec1 0.3.0", "sha2 0.10.6", "smallvec", "thiserror", @@ -4621,7 +4758,7 @@ dependencies = [ "prost-build", "rand 0.8.5", "rw-stream-sink", - "sec1", + "sec1 0.3.0", "sha2 0.10.6", "smallvec", "thiserror", @@ -4993,9 +5130,9 @@ dependencies = [ [[package]] name = "librocksdb-sys" -version = "0.8.3+7.4.4" +version = "0.10.0+7.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "557b255ff04123fcc176162f56ed0c9cd42d8f357cf55b3fabeb60f7413741b3" +checksum = "0fe4d5874f5ff2bc616e55e8c6086d478fcda13faf9495768a4aa1c22042d30b" dependencies = [ "bindgen", "bzip2-sys", @@ -5334,7 +5471,7 @@ dependencies = [ [[package]] name = "mmr-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "futures", "log", @@ -5353,7 +5490,7 @@ dependencies = [ [[package]] name = "mmr-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "anyhow", "jsonrpsee", @@ -5836,8 +5973,8 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ - "ecdsa", - "elliptic-curve", + "ecdsa 0.14.8", + "elliptic-curve 0.12.3", "sha2 0.10.6", ] @@ -5847,8 +5984,8 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" dependencies = [ - "ecdsa", - "elliptic-curve", + "ecdsa 0.14.8", + "elliptic-curve 0.12.3", "sha2 0.10.6", ] @@ -5865,7 +6002,7 @@ dependencies = [ [[package]] name = "pallet-asset-tx-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -5883,7 +6020,7 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -5898,7 +6035,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-support", "frame-system", @@ -5914,7 +6051,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-support", "frame-system", @@ -5930,7 +6067,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-support", "frame-system", @@ -5944,7 +6081,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -5957,7 +6094,7 @@ dependencies = [ "scale-info", "sp-application-crypto", "sp-consensus-babe", - "sp-consensus-vrf", + "sp-core", "sp-io", "sp-runtime", "sp-session", @@ -5968,7 +6105,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5988,7 +6125,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6003,7 +6140,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-support", "frame-system", @@ -6022,7 +6159,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "array-bytes 4.2.0", "binary-merkle-tree", @@ -6046,7 +6183,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6064,7 +6201,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6083,7 +6220,7 @@ dependencies = [ [[package]] name = "pallet-collator-selection" version = "3.0.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "frame-benchmarking", "frame-support", @@ -6102,7 +6239,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6119,7 +6256,7 @@ dependencies = [ [[package]] name = "pallet-conviction-voting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "assert_matches", "frame-benchmarking", @@ -6136,7 +6273,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6154,7 +6291,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6177,7 +6314,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6190,7 +6327,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6208,7 +6345,7 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6226,7 +6363,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6249,7 +6386,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "enumflags2", "frame-benchmarking", @@ -6265,7 +6402,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6291,7 +6428,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "hex-literal", + "hex-literal 0.4.1", "log", "pallet-assets", "pallet-balances", @@ -6313,7 +6450,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6330,7 +6467,7 @@ dependencies = [ [[package]] name = "pallet-insecure-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-support", "frame-system", @@ -6344,7 +6481,7 @@ dependencies = [ [[package]] name = "pallet-lottery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6358,7 +6495,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6375,7 +6512,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6400,7 +6537,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6416,7 +6553,7 @@ dependencies = [ [[package]] name = "pallet-nis" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6432,7 +6569,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-support", "frame-system", @@ -6449,7 +6586,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6469,7 +6606,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "pallet-nomination-pools", "parity-scale-codec", @@ -6480,7 +6617,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-support", "frame-system", @@ -6497,7 +6634,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6555,7 +6692,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6572,7 +6709,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6587,7 +6724,7 @@ dependencies = [ [[package]] name = "pallet-ranked-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6605,7 +6742,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6620,7 +6757,7 @@ dependencies = [ [[package]] name = "pallet-referenda" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "assert_matches", "frame-benchmarking", @@ -6639,7 +6776,7 @@ dependencies = [ [[package]] name = "pallet-rmrk-core" version = "0.0.1" -source = "git+https://github.com/Phala-Network/rmrk-substrate?branch=polkadot-v0.9.41#9993b5e60c4622b19b5d9aa2e4da67011a95caaf" +source = "git+https://github.com/Phala-Network/rmrk-substrate?branch=polkadot-v0.9.42#73b59c92b81bb0b495c29d30b73700fe278fc982" dependencies = [ "frame-benchmarking", "frame-support", @@ -6657,7 +6794,7 @@ dependencies = [ [[package]] name = "pallet-rmrk-equip" version = "0.0.1" -source = "git+https://github.com/Phala-Network/rmrk-substrate?branch=polkadot-v0.9.41#9993b5e60c4622b19b5d9aa2e4da67011a95caaf" +source = "git+https://github.com/Phala-Network/rmrk-substrate?branch=polkadot-v0.9.42#73b59c92b81bb0b495c29d30b73700fe278fc982" dependencies = [ "frame-benchmarking", "frame-support", @@ -6676,7 +6813,7 @@ dependencies = [ [[package]] name = "pallet-rmrk-market" version = "0.0.1" -source = "git+https://github.com/Phala-Network/rmrk-substrate?branch=polkadot-v0.9.41#9993b5e60c4622b19b5d9aa2e4da67011a95caaf" +source = "git+https://github.com/Phala-Network/rmrk-substrate?branch=polkadot-v0.9.42#73b59c92b81bb0b495c29d30b73700fe278fc982" dependencies = [ "frame-benchmarking", "frame-support", @@ -6695,7 +6832,7 @@ dependencies = [ [[package]] name = "pallet-rmrk-rpc" version = "0.0.1" -source = "git+https://github.com/Phala-Network/rmrk-substrate?branch=polkadot-v0.9.41#9993b5e60c4622b19b5d9aa2e4da67011a95caaf" +source = "git+https://github.com/Phala-Network/rmrk-substrate?branch=polkadot-v0.9.42#73b59c92b81bb0b495c29d30b73700fe278fc982" dependencies = [ "jsonrpsee", "pallet-rmrk-rpc-runtime-api", @@ -6712,7 +6849,7 @@ dependencies = [ [[package]] name = "pallet-rmrk-rpc-runtime-api" version = "0.0.1" -source = "git+https://github.com/Phala-Network/rmrk-substrate?branch=polkadot-v0.9.41#9993b5e60c4622b19b5d9aa2e4da67011a95caaf" +source = "git+https://github.com/Phala-Network/rmrk-substrate?branch=polkadot-v0.9.42#73b59c92b81bb0b495c29d30b73700fe278fc982" dependencies = [ "parity-scale-codec", "rmrk-traits", @@ -6727,7 +6864,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6744,7 +6881,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-support", "frame-system", @@ -6765,7 +6902,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6781,7 +6918,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-support", "frame-system", @@ -6795,7 +6932,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6818,18 +6955,18 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "log", "sp-arithmetic", @@ -6838,7 +6975,7 @@ dependencies = [ [[package]] name = "pallet-staking-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "parity-scale-codec", "sp-api", @@ -6847,7 +6984,7 @@ dependencies = [ [[package]] name = "pallet-state-trie-migration" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6864,7 +7001,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-support", "frame-system", @@ -6878,7 +7015,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6896,7 +7033,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6915,7 +7052,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-support", "frame-system", @@ -6931,7 +7068,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -6947,7 +7084,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -6959,7 +7096,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6976,7 +7113,7 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -6991,7 +7128,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -7007,7 +7144,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -7022,7 +7159,7 @@ dependencies = [ [[package]] name = "pallet-whitelist" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-benchmarking", "frame-support", @@ -7036,8 +7173,8 @@ dependencies = [ [[package]] name = "pallet-xcm" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "bounded-collections", "frame-benchmarking", @@ -7057,8 +7194,8 @@ dependencies = [ [[package]] name = "pallet-xcm-benchmarks" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "frame-benchmarking", "frame-support", @@ -7077,7 +7214,7 @@ dependencies = [ [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.41#ae4e75b077c220bdf29b299b36a63b87ccb46b4c" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.42#f603a61ff370fc33740c9373833c3c6ba1486846" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -7135,9 +7272,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "637935964ff85a605d114591d4d2c13c5d1ba2806dae97cea6bf180238a749ac" +checksum = "5ddb756ca205bd108aee3c62c6d3c994e1df84a59b9d6d4a5ea42ee1fd5a9a28" dependencies = [ "arrayvec 0.7.2", "bitvec", @@ -7416,7 +7553,7 @@ dependencies = [ "frame-support-test", "frame-system", "hex", - "hex-literal", + "hex-literal 0.4.1", "insta", "log", "pallet-assets", @@ -7467,7 +7604,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal", + "hex-literal 0.4.1", "log", "pallet-assets", "pallet-aura", @@ -7626,8 +7763,18 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" dependencies = [ - "der", - "spki", + "der 0.6.1", + "spki 0.6.0", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der 0.7.5", + "spki 0.7.2", ] [[package]] @@ -7650,10 +7797,11 @@ checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" [[package]] name = "polkadot-approval-distribution" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "futures", + "polkadot-node-jaeger", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7665,8 +7813,8 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "futures", "polkadot-node-network-protocol", @@ -7679,8 +7827,8 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "derive_more", "fatality", @@ -7702,8 +7850,8 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "fatality", "futures", @@ -7723,15 +7871,15 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "clap", "frame-benchmarking-cli", "futures", "log", "polkadot-client", - "polkadot-node-core-pvf", + "polkadot-node-core-pvf-worker", "polkadot-node-metrics", "polkadot-performance-test", "polkadot-service", @@ -7744,6 +7892,7 @@ dependencies = [ "sp-core", "sp-io", "sp-keyring", + "sp-maybe-compressed-blob", "substrate-build-script-utils", "thiserror", "try-runtime-cli", @@ -7751,8 +7900,8 @@ dependencies = [ [[package]] name = "polkadot-client" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "async-trait", "frame-benchmarking", @@ -7793,8 +7942,8 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "always-assert", "bitvec", @@ -7815,8 +7964,8 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "parity-scale-codec", "scale-info", @@ -7827,8 +7976,8 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "derive_more", "fatality", @@ -7852,8 +8001,8 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -7866,8 +8015,8 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "futures", "futures-timer", @@ -7886,8 +8035,8 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "always-assert", "async-trait", @@ -7909,8 +8058,8 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "futures", "parity-scale-codec", @@ -7927,8 +8076,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "bitvec", "derive_more", @@ -7956,8 +8105,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "bitvec", "futures", @@ -7977,8 +8126,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "bitvec", "fatality", @@ -7996,8 +8145,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "futures", "polkadot-node-subsystem", @@ -8011,8 +8160,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "async-trait", "futures", @@ -8031,8 +8180,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "futures", "polkadot-node-metrics", @@ -8046,8 +8195,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "futures", "futures-timer", @@ -8063,8 +8212,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "fatality", "futures", @@ -8082,8 +8231,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "async-trait", "futures", @@ -8099,8 +8248,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "bitvec", "fatality", @@ -8117,12 +8266,10 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "always-assert", - "assert_matches", - "cpu-time", "futures", "futures-timer", "libc", @@ -8134,28 +8281,20 @@ dependencies = [ "polkadot-parachain", "polkadot-primitives", "rand 0.8.5", - "rayon", - "sc-executor", - "sc-executor-common", - "sc-executor-wasmtime", "slotmap", "sp-core", - "sp-externalities", - "sp-io", "sp-maybe-compressed-blob", "sp-tracing", "sp-wasm-interface", "substrate-build-script-utils", - "tempfile", - "tikv-jemalloc-ctl", "tokio", "tracing-gum", ] [[package]] name = "polkadot-node-core-pvf-checker" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "futures", "polkadot-node-primitives", @@ -8168,10 +8307,39 @@ dependencies = [ "tracing-gum", ] +[[package]] +name = "polkadot-node-core-pvf-worker" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" +dependencies = [ + "assert_matches", + "cpu-time", + "futures", + "libc", + "parity-scale-codec", + "polkadot-node-core-pvf", + "polkadot-parachain", + "polkadot-primitives", + "rayon", + "sc-executor", + "sc-executor-common", + "sc-executor-wasmtime", + "sp-core", + "sp-externalities", + "sp-io", + "sp-maybe-compressed-blob", + "sp-tracing", + "substrate-build-script-utils", + "tempfile", + "tikv-jemalloc-ctl", + "tokio", + "tracing-gum", +] + [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "futures", "lru 0.9.0", @@ -8185,8 +8353,8 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "lazy_static", "log", @@ -8203,8 +8371,8 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "bs58", "futures", @@ -8222,8 +8390,8 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "async-trait", "derive_more", @@ -8244,8 +8412,8 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "bounded-vec", "futures", @@ -8256,19 +8424,18 @@ dependencies = [ "serde", "sp-application-crypto", "sp-consensus-babe", - "sp-consensus-vrf", "sp-core", "sp-keystore", "sp-maybe-compressed-blob", "sp-runtime", "thiserror", - "zstd", + "zstd 0.11.2+zstd.1.5.2", ] [[package]] name = "polkadot-node-subsystem" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -8277,8 +8444,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "async-trait", "derive_more", @@ -8300,8 +8467,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "async-trait", "derive_more", @@ -8333,8 +8500,8 @@ dependencies = [ [[package]] name = "polkadot-overseer" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "async-trait", "futures", @@ -8356,8 +8523,8 @@ dependencies = [ [[package]] name = "polkadot-parachain" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "bounded-collections", "derive_more", @@ -8373,27 +8540,29 @@ dependencies = [ [[package]] name = "polkadot-performance-test" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "env_logger 0.9.3", "kusama-runtime", "log", "polkadot-erasure-coding", - "polkadot-node-core-pvf", + "polkadot-node-core-pvf-worker", "polkadot-node-primitives", "polkadot-primitives", "quote", + "sc-executor-common", + "sp-maybe-compressed-blob", "thiserror", ] [[package]] name = "polkadot-primitives" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "bitvec", - "hex-literal", + "hex-literal 0.4.1", "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain", @@ -8415,8 +8584,8 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "jsonrpsee", "mmr-rpc", @@ -8447,8 +8616,8 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "bitvec", "frame-benchmarking", @@ -8459,7 +8628,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal", + "hex-literal 0.4.1", "log", "pallet-authority-discovery", "pallet-authorship", @@ -8469,6 +8638,7 @@ dependencies = [ "pallet-bounties", "pallet-child-bounties", "pallet-collective", + "pallet-conviction-voting", "pallet-democracy", "pallet-election-provider-multi-phase", "pallet-election-provider-support-benchmarking", @@ -8487,6 +8657,7 @@ dependencies = [ "pallet-offences-benchmarking", "pallet-preimage", "pallet-proxy", + "pallet-referenda", "pallet-scheduler", "pallet-session", "pallet-session-benchmarking", @@ -8500,6 +8671,7 @@ dependencies = [ "pallet-treasury", "pallet-utility", "pallet-vesting", + "pallet-whitelist", "pallet-xcm", "parity-scale-codec", "polkadot-primitives", @@ -8512,6 +8684,7 @@ dependencies = [ "serde_derive", "smallvec", "sp-api", + "sp-arithmetic", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", @@ -8537,8 +8710,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "bitvec", "frame-benchmarking", @@ -8583,8 +8756,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-constants" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "frame-support", "polkadot-primitives", @@ -8597,8 +8770,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "bs58", "parity-scale-codec", @@ -8609,8 +8782,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "bitflags", "bitvec", @@ -8653,14 +8826,14 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.9.41" +version = "0.9.42" dependencies = [ "async-trait", "frame-benchmarking-cli", "frame-support", "frame-system-rpc-runtime-api", "futures", - "hex-literal", + "hex-literal 0.4.1", "kusama-runtime", "kvdb", "kvdb-rocksdb", @@ -8761,8 +8934,8 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "arrayvec 0.5.2", "fatality", @@ -8782,8 +8955,8 @@ dependencies = [ [[package]] name = "polkadot-statement-table" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -8960,11 +9133,22 @@ dependencies = [ "version_check", ] +[[package]] +name = "proc-macro-warning" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e99670bafb56b9a106419397343bdbc8b8742c3cc449fec6345f86173f47cd4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + [[package]] name = "proc-macro2" -version = "1.0.53" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -9405,11 +9589,21 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" dependencies = [ - "crypto-bigint", + "crypto-bigint 0.4.9", "hmac 0.12.1", "zeroize", ] +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac 0.12.1", + "subtle", +] + [[package]] name = "rhala-parachain-runtime" version = "0.1.25-dev" @@ -9432,7 +9626,7 @@ dependencies = [ "frame-system-rpc-runtime-api", "frame-try-runtime", "hex", - "hex-literal", + "hex-literal 0.4.1", "invarch-xcm-builder", "log", "pallet-assets", @@ -9537,7 +9731,7 @@ dependencies = [ [[package]] name = "rmrk-traits" version = "0.0.1" -source = "git+https://github.com/Phala-Network/rmrk-substrate?branch=polkadot-v0.9.41#9993b5e60c4622b19b5d9aa2e4da67011a95caaf" +source = "git+https://github.com/Phala-Network/rmrk-substrate?branch=polkadot-v0.9.42#73b59c92b81bb0b495c29d30b73700fe278fc982" dependencies = [ "frame-benchmarking", "frame-support", @@ -9552,9 +9746,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.19.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9562ea1d70c0cc63a34a22d977753b50cca91cc6b6527750463bd5dd8697bc" +checksum = "015439787fce1e75d55f279078d33ff14b4af5d93d995e8838ee4631301c8a99" dependencies = [ "libc", "librocksdb-sys", @@ -9562,8 +9756,8 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "binary-merkle-tree", "frame-benchmarking", @@ -9573,7 +9767,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal", + "hex-literal 0.4.1", "log", "pallet-authority-discovery", "pallet-authorship", @@ -9648,8 +9842,8 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "frame-support", "polkadot-primitives", @@ -9893,7 +10087,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "log", "sp-core", @@ -9904,7 +10098,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "async-trait", "futures", @@ -9932,7 +10126,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "futures", "futures-timer", @@ -9955,7 +10149,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -9970,7 +10164,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "memmap2", "sc-chain-spec-derive", @@ -9989,18 +10183,18 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "array-bytes 4.2.0", "chrono", @@ -10040,7 +10234,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "fnv", "futures", @@ -10066,7 +10260,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "hash-db", "kvdb", @@ -10092,7 +10286,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "async-trait", "futures", @@ -10117,7 +10311,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "async-trait", "futures", @@ -10146,13 +10340,12 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "async-trait", "fork-tree", "futures", "log", - "merlin", "num-bigint", "num-rational", "num-traits", @@ -10165,7 +10358,6 @@ dependencies = [ "sc-keystore", "sc-telemetry", "scale-info", - "schnorrkel", "sp-api", "sp-application-crypto", "sp-block-builder", @@ -10173,7 +10365,6 @@ dependencies = [ "sp-consensus", "sp-consensus-babe", "sp-consensus-slots", - "sp-consensus-vrf", "sp-core", "sp-inherents", "sp-keystore", @@ -10185,7 +10376,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "futures", "jsonrpsee", @@ -10207,7 +10398,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "array-bytes 4.2.0", "async-trait", @@ -10242,7 +10433,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "futures", "jsonrpsee", @@ -10261,7 +10452,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "fork-tree", "parity-scale-codec", @@ -10274,7 +10465,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "ahash 0.8.3", "array-bytes 4.2.0", @@ -10314,7 +10505,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "finality-grandpa", "futures", @@ -10334,7 +10525,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "async-trait", "futures", @@ -10357,7 +10548,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "lru 0.8.1", "parity-scale-codec", @@ -10381,7 +10572,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", @@ -10394,7 +10585,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "log", "sc-allocator", @@ -10407,7 +10598,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "anyhow", "cfg-if", @@ -10425,7 +10616,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "ansi_term", "futures", @@ -10441,7 +10632,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "array-bytes 4.2.0", "async-trait", @@ -10456,7 +10647,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "array-bytes 4.2.0", "async-channel", @@ -10486,6 +10677,7 @@ dependencies = [ "serde", "serde_json", "smallvec", + "snow", "sp-arithmetic", "sp-blockchain", "sp-consensus", @@ -10500,7 +10692,7 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "cid", "futures", @@ -10520,7 +10712,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "array-bytes 4.2.0", "async-trait", @@ -10548,7 +10740,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "ahash 0.8.3", "futures", @@ -10567,7 +10759,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "array-bytes 4.2.0", "futures", @@ -10589,7 +10781,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "array-bytes 4.2.0", "async-trait", @@ -10623,7 +10815,7 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "array-bytes 4.2.0", "futures", @@ -10643,7 +10835,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "array-bytes 4.2.0", "bytes", @@ -10674,7 +10866,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "futures", "libp2p", @@ -10687,7 +10879,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -10696,7 +10888,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "futures", "jsonrpsee", @@ -10726,7 +10918,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -10745,7 +10937,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "http", "jsonrpsee", @@ -10760,7 +10952,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "array-bytes 4.2.0", "futures", @@ -10786,7 +10978,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "async-trait", "directories", @@ -10852,7 +11044,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "log", "parity-scale-codec", @@ -10863,7 +11055,7 @@ dependencies = [ [[package]] name = "sc-storage-monitor" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "clap", "fs4", @@ -10879,7 +11071,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -10898,7 +11090,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "futures", "libc", @@ -10917,7 +11109,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "chrono", "futures", @@ -10936,7 +11128,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "ansi_term", "atty", @@ -10967,18 +11159,18 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "async-trait", "futures", @@ -11005,7 +11197,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "async-trait", "futures", @@ -11019,7 +11211,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "async-channel", "futures", @@ -11033,9 +11225,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.3.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "001cf62ece89779fd16105b5f515ad0e5cedcd5440d3dd806bb067978e7c3608" +checksum = "dfdef77228a4c05dc94211441595746732131ad7f6530c6c18f045da7b7ab937" dependencies = [ "bitvec", "cfg-if", @@ -11047,9 +11239,9 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.3.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "303959cf613a6f6efd19ed4b4ad5bf79966a13352716299ad532cfb115f4205c" +checksum = "53012eae69e5aa5c14671942a5dd47de59d4cdcff8532a6dd0e081faf1119482" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -11145,10 +11337,24 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ - "base16ct", - "der", + "base16ct 0.1.1", + "der 0.6.1", "generic-array 0.14.6", - "pkcs8", + "pkcs8 0.9.0", + "subtle", + "zeroize", +] + +[[package]] +name = "sec1" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e" +dependencies = [ + "base16ct 0.2.0", + "der 0.7.5", + "generic-array 0.14.6", + "pkcs8 0.10.2", "subtle", "zeroize", ] @@ -11238,35 +11444,44 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.152" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] name = "serde_json" -version = "1.0.93" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa", "ryu", "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +dependencies = [ + "serde", +] + [[package]] name = "sha-1" version = "0.9.8" @@ -11409,6 +11624,16 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "signature" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +dependencies = [ + "digest 0.10.6", + "rand_core 0.6.4", +] + [[package]] name = "simba" version = "0.8.0" @@ -11461,8 +11686,8 @@ checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" [[package]] name = "slot-range-helper" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "enumn", "parity-scale-codec", @@ -11494,14 +11719,14 @@ checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" [[package]] name = "snow" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ba5f4d4ff12bdb6a169ed51b7c48c0e0ac4b0b4b31012b2571e97d78d3201d" +checksum = "5ccba027ba85743e09d15c03296797cad56395089b832b48b5a5217880f57733" dependencies = [ "aes-gcm 0.9.4", "blake2", "chacha20poly1305", - "curve25519-dalek 4.0.0-rc.0", + "curve25519-dalek 4.0.0-rc.1", "rand_core 0.6.4", "ring 0.16.20", "rustc_version 0.4.0", @@ -11511,9 +11736,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -11539,13 +11764,15 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "hash-db", "log", "parity-scale-codec", + "scale-info", "sp-api-proc-macro", "sp-core", + "sp-metadata-ir", "sp-runtime", "sp-state-machine", "sp-std", @@ -11557,7 +11784,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "Inflector", "blake2", @@ -11565,13 +11792,13 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] name = "sp-application-crypto" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "parity-scale-codec", "scale-info", @@ -11584,7 +11811,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "integer-sqrt", "num-traits", @@ -11598,7 +11825,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "parity-scale-codec", "scale-info", @@ -11611,7 +11838,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "parity-scale-codec", "sp-api", @@ -11623,7 +11850,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "futures", "log", @@ -11641,7 +11868,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "async-trait", "futures", @@ -11656,7 +11883,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "async-trait", "parity-scale-codec", @@ -11674,10 +11901,9 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "async-trait", - "merlin", "parity-scale-codec", "scale-info", "serde", @@ -11685,7 +11911,6 @@ dependencies = [ "sp-application-crypto", "sp-consensus", "sp-consensus-slots", - "sp-consensus-vrf", "sp-core", "sp-inherents", "sp-keystore", @@ -11697,7 +11922,7 @@ dependencies = [ [[package]] name = "sp-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "lazy_static", "parity-scale-codec", @@ -11716,7 +11941,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "finality-grandpa", "log", @@ -11734,7 +11959,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "parity-scale-codec", "scale-info", @@ -11743,29 +11968,16 @@ dependencies = [ "sp-timestamp", ] -[[package]] -name = "sp-consensus-vrf" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" -dependencies = [ - "parity-scale-codec", - "scale-info", - "schnorrkel", - "sp-core", - "sp-runtime", - "sp-std", -] - [[package]] name = "sp-core" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "array-bytes 4.2.0", - "base58", "bitflags", "blake2", "bounded-collections", + "bs58", "dyn-clonable", "ed25519-zebra", "futures", @@ -11778,6 +11990,7 @@ dependencies = [ "merlin", "parity-scale-codec", "parking_lot 0.12.1", + "paste", "primitive-types", "rand 0.8.5", "regex", @@ -11802,7 +12015,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "blake2b_simd", "byteorder", @@ -11816,18 +12029,18 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "proc-macro2", "quote", "sp-core-hashing", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -11836,17 +12049,17 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] name = "sp-externalities" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "environmental", "parity-scale-codec", @@ -11857,7 +12070,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -11872,7 +12085,7 @@ dependencies = [ [[package]] name = "sp-io" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "bytes", "ed25519", @@ -11881,6 +12094,7 @@ dependencies = [ "libsecp256k1", "log", "parity-scale-codec", + "rustversion", "secp256k1", "sp-core", "sp-externalities", @@ -11897,7 +12111,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "lazy_static", "sp-core", @@ -11908,14 +12122,11 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ - "async-trait", "futures", - "merlin", "parity-scale-codec", "parking_lot 0.12.1", - "schnorrkel", "serde", "sp-core", "sp-externalities", @@ -11925,16 +12136,27 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "thiserror", - "zstd", + "zstd 0.12.3+zstd.1.5.2", +] + +[[package]] +name = "sp-metadata-ir" +version = "0.1.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" +dependencies = [ + "frame-metadata", + "parity-scale-codec", + "scale-info", + "sp-std", ] [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "ckb-merkle-mountain-range", "log", @@ -11952,7 +12174,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "parity-scale-codec", "scale-info", @@ -11966,7 +12188,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "sp-api", "sp-core", @@ -11976,7 +12198,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "backtrace", "lazy_static", @@ -11986,7 +12208,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "rustc-hash", "serde", @@ -11996,7 +12218,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "either", "hash256-std-hasher", @@ -12018,7 +12240,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -12036,19 +12258,19 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "Inflector", "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "parity-scale-codec", "scale-info", @@ -12062,10 +12284,11 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "parity-scale-codec", "scale-info", + "serde", "sp-core", "sp-runtime", "sp-std", @@ -12074,7 +12297,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "hash-db", "log", @@ -12094,12 +12317,12 @@ dependencies = [ [[package]] name = "sp-std" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" [[package]] name = "sp-storage" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "impl-serde", "parity-scale-codec", @@ -12112,7 +12335,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "async-trait", "futures-timer", @@ -12127,7 +12350,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "parity-scale-codec", "sp-std", @@ -12139,7 +12362,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "sp-api", "sp-runtime", @@ -12148,7 +12371,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "async-trait", "log", @@ -12164,11 +12387,11 @@ dependencies = [ [[package]] name = "sp-trie" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "ahash 0.8.3", "hash-db", - "hashbrown 0.12.3", + "hashbrown 0.13.2", "lazy_static", "memory-db", "nohash-hasher", @@ -12187,7 +12410,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "impl-serde", "parity-scale-codec", @@ -12204,18 +12427,18 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] name = "sp-wasm-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -12229,7 +12452,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "parity-scale-codec", "scale-info", @@ -12260,7 +12483,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" dependencies = [ "base64ct", - "der", + "der 0.6.1", +] + +[[package]] +name = "spki" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +dependencies = [ + "base64ct", + "der 0.7.5", ] [[package]] @@ -12406,7 +12639,7 @@ dependencies = [ "frame-support", "frame-system", "funty 3.0.0-rc2", - "hex-literal", + "hex-literal 0.4.1", "impl-trait-for-tuples", "log", "pallet-assets", @@ -12450,7 +12683,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "platforms 2.0.0", ] @@ -12458,7 +12691,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -12477,7 +12710,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "hyper", "log", @@ -12489,7 +12722,7 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "async-trait", "jsonrpsee", @@ -12502,7 +12735,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "jsonrpsee", "log", @@ -12521,7 +12754,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "ansi_term", "build-helper", @@ -12530,7 +12763,7 @@ dependencies = [ "sp-maybe-compressed-blob", "strum", "tempfile", - "toml", + "toml 0.7.3", "walkdir", "wasm-opt", ] @@ -12553,8 +12786,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "sygma-access-segregator" version = "0.1.0" -source = "git+https://github.com/Phala-Network/sygma-substrate-pallets?branch=polkadot-v0.9.41#a8b0085e6148cc32ad2d6c37aa46b3a13ff3db1b" +source = "git+https://github.com/sygmaprotocol/sygma-substrate-pallets?branch=polkadot-v0.9.42#2f42d33cfb40b6ad07c6db6a8b8c4d0ddd688d66" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", @@ -12565,8 +12799,9 @@ dependencies = [ [[package]] name = "sygma-basic-feehandler" version = "0.1.0" -source = "git+https://github.com/Phala-Network/sygma-substrate-pallets?branch=polkadot-v0.9.41#a8b0085e6148cc32ad2d6c37aa46b3a13ff3db1b" +source = "git+https://github.com/sygmaprotocol/sygma-substrate-pallets?branch=polkadot-v0.9.42#2f42d33cfb40b6ad07c6db6a8b8c4d0ddd688d66" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", @@ -12581,7 +12816,7 @@ dependencies = [ [[package]] name = "sygma-bridge" version = "0.1.0" -source = "git+https://github.com/Phala-Network/sygma-substrate-pallets?branch=polkadot-v0.9.41#a8b0085e6148cc32ad2d6c37aa46b3a13ff3db1b" +source = "git+https://github.com/sygmaprotocol/sygma-substrate-pallets?branch=polkadot-v0.9.42#2f42d33cfb40b6ad07c6db6a8b8c4d0ddd688d66" dependencies = [ "arrayref", "bounded-collections", @@ -12592,6 +12827,7 @@ dependencies = [ "frame-system", "funty 3.0.0-rc2", "hex", + "hex-literal 0.3.4", "log", "pallet-assets", "pallet-balances", @@ -12604,6 +12840,8 @@ dependencies = [ "sp-runtime", "sp-std", "sygma-access-segregator", + "sygma-basic-feehandler", + "sygma-fee-handler-router", "sygma-traits", "xcm", "xcm-builder", @@ -12613,8 +12851,9 @@ dependencies = [ [[package]] name = "sygma-fee-handler-router" version = "0.1.0" -source = "git+https://github.com/Phala-Network/sygma-substrate-pallets?branch=polkadot-v0.9.41#a8b0085e6148cc32ad2d6c37aa46b3a13ff3db1b" +source = "git+https://github.com/sygmaprotocol/sygma-substrate-pallets?branch=polkadot-v0.9.42#2f42d33cfb40b6ad07c6db6a8b8c4d0ddd688d66" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", @@ -12630,7 +12869,7 @@ dependencies = [ [[package]] name = "sygma-rpc" version = "0.1.0" -source = "git+https://github.com/Phala-Network/sygma-substrate-pallets?branch=polkadot-v0.9.41#a8b0085e6148cc32ad2d6c37aa46b3a13ff3db1b" +source = "git+https://github.com/sygmaprotocol/sygma-substrate-pallets?branch=polkadot-v0.9.42#2f42d33cfb40b6ad07c6db6a8b8c4d0ddd688d66" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -12647,7 +12886,7 @@ dependencies = [ [[package]] name = "sygma-runtime-api" version = "0.1.0" -source = "git+https://github.com/Phala-Network/sygma-substrate-pallets?branch=polkadot-v0.9.41#a8b0085e6148cc32ad2d6c37aa46b3a13ff3db1b" +source = "git+https://github.com/sygmaprotocol/sygma-substrate-pallets?branch=polkadot-v0.9.42#2f42d33cfb40b6ad07c6db6a8b8c4d0ddd688d66" dependencies = [ "sp-api", "sygma-bridge", @@ -12657,7 +12896,7 @@ dependencies = [ [[package]] name = "sygma-traits" version = "0.1.0" -source = "git+https://github.com/Phala-Network/sygma-substrate-pallets?branch=polkadot-v0.9.41#a8b0085e6148cc32ad2d6c37aa46b3a13ff3db1b" +source = "git+https://github.com/sygmaprotocol/sygma-substrate-pallets?branch=polkadot-v0.9.42#2f42d33cfb40b6ad07c6db6a8b8c4d0ddd688d66" dependencies = [ "ethabi", "frame-support", @@ -12682,9 +12921,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.12" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79d9531f94112cfc3e4c8f5f02cb2b58f72c97b7efd85f70203cc6d8efda5927" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" dependencies = [ "proc-macro2", "quote", @@ -12786,7 +13025,7 @@ dependencies = [ "frame-system-rpc-runtime-api", "frame-try-runtime", "hex", - "hex-literal", + "hex-literal 0.4.1", "log", "pallet-assets", "pallet-aura", @@ -12863,22 +13102,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] @@ -13033,14 +13272,13 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.26.0" +version = "1.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" +checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" dependencies = [ "autocfg", "bytes", "libc", - "memchr", "mio", "num_cpus", "parking_lot 0.12.1", @@ -13048,18 +13286,18 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "1.8.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] @@ -13109,19 +13347,36 @@ dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + [[package]] name = "toml_datetime" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +dependencies = [ + "serde", +] [[package]] name = "toml_edit" -version = "0.19.4" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1eb0622d28f4b9c90adc4ea4b2b46b47663fde9ac5fafcb14a1369d5508825" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" dependencies = [ "indexmap", + "serde", + "serde_spanned", "toml_datetime", "winnow", ] @@ -13213,8 +13468,8 @@ dependencies = [ [[package]] name = "tracing-gum" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "polkadot-node-jaeger", "polkadot-primitives", @@ -13224,14 +13479,14 @@ dependencies = [ [[package]] name = "tracing-gum-proc-macro" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ - "expander 0.0.6", + "expander 2.0.0", "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] @@ -13355,7 +13610,7 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.41#3bd809d59c31c7205a0f36c6ddcba603e43051fc" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.42#3bb3882ce094ac211dea93fabfdcd4f902f5a7fd" dependencies = [ "async-trait", "clap", @@ -13386,7 +13641,7 @@ dependencies = [ "sp-version", "sp-weights", "substrate-rpc-client", - "zstd", + "zstd 0.12.3+zstd.1.5.2", ] [[package]] @@ -13824,9 +14079,9 @@ dependencies = [ [[package]] name = "wasmtime" -version = "6.0.1" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6e89f9819523447330ffd70367ef4a18d8c832e24e8150fe054d1d912841632" +checksum = "76a222f5fa1e14b2cefc286f1b68494d7a965f4bf57ec04c59bb62673d639af6" dependencies = [ "anyhow", "bincode", @@ -13852,18 +14107,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "6.0.1" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd3a5e46c198032da934469f3a6e48649d1f9142438e4fd4617b68a35644b8a" +checksum = "4407a7246e7d2f3d8fb1cf0c72fda8dbafdb6dd34d555ae8bea0e5ae031089cc" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "6.0.1" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b389ae9b678b9c3851091a4804f4182d688d27aff7abc9aa37fa7be37d8ecffa" +checksum = "5ceb3adf61d654be0be67fffdce42447b0880481348785be5fe40b5dd7663a4c" dependencies = [ "anyhow", "base64 0.13.1", @@ -13874,16 +14129,16 @@ dependencies = [ "rustix 0.36.8", "serde", "sha2 0.10.6", - "toml", + "toml 0.5.11", "windows-sys 0.42.0", - "zstd", + "zstd 0.11.2+zstd.1.5.2", ] [[package]] name = "wasmtime-cranelift" -version = "6.0.1" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b2c92a08c0db6efffd88fdc97d7aa9c7c63b03edb0971dbca745469f820e8c" +checksum = "3c366bb8647e01fd08cb5589976284b00abfded5529b33d7e7f3f086c68304a4" dependencies = [ "anyhow", "cranelift-codegen", @@ -13902,9 +14157,9 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "6.0.1" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a6db9fc52985ba06ca601f2ff0ff1f526c5d724c7ac267b47326304b0c97883" +checksum = "47b8b50962eae38ee319f7b24900b7cf371f03eebdc17400c1dc8575fc10c9a7" dependencies = [ "anyhow", "cranelift-entity", @@ -13921,9 +14176,9 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "6.0.1" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b77e3a52cd84d0f7f18554afa8060cfe564ccac61e3b0802d3fd4084772fa5f6" +checksum = "ffaed4f9a234ba5225d8e64eac7b4a5d13b994aeb37353cde2cbeb3febda9eaa" dependencies = [ "addr2line 0.17.0", "anyhow", @@ -13945,9 +14200,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "6.0.1" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0245e8a9347017c7185a72e215218a802ff561545c242953c11ba00fccc930f" +checksum = "eed41cbcbf74ce3ff6f1d07d1b707888166dc408d1a880f651268f4f7c9194b2" dependencies = [ "object 0.29.0", "once_cell", @@ -13956,9 +14211,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "6.0.1" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67d412e9340ab1c83867051d8d1d7c90aa8c9afc91da086088068e2734e25064" +checksum = "43a28ae1e648461bfdbb79db3efdaee1bca5b940872e4175390f465593a2e54c" dependencies = [ "cfg-if", "libc", @@ -13967,9 +14222,9 @@ dependencies = [ [[package]] name = "wasmtime-runtime" -version = "6.0.1" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d594e791b5fdd4dbaf8cf7ae62f2e4ff85018ce90f483ca6f42947688e48827d" +checksum = "e704b126e4252788ccfc3526d4d4511d4b23c521bf123e447ac726c14545217b" dependencies = [ "anyhow", "cc", @@ -13991,9 +14246,9 @@ dependencies = [ [[package]] name = "wasmtime-types" -version = "6.0.1" +version = "6.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6688d6f96d4dbc1f89fab626c56c1778936d122b5f4ae7a57c2eb42b8d982e2" +checksum = "83e5572c5727c1ee7e8f28717aaa8400e4d22dcbd714ea5457d85b5005206568" dependencies = [ "cranelift-entity", "serde", @@ -14120,7 +14375,7 @@ dependencies = [ "ccm", "curve25519-dalek 3.2.0", "der-parser 8.1.0", - "elliptic-curve", + "elliptic-curve 0.12.3", "hkdf", "hmac 0.12.1", "log", @@ -14132,11 +14387,11 @@ dependencies = [ "rcgen 0.9.3", "ring 0.16.20", "rustls 0.19.1", - "sec1", + "sec1 0.3.0", "serde", "sha1", "sha2 0.10.6", - "signature", + "signature 1.6.4", "subtle", "thiserror", "tokio", @@ -14272,8 +14527,8 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "bitvec", "frame-benchmarking", @@ -14284,7 +14539,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal", + "hex-literal 0.4.1", "log", "pallet-authority-discovery", "pallet-authorship", @@ -14364,8 +14619,8 @@ dependencies = [ [[package]] name = "westend-runtime-constants" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "frame-support", "polkadot-primitives", @@ -14453,12 +14708,12 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm", + "windows_aarch64_gnullvm 0.42.1", "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_gnullvm 0.42.1", "windows_x86_64_msvc 0.42.1", ] @@ -14468,7 +14723,16 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets", + "windows-targets 0.42.1", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", ] [[package]] @@ -14477,21 +14741,42 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" dependencies = [ - "windows_aarch64_gnullvm", + "windows_aarch64_gnullvm 0.42.1", "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_gnullvm 0.42.1", "windows_x86_64_msvc 0.42.1", ] +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + [[package]] name = "windows_aarch64_msvc" version = "0.34.0" @@ -14504,6 +14789,12 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + [[package]] name = "windows_i686_gnu" version = "0.34.0" @@ -14516,6 +14807,12 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + [[package]] name = "windows_i686_msvc" version = "0.34.0" @@ -14528,6 +14825,12 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + [[package]] name = "windows_x86_64_gnu" version = "0.34.0" @@ -14540,12 +14843,24 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + [[package]] name = "windows_x86_64_msvc" version = "0.34.0" @@ -14558,11 +14873,17 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + [[package]] name = "winnow" -version = "0.3.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf09497b8f8b5ac5d3bb4d05c0a99be20f26fd3d5f2db7b0716e946d5103658" +checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" dependencies = [ "memchr", ] @@ -14646,8 +14967,8 @@ dependencies = [ [[package]] name = "xcm" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "bounded-collections", "derivative", @@ -14662,8 +14983,8 @@ dependencies = [ [[package]] name = "xcm-builder" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "frame-support", "frame-system", @@ -14683,8 +15004,8 @@ dependencies = [ [[package]] name = "xcm-executor" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "environmental", "frame-benchmarking", @@ -14703,19 +15024,19 @@ dependencies = [ [[package]] name = "xcm-procedural" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] name = "xcm-simulator" -version = "0.9.41" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.41#e203bfb396ed949f102720debf32fb98166787af" +version = "0.9.42" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.42#9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef" dependencies = [ "frame-support", "parity-scale-codec", @@ -14794,7 +15115,16 @@ version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ - "zstd-safe", + "zstd-safe 5.0.2+zstd.1.5.2", +] + +[[package]] +name = "zstd" +version = "0.12.3+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" +dependencies = [ + "zstd-safe 6.0.5+zstd.1.5.4", ] [[package]] @@ -14807,6 +15137,16 @@ dependencies = [ "zstd-sys", ] +[[package]] +name = "zstd-safe" +version = "6.0.5+zstd.1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b" +dependencies = [ + "libc", + "zstd-sys", +] + [[package]] name = "zstd-sys" version = "2.0.7+zstd.1.5.4" diff --git a/crates/phala-mq/Cargo.toml b/crates/phala-mq/Cargo.toml index 628b292f..fb86faa6 100644 --- a/crates/phala-mq/Cargo.toml +++ b/crates/phala-mq/Cargo.toml @@ -12,7 +12,7 @@ hex = { version = "0.4.3", default-features = false, features = ['alloc'] } derive_more = { version = "0.99", default-features = false, features = ["display"] } parity-scale-codec = { version = "3.3", default-features = false, features = ["derive"] } scale-info = { version = "2.3", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } serde = { version = "1.0", default-features = false, features = ["derive"] } spin = { version = "0.9", default-features = false, features = ["mutex", "use_ticket_mutex"], optional = true } diff --git a/crates/phala-node-rpc-ext/Cargo.toml b/crates/phala-node-rpc-ext/Cargo.toml index 7942dcea..c1ebad68 100644 --- a/crates/phala-node-rpc-ext/Cargo.toml +++ b/crates/phala-node-rpc-ext/Cargo.toml @@ -19,14 +19,14 @@ codec = { package = "parity-scale-codec", version = "3.3" } scale-info = { version = "2.3", default-features = false } # primitives -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } # client dependencies -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } phala-mq = { path = "../../crates/phala-mq" } phala-pallets = { path = "../../pallets/phala" } diff --git a/crates/phala-pallet-common/Cargo.toml b/crates/phala-pallet-common/Cargo.toml index 0b31b3f3..73aae0cf 100644 --- a/crates/phala-pallet-common/Cargo.toml +++ b/crates/phala-pallet-common/Cargo.toml @@ -13,25 +13,25 @@ codec = { package = "parity-scale-codec", version = "3.0", default-features = fa scale-info = { version = "2.0", default-features = false, features = ["derive", "serde", "decode"] } # Substrate -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } # Polkadot -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } # Polkadot -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } [features] default = ["std"] diff --git a/crates/phala-serde-more/Cargo.toml b/crates/phala-serde-more/Cargo.toml index 79a97780..0b0cd36e 100644 --- a/crates/phala-serde-more/Cargo.toml +++ b/crates/phala-serde-more/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] serde = { version = "1.0.130", default-features = false, features = ["derive", "alloc"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } scale = { package = "parity-scale-codec", version = "3.3", default-features = false } hex = { version = "0.4.3", default-features = false, features = ["alloc"] } diff --git a/crates/phala-trie-storage/Cargo.toml b/crates/phala-trie-storage/Cargo.toml index 86b7e99c..146bd67e 100644 --- a/crates/phala-trie-storage/Cargo.toml +++ b/crates/phala-trie-storage/Cargo.toml @@ -10,9 +10,9 @@ repository = "https://github.com/Phala-Network/phala-blockchain" [dependencies] parity-scale-codec = { version = "3.3", default-features = false } scale-info = { version = "2.3", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", features = ["full_crypto"] } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", features = ["full_crypto"] } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } serde = { version = "1.0", default-features = false, features = ["derive", "alloc"], optional = true } hash-db = "0.16.0" @@ -21,8 +21,8 @@ im = { version = "15", features = ["serde"] } log = "0.4" [dev-dependencies] -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", features = ["full_crypto"] } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", features = ["full_crypto"] } hash256-std-hasher = { version = "0.15", default-features = false } hex = "0.4" serde_json = "1.0" diff --git a/crates/phala-types/Cargo.toml b/crates/phala-types/Cargo.toml index 1246ab9e..cdaeb815 100644 --- a/crates/phala-types/Cargo.toml +++ b/crates/phala-types/Cargo.toml @@ -9,7 +9,7 @@ hex = { version = "0.4", default-features = false, features = ["alloc"] } serde = { version = "1.0.101", default-features = false, optional = true } codec = { package = "parity-scale-codec", version = "3.3", default-features = false, features = ["full"] } scale-info = { version = "2.3", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } phala-mq = { path = "../../crates/phala-mq", default-features = false } prpc = { path = "../../crates/prpc", default-features = false } diff --git a/node/Cargo.toml b/node/Cargo.toml index 504684c4..70313226 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -20,7 +20,7 @@ async-trait = "0.1.66" clap = { version = "4.1.18", features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0" } futures = "0.3.27" -hex-literal = "0.3.4" +hex-literal = "0.4.1" log = "0.4.17" thiserror = "1.0" serde = { version = "1.0.144", features = ["derive"] } @@ -39,80 +39,80 @@ shell-parachain-runtime = { path = "../runtime/shell", package = "shell-runtime" pallet-mq-runtime-api = { path = "../pallets/phala/mq-runtime-api" } phala-node-rpc-ext = { path = "../crates/phala-node-rpc-ext" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", optional = true } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", optional = true } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", package = "substrate-frame-rpc-system" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", package = "substrate-frame-rpc-system" } # RMRK dependencies -pallet-rmrk-core = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41" } -pallet-rmrk-equip = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41" } -rmrk-traits = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41" } -pallet-rmrk-rpc-runtime-api = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41" } -pallet-rmrk-rpc = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41" } +pallet-rmrk-core = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42" } +pallet-rmrk-equip = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42" } +rmrk-traits = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42" } +pallet-rmrk-rpc-runtime-api = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42" } +pallet-rmrk-rpc = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } # Substrate Client Dependencies -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-storage-monitor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-network-sync = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-storage-monitor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-network-sync = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } # Substrate Primitive Dependencies -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } # Cumulus dependencies -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41" } -cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } # Polkadot dependencies -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } # Sygma -sygma-rpc = { git = "https://github.com/Phala-Network/sygma-substrate-pallets", branch = "polkadot-v0.9.41" } -sygma-runtime-api = { git = "https://github.com/Phala-Network/sygma-substrate-pallets", branch = "polkadot-v0.9.41" } +sygma-rpc = { git = "https://github.com/sygmaprotocol/sygma-substrate-pallets", branch = "polkadot-v0.9.42" } +sygma-runtime-api = { git = "https://github.com/sygmaprotocol/sygma-substrate-pallets", branch = "polkadot-v0.9.42" } [build-dependencies] -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } [features] default = ["all-runtimes"] diff --git a/node/src/service/mod.rs b/node/src/service/mod.rs index f0d69e38..43522ce1 100644 --- a/node/src/service/mod.rs +++ b/node/src/service/mod.rs @@ -26,7 +26,7 @@ use cumulus_client_service::{ use cumulus_relay_chain_interface::RelayChainInterface; use cumulus_primitives_core::ParaId; -use sc_executor::WasmExecutor; +use sc_executor::{HeapAllocStrategy, WasmExecutor, DEFAULT_HEAP_ALLOC_STRATEGY}; use sc_consensus::ImportQueue; use sc_network::NetworkBlock; use sc_network_sync::SyncingService; @@ -35,7 +35,7 @@ use sc_service::{ }; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; use sp_api::ConstructRuntimeApi; -use sp_keystore::SyncCryptoStorePtr; +use sp_keystore::KeystorePtr; use sp_runtime::traits::BlakeTwo256; use substrate_prometheus_endpoint::Registry; @@ -125,13 +125,17 @@ where }) .transpose()?; - let executor = sc_executor::WasmExecutor::::new( - config.wasm_method, - config.default_heap_pages, - config.max_runtime_instances, - None, - config.runtime_cache_size, - ); + let heap_pages = config + .default_heap_pages + .map_or(DEFAULT_HEAP_ALLOC_STRATEGY, |h| HeapAllocStrategy::Static { extra_pages: h as _ }); + + let executor = sc_executor::WasmExecutor::::builder() + .with_execution_method(config.wasm_method) + .with_max_runtime_instances(config.max_runtime_instances) + .with_runtime_cache_size(config.runtime_cache_size) + .with_onchain_heap_alloc_strategy(heap_pages) + .with_offchain_heap_alloc_strategy(heap_pages) + .build(); let (client, backend, keystore_container, task_manager) = sc_service::new_full_parts::( @@ -268,7 +272,7 @@ where Arc, Arc>>, Arc>, - SyncCryptoStorePtr, + KeystorePtr, bool, ) -> Result>, sc_service::Error>, { @@ -341,7 +345,7 @@ where transaction_pool: transaction_pool.clone(), task_manager: &mut task_manager, config: parachain_config, - keystore: params.keystore_container.sync_keystore(), + keystore: params.keystore_container.keystore(), backend: backend.clone(), network: network.clone(), sync_service: sync_service.clone(), @@ -383,8 +387,8 @@ where &task_manager, relay_chain_interface.clone(), transaction_pool, - sync_service, - params.keystore_container.sync_keystore(), + sync_service.clone(), + params.keystore_container.keystore(), force_authoring, )?; @@ -403,6 +407,7 @@ where collator_key: collator_key.expect("Command line arguments do not allow this. qed"), relay_chain_slot_duration, recovery_handle: Box::new(overseer_handle), + sync_service, }; start_collator(params).await?; @@ -416,6 +421,7 @@ where relay_chain_slot_duration, import_queue: import_queue_service, recovery_handle: Box::new(overseer_handle), + sync_service, }; start_full_node(params)?; diff --git a/node/src/service/shell.rs b/node/src/service/shell.rs index 9cb08af2..68694a38 100644 --- a/node/src/service/shell.rs +++ b/node/src/service/shell.rs @@ -19,7 +19,7 @@ use sc_service::{ }; use sc_telemetry::TelemetryHandle; use sp_api::ConstructRuntimeApi; -use sp_keystore::SyncCryptoStorePtr; +use sp_keystore::KeystorePtr; use sp_runtime::traits::BlakeTwo256; use substrate_prometheus_endpoint::Registry; @@ -120,7 +120,7 @@ async fn start_node_impl( Arc, Arc>>, Arc>, - SyncCryptoStorePtr, + KeystorePtr, bool, ) -> Result>, sc_service::Error>, { @@ -172,7 +172,7 @@ async fn start_node_impl( transaction_pool: transaction_pool.clone(), task_manager: &mut task_manager, config: parachain_config, - keystore: params.keystore_container.sync_keystore(), + keystore: params.keystore_container.keystore(), backend: backend.clone(), network: network.clone(), sync_service: sync_service.clone(), @@ -214,8 +214,8 @@ async fn start_node_impl( &task_manager, relay_chain_interface.clone(), transaction_pool, - sync_service, - params.keystore_container.sync_keystore(), + sync_service.clone(), + params.keystore_container.keystore(), force_authoring, )?; @@ -234,6 +234,7 @@ async fn start_node_impl( collator_key: collator_key.expect("Command line arguments do not allow this. qed"), relay_chain_slot_duration, recovery_handle: Box::new(overseer_handle), + sync_service, }; start_collator(params).await?; @@ -247,6 +248,7 @@ async fn start_node_impl( relay_chain_slot_duration, import_queue: import_queue_service, recovery_handle: Box::new(overseer_handle), + sync_service, }; start_full_node(params)?; diff --git a/pallets/assets-registry/Cargo.toml b/pallets/assets-registry/Cargo.toml index 0c47e523..d55a3671 100644 --- a/pallets/assets-registry/Cargo.toml +++ b/pallets/assets-registry/Cargo.toml @@ -10,34 +10,34 @@ repository = "https://github.com/Phala-Network/phala-blockchain" codec = { package = "parity-scale-codec", version = "3.0", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.0", default-features = false, features = ["derive", "serde", "decode"] } log = { version = "0.4.14", default-features = false } -hex-literal = "0.3.1" +hex-literal = "0.4.1" fixed = {version = "1.23.0", default-features = false } # Substrate -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false, optional = true } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-uniques = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-uniques = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } # Polkadot -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } # Cumulus -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } # Sygma -sygma-traits = { git = "https://github.com/Phala-Network/sygma-substrate-pallets", branch = "polkadot-v0.9.41", default-features = false } +sygma-traits = { git = "https://github.com/sygmaprotocol/sygma-substrate-pallets", branch = "polkadot-v0.9.42", default-features = false } # Local parachains-common = { path = "../../parachains-common", default-features = false } @@ -45,34 +45,33 @@ phala-pallet-common = { path = "../../crates/phala-pallet-common", default-featu [dev-dependencies] assert_matches = "1.4.0" -hex-literal = "0.3" # Substrate -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } # Polkadot -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } # Cumulus -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41" } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } # Local parachains-common = { path = "../../parachains-common" } diff --git a/pallets/assets-registry/src/lib.rs b/pallets/assets-registry/src/lib.rs index 3584e7c2..48b016ed 100644 --- a/pallets/assets-registry/src/lib.rs +++ b/pallets/assets-registry/src/lib.rs @@ -18,13 +18,13 @@ pub mod pallet { traits::{ tokens::fungibles::{ metadata::Mutate as MetaMutate, Create as FungibleCerate, Mutate as FungibleMutate, - Transfer as FungibleTransfer, }, ContainsPair, }, traits::{Currency, ExistenceRequirement, StorageVersion}, transactional, PalletId, }; + use frame_support::traits::tokens::{Fortitude, Precision, Preservation}; use frame_system::pallet_prelude::*; use phala_pallet_common::WrapSlice; use scale_info::TypeInfo; @@ -539,7 +539,7 @@ pub mod pallet { /// Force withdraw some amount of assets from ASSETS_REGISTRY_ID, if the given asset_id is None, /// would performance withdraw PHA from this account #[pallet::call_index(0)] - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] #[transactional] pub fn force_withdraw_fund( origin: OriginFor, @@ -550,12 +550,12 @@ pub mod pallet { T::RegistryCommitteeOrigin::ensure_origin(origin)?; let fund_account = ASSETS_REGISTRY_ID.into_account_truncating(); if let Some(asset_id) = asset_id { - as FungibleTransfer>::transfer( + as FungibleMutate>::transfer( asset_id, &fund_account, &recipient, amount.into(), - true, + Preservation::Expendable, ) .map_err(|_| Error::::FailedToTransactAsset)?; } else { @@ -570,7 +570,7 @@ pub mod pallet { } #[pallet::call_index(1)] - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] #[transactional] pub fn force_register_asset( origin: OriginFor, @@ -634,7 +634,7 @@ pub mod pallet { /// will not success anymore, we should call pallet_assets::destory() manually /// if we want to delete this asset from our chain #[pallet::call_index(2)] - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] #[transactional] pub fn force_unregister_asset( origin: OriginFor, @@ -685,7 +685,7 @@ pub mod pallet { } #[pallet::call_index(3)] - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] #[transactional] pub fn force_set_metadata( origin: OriginFor, @@ -710,7 +710,7 @@ pub mod pallet { } #[pallet::call_index(4)] - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] #[transactional] pub fn force_mint( origin: OriginFor, @@ -734,7 +734,7 @@ pub mod pallet { } #[pallet::call_index(5)] - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] #[transactional] pub fn force_burn( origin: OriginFor, @@ -745,7 +745,7 @@ pub mod pallet { T::RegistryCommitteeOrigin::ensure_origin(origin.clone())?; as FungibleMutate>::burn_from( - asset_id, &who, amount, + asset_id, &who, amount, Precision::BestEffort, Fortitude::Force )?; Self::deposit_event(Event::ForceBurnt { asset_id, @@ -756,7 +756,7 @@ pub mod pallet { } #[pallet::call_index(6)] - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] #[transactional] pub fn force_set_price( origin: OriginFor, @@ -773,7 +773,7 @@ pub mod pallet { } #[pallet::call_index(7)] - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] #[transactional] pub fn force_set_location( origin: OriginFor, @@ -829,7 +829,7 @@ pub mod pallet { } #[pallet::call_index(8)] - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] #[transactional] pub fn force_enable_chainbridge( origin: OriginFor, @@ -879,7 +879,7 @@ pub mod pallet { } #[pallet::call_index(9)] - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] #[transactional] pub fn force_disable_chainbridge( origin: OriginFor, @@ -925,7 +925,7 @@ pub mod pallet { } #[pallet::call_index(10)] - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] #[transactional] pub fn force_enable_sygmabridge( origin: OriginFor, @@ -963,7 +963,7 @@ pub mod pallet { } #[pallet::call_index(11)] - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] #[transactional] pub fn force_disable_sygmabridge( origin: OriginFor, diff --git a/pallets/assets-registry/src/mock.rs b/pallets/assets-registry/src/mock.rs index a9c53e0a..ec076f82 100644 --- a/pallets/assets-registry/src/mock.rs +++ b/pallets/assets-registry/src/mock.rs @@ -88,6 +88,10 @@ impl pallet_balances::Config for Test { type MaxLocks = (); type MaxReserves = (); type ReserveIdentifier = [u8; 8]; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<1>; + type MaxFreezes = ConstU32<1>; } parameter_types! { diff --git a/pallets/index/Cargo.toml b/pallets/index/Cargo.toml index 5b9ef0b5..07d0afaa 100644 --- a/pallets/index/Cargo.toml +++ b/pallets/index/Cargo.toml @@ -10,24 +10,24 @@ repository = "https://github.com/Phala-Network/phala-blockchain" codec = { package = "parity-scale-codec", version = "3.0", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.0", default-features = false, features = ["derive", "serde", "decode"] } log = { version = "0.4.14", default-features = false } -hex-literal = "0.3.1" +hex-literal = "0.4.1" # Substrate -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false, optional = true } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } # Polkadot -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } # Local assets-registry = { path = "../assets-registry", default-features = false } @@ -35,16 +35,15 @@ pallet-parachain-info = { path = "../parachain-info", default-features = false } [dev-dependencies] assert_matches = "1.4.0" -hex-literal = "0.3" # Substrate -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } pallet-parachain-info = { path = "../../pallets/parachain-info" } diff --git a/pallets/index/src/lib.rs b/pallets/index/src/lib.rs index 6f5403cf..8816fa62 100644 --- a/pallets/index/src/lib.rs +++ b/pallets/index/src/lib.rs @@ -103,7 +103,7 @@ pub mod pallet { where T::AccountId: Into<[u8; 32]> + From<[u8; 32]>, { - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] #[pallet::call_index(0)] #[transactional] pub fn force_add_worker(origin: OriginFor, worker: T::AccountId) -> DispatchResult { @@ -117,7 +117,7 @@ pub mod pallet { Ok(()) } - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] #[pallet::call_index(1)] #[transactional] pub fn force_remove_worker(origin: OriginFor, worker: T::AccountId) -> DispatchResult { @@ -128,7 +128,7 @@ pub mod pallet { Ok(()) } - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] #[pallet::call_index(2)] #[transactional] pub fn deposit_task( @@ -186,7 +186,7 @@ pub mod pallet { } /// Claim the oldest task that saved in actived task queue - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] #[pallet::call_index(3)] #[transactional] pub fn claim_task(origin: OriginFor, task_id: TaskId) -> DispatchResult { @@ -229,7 +229,7 @@ pub mod pallet { Ok(()) } - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] #[pallet::call_index(4)] #[transactional] pub fn claim_all_task(origin: OriginFor) -> DispatchResult { diff --git a/pallets/index/src/mock.rs b/pallets/index/src/mock.rs index eb1e39c3..f7a7576b 100644 --- a/pallets/index/src/mock.rs +++ b/pallets/index/src/mock.rs @@ -95,6 +95,10 @@ impl pallet_balances::Config for Test { type MaxLocks = (); type MaxReserves = (); type ReserveIdentifier = [u8; 8]; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<1>; + type MaxFreezes = ConstU32<1>; } parameter_types! { diff --git a/pallets/parachain-info/Cargo.toml b/pallets/parachain-info/Cargo.toml index 02b8d794..bc761a03 100644 --- a/pallets/parachain-info/Cargo.toml +++ b/pallets/parachain-info/Cargo.toml @@ -8,10 +8,10 @@ version = "0.1.0" codec = { package = "parity-scale-codec", version = "3.0", default-features = false, features = ["derive"] } scale-info = { version = "2.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } [features] default = ["std"] diff --git a/pallets/phala-world/Cargo.toml b/pallets/phala-world/Cargo.toml index 1e6aae9a..ce19ee68 100644 --- a/pallets/phala-world/Cargo.toml +++ b/pallets/phala-world/Cargo.toml @@ -16,28 +16,28 @@ serde = { version = "1.0.111", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0", default-features = false, features = ["derive"] } scale-info = { version = "2.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true } -pallet-uniques = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +pallet-uniques = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } # RMRK dependencies -pallet-rmrk-core = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-rmrk-equip = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-rmrk-market = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } -rmrk-traits = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } +pallet-rmrk-core = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-rmrk-equip = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-rmrk-market = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } +rmrk-traits = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } [dev-dependencies] -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } [features] default = ["std"] diff --git a/pallets/phala-world/src/incubation.rs b/pallets/phala-world/src/incubation.rs index 7acc7228..feaffdd0 100644 --- a/pallets/phala-world/src/incubation.rs +++ b/pallets/phala-world/src/incubation.rs @@ -557,7 +557,7 @@ pub mod pallet { /// `origin`: Expected to be the `Overlord` account /// `status`: `bool` value to set for the status in storage #[pallet::call_index(3)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn set_can_start_incubation_status( origin: OriginFor, status: bool, @@ -589,7 +589,7 @@ pub mod pallet { /// - `origin` - Expected Overlord admin account to set the Shell Collection ID /// - `collection_id` - Collection ID of the Shell Collection #[pallet::call_index(4)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn set_shell_collection_id( origin: OriginFor, collection_id: CollectionId, @@ -615,7 +615,7 @@ pub mod pallet { /// - `origin` - Expected Overlord admin account to set the Shell Parts Collection ID /// - `collection_id` - Collection ID of the Shell Parts Collection #[pallet::call_index(5)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn set_shell_parts_collection_id( origin: OriginFor, collection_id: CollectionId, @@ -643,7 +643,7 @@ pub mod pallet { /// - `nft_id` - NFT ID of the Origin of Shell /// - `chosen_parts` - Shell parts to be stored in Storage #[pallet::call_index(6)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn set_origin_of_shell_chosen_parts( origin: OriginFor, collection_id: CollectionId, diff --git a/pallets/phala-world/src/marketplace.rs b/pallets/phala-world/src/marketplace.rs index 9a670b44..95ba711e 100644 --- a/pallets/phala-world/src/marketplace.rs +++ b/pallets/phala-world/src/marketplace.rs @@ -76,7 +76,7 @@ pub mod pallet { /// - `origin`: Expected to be called by Overlord admin account. /// - `new_marketplace_owner`: New `T::AccountId` of the new martketplace owner. #[pallet::call_index(0)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn set_marketplace_owner( origin: OriginFor, new_marketplace_owner: T::AccountId, @@ -107,7 +107,7 @@ pub mod pallet { /// - `collection_id`: `T::CollectionId` of the PhalaWorld NFT collection. /// - `nft_ids`: `BoundedVec` NFT IDs to update in a collection bounded by T::IterLimit. #[pallet::call_index(1)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn set_nfts_royalty_info( origin: OriginFor, royalty_info: RoyaltyInfo, diff --git a/pallets/phala-world/src/mock.rs b/pallets/phala-world/src/mock.rs index a3c00d55..c3ddc03a 100644 --- a/pallets/phala-world/src/mock.rs +++ b/pallets/phala-world/src/mock.rs @@ -90,6 +90,10 @@ impl pallet_balances::Config for Test { type MaxLocks = (); type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<1>; + type MaxFreezes = ConstU32<1>; } parameter_types! { diff --git a/pallets/phala-world/src/nft_sale.rs b/pallets/phala-world/src/nft_sale.rs index 4280dadf..f1d8cf93 100644 --- a/pallets/phala-world/src/nft_sale.rs +++ b/pallets/phala-world/src/nft_sale.rs @@ -861,7 +861,7 @@ pub mod pallet { /// - origin: Expected to be called by `GovernanceOrigin` /// - new_overlord: T::AccountId #[pallet::call_index(8)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn set_overlord( origin: OriginFor, new_overlord: T::AccountId, @@ -885,7 +885,7 @@ pub mod pallet { /// Parameters: /// `origin`: Expected to be called by `Overlord` admin account #[pallet::call_index(9)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn initialize_world_clock(origin: OriginFor) -> DispatchResultWithPostInfo { // Ensure Overlord account makes call let sender = ensure_signed(origin)?; @@ -913,7 +913,7 @@ pub mod pallet { /// - `status` - `bool` to set the status to /// - `status_type` - `StatusType` to set the status for #[pallet::call_index(10)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn set_status_type( origin: OriginFor, status: bool, @@ -947,7 +947,7 @@ pub mod pallet { /// Parameters: /// - `origin` - Expected Overlord admin account #[pallet::call_index(11)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn init_rarity_type_counts(origin: OriginFor) -> DispatchResult { // Ensure Overlord account makes call let sender = ensure_signed(origin)?; @@ -970,7 +970,7 @@ pub mod pallet { /// - `giveaway_count` - Number of Origin of Shells for giveaways /// - `reserve_count` - Number of Origin of Shells to be reserved #[pallet::call_index(12)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn update_rarity_type_counts( origin: OriginFor, rarity_type: RarityType, @@ -1022,7 +1022,7 @@ pub mod pallet { /// - `origin` - Expected Overlord admin account to set the Spirit Collection ID /// - `collection_id` - Collection ID of the Spirit Collection #[pallet::call_index(13)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn set_spirit_collection_id( origin: OriginFor, collection_id: CollectionId, @@ -1048,7 +1048,7 @@ pub mod pallet { /// - `origin` - Expected Overlord admin account to set the Origin of Shell Collection ID /// - `collection_id` - Collection ID of the Origin of Shell Collection #[pallet::call_index(14)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn set_origin_of_shell_collection_id( origin: OriginFor, collection_id: CollectionId, @@ -1110,7 +1110,7 @@ pub mod pallet { /// - `origin`: Expected to be called from the Overlord account /// - `spirits_metadata`: `BoundedVec` to be added in storage #[pallet::call_index(16)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn set_spirits_metadata( origin: OriginFor, spirits_metadata: BoundedVec, @@ -1134,7 +1134,7 @@ pub mod pallet { /// - `origin`: Expected to be called from the Overlord account /// - `origin_of_shells_metadata`: A Vec of `((RaceType, CareerType), BoundedVec>)` to be added in storage #[pallet::call_index(17)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn set_origin_of_shells_metadata( origin: OriginFor, origin_of_shells_metadata: Vec<(RaceType, BoundedVec)>, @@ -1161,7 +1161,7 @@ pub mod pallet { /// - origin: Expected to be called by `Overlord`. /// - new_payee: T::AccountId of the Payee account. #[pallet::call_index(18)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn set_payee( origin: OriginFor, new_payee: T::AccountId, @@ -1186,7 +1186,7 @@ pub mod pallet { /// - origin: Expected to be called by `Overlord`. /// - new_signer: T::AccountId of the Signer. #[pallet::call_index(19)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn set_signer( origin: OriginFor, new_signer: T::AccountId, diff --git a/pallets/phala-world/src/tests.rs b/pallets/phala-world/src/tests.rs index 407c5c63..cce5d899 100644 --- a/pallets/phala-world/src/tests.rs +++ b/pallets/phala-world/src/tests.rs @@ -10,7 +10,7 @@ use frame_support::bounded_vec; use frame_support::{assert_noop, assert_ok, error::BadOrigin, traits::Currency}; use rmrk_traits::RoyaltyInfo; use sp_core::{crypto::AccountId32, sr25519, Pair}; -use sp_runtime::{BoundedVec, Permill}; +use sp_runtime::{DispatchError::Token, TokenError::FundsUnavailable, BoundedVec, Permill}; use crate::incubation::{ShellPartInfoOf, ShellPartsOf}; use crate::traits::{ @@ -557,7 +557,7 @@ fn purchase_rare_origin_of_shell_works() { RaceType::Cyborg, CareerType::HardwareDruid, ), - pallet_balances::Error::::InsufficientBalance + Token(FundsUnavailable) ); // BOB purchases Magic Origin of Shell assert_ok!(PWNftSale::buy_rare_origin_of_shell( diff --git a/pallets/phala/Cargo.toml b/pallets/phala/Cargo.toml index 48be61b4..0dba9e4e 100644 --- a/pallets/phala/Cargo.toml +++ b/pallets/phala/Cargo.toml @@ -15,34 +15,34 @@ codec = { package = "parity-scale-codec", version = "3.3", default-features = fa scale-info = { version = "2.3", default-features = false, features = ["derive"] } primitive-types = { version = "0.12.1", default-features = false, features = ["codec", "byteorder"] } -pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-uniques = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-uniques = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } # RMRK dependencies -pallet-rmrk-core = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } -rmrk-traits = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } +pallet-rmrk-core = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } +rmrk-traits = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true } log = { version = "0.4.14", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } phala-types = { path = "../../crates/phala-types", default-features = false } chrono = { version = "0.4.22", default-features = false } untrusted = { version = "0.9.0" } base64 = { version = "0.13.0", default-features = false, features = ["alloc"] } hex = { version = "0.4", default-features = false } -hex-literal = "0.3.4" +hex-literal = "0.4.1" serde_json = { version = "1.0.41", default-features = false, features = ["alloc"] } fixed = { version = "1.16.1", default-features = false } fixed-macro = "1.2" @@ -55,13 +55,13 @@ webpki = { version = "0.22", default-features = false, features = ["alloc"] } webpki_wasm = { package = "webpki", path = "../../vendor/webpki", default-features = false, features = ["alloc"] } [dev-dependencies] -frame-support-test = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } +frame-support-test = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } assert_matches = "1.4.0" -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } rand = "0.8.5" insta = "1" -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } [features] default = ["std"] diff --git a/pallets/phala/mq-runtime-api/Cargo.toml b/pallets/phala/mq-runtime-api/Cargo.toml index 41ec6449..91f81f97 100644 --- a/pallets/phala/mq-runtime-api/Cargo.toml +++ b/pallets/phala/mq-runtime-api/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } phala-mq = { path = "../../../crates/phala-mq", default-features = false } [features] diff --git a/pallets/phala/src/compute/base_pool.rs b/pallets/phala/src/compute/base_pool.rs index 300debbb..6e5da8ac 100644 --- a/pallets/phala/src/compute/base_pool.rs +++ b/pallets/phala/src/compute/base_pool.rs @@ -25,7 +25,7 @@ pub mod pallet { use frame_support::{ pallet_prelude::*, traits::{ - tokens::fungibles::Transfer, tokens::nonfungibles::InspectEnumerable, StorageVersion, + tokens::fungibles::Mutate, tokens::nonfungibles::InspectEnumerable, StorageVersion, UnixTime, }, }; @@ -33,6 +33,7 @@ pub mod pallet { use crate::balance_convert::{div as bdiv, mul as bmul, FixedPointConvert}; use fixed::types::U64F64 as FixedPoint; use fixed_macro::types::U64F64 as fp; + use frame_support::traits::tokens::Preservation; use sp_runtime::{ traits::{CheckedSub, Member, TrailingZeroInput, Zero}, SaturatedConversion, @@ -431,7 +432,7 @@ pub mod pallet { /// If a pool hasn't registed in the wihtelist map, any staker could contribute as what they use to do. /// The whitelist has a lmit len of 100 stakers. #[pallet::call_index(0)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn add_staker_to_whitelist( origin: OriginFor, pid: u64, @@ -470,7 +471,7 @@ pub mod pallet { /// /// The caller must be the owner of the pool. #[pallet::call_index(1)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn set_pool_description( origin: OriginFor, pid: u64, @@ -490,7 +491,7 @@ pub mod pallet { } #[pallet::call_index(2)] - #[pallet::weight(0)] + #[pallet::weight({0})] #[frame_support::transactional] pub fn reset_lock_iter_pos(origin: OriginFor) -> DispatchResult { let who = ensure_signed(origin)?; @@ -500,7 +501,7 @@ pub mod pallet { } #[pallet::call_index(3)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn remove_unused_lock(origin: OriginFor, max_iterations: u32) -> DispatchResult { let who = ensure_signed(origin)?; Self::ensure_migration_root(who)?; @@ -543,7 +544,7 @@ pub mod pallet { /// The caller must be the owner of the pool. /// If the last staker in the whitelist is removed, the pool will return back to a normal pool that allow anyone to contribute. #[pallet::call_index(4)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn remove_staker_from_whitelist( origin: OriginFor, pid: u64, @@ -783,12 +784,12 @@ pub mod pallet { .expect("mint should always success; qed."); pool.total_shares += shares; pool.total_value += amount; - as Transfer>::transfer( + as Mutate>::transfer( ::WPhaAssetId::get(), &account_id, &pool.pool_account_id, amount, - false, + Preservation::Expendable, ) .expect("transfer should not fail"); shares @@ -814,12 +815,12 @@ pub mod pallet { let (total_stake, _) = extract_dust(pool.total_value - amount); - as Transfer>::transfer( + as Mutate>::transfer( ::WPhaAssetId::get(), &pool.pool_account_id, userid, amount, - false, + Preservation::Expendable, ) .expect("transfer should not fail"); diff --git a/pallets/phala/src/compute/computation.rs b/pallets/phala/src/compute/computation.rs index 746a2394..002a6136 100644 --- a/pallets/phala/src/compute/computation.rs +++ b/pallets/phala/src/compute/computation.rs @@ -477,7 +477,7 @@ pub mod pallet { /// /// Can only be called by root. #[pallet::call_index(0)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn set_cool_down_expiration(origin: OriginFor, period: u64) -> DispatchResult { ensure_root(origin)?; @@ -491,7 +491,7 @@ pub mod pallet { /// It will trigger a force stop of computing if the worker is still in computing state. Anyone /// can call it. #[pallet::call_index(1)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn unbind(origin: OriginFor, session: T::AccountId) -> DispatchResult { let who = ensure_signed(origin)?; let pubkey = Self::ensure_session_bound(&session)?; @@ -507,7 +507,7 @@ pub mod pallet { /// /// Only for integration test. #[pallet::call_index(2)] - #[pallet::weight(1)] + #[pallet::weight(Weight::from_parts(1, 0))] pub fn force_heartbeat(origin: OriginFor) -> DispatchResult { ensure_root(origin)?; Self::push_message(SystemEvent::HeartbeatChallenge(HeartbeatChallenge { @@ -521,7 +521,7 @@ pub mod pallet { /// /// Only for integration test. #[pallet::call_index(3)] - #[pallet::weight(1)] + #[pallet::weight(Weight::from_parts(1, 0))] pub fn force_start_computing( origin: OriginFor, session: T::AccountId, @@ -536,7 +536,7 @@ pub mod pallet { /// /// Only for integration test. #[pallet::call_index(4)] - #[pallet::weight(1)] + #[pallet::weight(Weight::from_parts(1, 0))] pub fn force_stop_computing(origin: OriginFor, session: T::AccountId) -> DispatchResult { ensure_root(origin)?; Self::stop_computing(session)?; @@ -547,7 +547,7 @@ pub mod pallet { /// /// Can only be called by the tokenomic admin. #[pallet::call_index(5)] - #[pallet::weight(1)] + #[pallet::weight(Weight::from_parts(1, 0))] pub fn update_tokenomic( origin: OriginFor, new_params: TokenomicParams, @@ -565,7 +565,7 @@ pub mod pallet { /// /// Can only be called by root. #[pallet::call_index(6)] - #[pallet::weight(1)] + #[pallet::weight(Weight::from_parts(1, 0))] pub fn set_heartbeat_paused(origin: OriginFor, paused: bool) -> DispatchResult { T::GovernanceOrigin::ensure_origin(origin)?; HeartbeatPaused::::put(paused); @@ -573,7 +573,7 @@ pub mod pallet { } #[pallet::call_index(7)] - #[pallet::weight(1)] + #[pallet::weight(Weight::from_parts(1, 0))] #[frame_support::transactional] pub fn set_budget_per_block( origin: OriginFor, @@ -606,7 +606,7 @@ pub mod pallet { } #[pallet::call_index(8)] - #[pallet::weight(1)] + #[pallet::weight(Weight::from_parts(1, 0))] pub fn update_contract_root( origin: OriginFor, account_id: AccountId32, diff --git a/pallets/phala/src/compute/stake_pool_v2.rs b/pallets/phala/src/compute/stake_pool_v2.rs index 4403c4d9..45150410 100644 --- a/pallets/phala/src/compute/stake_pool_v2.rs +++ b/pallets/phala/src/compute/stake_pool_v2.rs @@ -25,7 +25,10 @@ pub mod pallet { dispatch::DispatchResult, pallet_prelude::*, traits::{ - tokens::fungibles::{Inspect, Transfer}, + tokens::{ + fungibles::{Inspect, Mutate}, + Preservation, + }, StorageVersion, UnixTime, }, }; @@ -310,7 +313,7 @@ pub mod pallet { { /// Creates a new stake pool #[pallet::call_index(0)] - #[pallet::weight(0)] + #[pallet::weight({0})] #[frame_support::transactional] pub fn create(origin: OriginFor) -> DispatchResult { let owner = ensure_signed(origin)?; @@ -375,7 +378,7 @@ pub mod pallet { /// 1. The worker is registered and benchmarked /// 2. The worker is not bound a pool #[pallet::call_index(1)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn add_worker( origin: OriginFor, pid: u64, @@ -444,7 +447,7 @@ pub mod pallet { /// 2. The worker is associated with a pool /// 3. The worker is removable (not in computing) #[pallet::call_index(2)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn remove_worker( origin: OriginFor, pid: u64, @@ -484,7 +487,7 @@ pub mod pallet { /// Requires: /// 1. The sender is the owner #[pallet::call_index(3)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn set_cap(origin: OriginFor, pid: u64, cap: BalanceOf) -> DispatchResult { let owner = ensure_signed(origin)?; let mut pool_info = ensure_stake_pool::(pid)?; @@ -512,7 +515,7 @@ pub mod pallet { /// Requires: /// 1. The sender is the owner #[pallet::call_index(4)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn set_payout_pref( origin: OriginFor, pid: u64, @@ -538,7 +541,7 @@ pub mod pallet { } #[pallet::call_index(5)] - #[pallet::weight(0)] + #[pallet::weight({0})] #[frame_support::transactional] pub fn claim_legacy_rewards( origin: OriginFor, @@ -554,7 +557,7 @@ pub mod pallet { } #[pallet::call_index(6)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn backfill_add_missing_reward( origin: OriginFor, input: Vec<(T::AccountId, u64, BalanceOf)>, @@ -575,7 +578,7 @@ pub mod pallet { /// Requires: /// 1. The sender is a pool owner #[pallet::call_index(7)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn claim_owner_rewards( origin: OriginFor, pid: u64, @@ -590,12 +593,12 @@ pub mod pallet { ); let rewards = pool_info.get_owner_stakes::(); ensure!(rewards > Zero::zero(), Error::::NoRewardToClaim); - as Transfer>::transfer( + as Mutate>::transfer( ::WPhaAssetId::get(), &pool_info.owner_reward_account, &target, rewards, - false, + Preservation::Expendable, )?; Self::deposit_event(Event::::OwnerRewardsWithdrawn { pid, @@ -612,7 +615,7 @@ pub mod pallet { /// Note: This function doesn't guarantee no-op when there's error. /// TODO(mingxuan): add more detail comment later. #[pallet::call_index(8)] - #[pallet::weight(0)] + #[pallet::weight({0})] #[frame_support::transactional] pub fn check_and_maybe_force_withdraw(origin: OriginFor, pid: u64) -> DispatchResult { ensure_signed(origin)?; @@ -662,7 +665,7 @@ pub mod pallet { /// 1. The pool exists /// 2. After the deposit, the pool doesn't reach the cap #[pallet::call_index(9)] - #[pallet::weight(0)] + #[pallet::weight({0})] #[frame_support::transactional] pub fn contribute( origin: OriginFor, @@ -759,7 +762,7 @@ pub mod pallet { /// Afer the withdrawal is queued, The withdraw queue will be automaticly consumed util there are not enough free stakes to fullfill withdrawals. /// Everytime the free stakes in the pools increases (except for rewards distributing), the withdraw queue will be consumed as it describes above. #[pallet::call_index(10)] - #[pallet::weight(0)] + #[pallet::weight({0})] #[frame_support::transactional] pub fn withdraw( origin: OriginFor, @@ -833,7 +836,7 @@ pub mod pallet { } #[pallet::call_index(11)] - #[pallet::weight(0)] + #[pallet::weight({0})] #[frame_support::transactional] pub fn reset_iter_pos(origin: OriginFor) -> DispatchResult { let who = ensure_signed(origin)?; @@ -843,7 +846,7 @@ pub mod pallet { } #[pallet::call_index(12)] - #[pallet::weight(0)] + #[pallet::weight({0})] #[frame_support::transactional] pub fn fix_missing_worker_lock( origin: OriginFor, @@ -907,7 +910,7 @@ pub mod pallet { /// 1. The worker is bound to the pool and is in Ready state /// 2. The remaining stake in the pool can cover the minimal stake required #[pallet::call_index(13)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn start_computing( origin: OriginFor, pid: u64, @@ -924,7 +927,7 @@ pub mod pallet { /// Requires: /// 1. There worker is bound to the pool and is in a stoppable state #[pallet::call_index(14)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn stop_computing( origin: OriginFor, pid: u64, @@ -936,7 +939,7 @@ pub mod pallet { /// Reclaims the releasing stake of a worker in a pool. #[pallet::call_index(15)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn reclaim_pool_worker( origin: OriginFor, pid: u64, @@ -950,7 +953,7 @@ pub mod pallet { /// Restarts the worker with a higher stake #[pallet::call_index(17)] - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] #[frame_support::transactional] pub fn restart_computing( origin: OriginFor, @@ -1007,12 +1010,12 @@ pub mod pallet { ); let session: T::AccountId = pool_sub_account(pid, &worker); computation::pallet::Pallet::::start_computing(session, stake)?; - as Transfer>::transfer( + as Mutate>::transfer( ::WPhaAssetId::get(), &pool_info.basepool.pool_account_id, &pool_info.lock_account, stake, - false, + Preservation::Expendable, )?; base_pool::pallet::Pools::::insert(pid, PoolProxy::StakePool(pool_info)); Self::deposit_event(Event::::WorkingStarted { @@ -1140,12 +1143,12 @@ pub mod pallet { } // With the worker being cleaned, those stake now are free - as Transfer>::transfer( + as Mutate>::transfer( ::WPhaAssetId::get(), &pool_info.lock_account, &pool_info.basepool.pool_account_id, returned, - false, + Preservation::Expendable, ) .expect("transfer should not fail"); diff --git a/pallets/phala/src/compute/vault.rs b/pallets/phala/src/compute/vault.rs index ca99515f..9d5db675 100644 --- a/pallets/phala/src/compute/vault.rs +++ b/pallets/phala/src/compute/vault.rs @@ -150,7 +150,7 @@ pub mod pallet { { /// Creates a new vault #[pallet::call_index(0)] - #[pallet::weight(0)] + #[pallet::weight({0})] #[frame_support::transactional] pub fn create(origin: OriginFor) -> DispatchResult { let owner = ensure_signed(origin)?; @@ -207,7 +207,7 @@ pub mod pallet { /// Requires: /// 1. The sender is the owner #[pallet::call_index(1)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn set_payout_pref( origin: OriginFor, pid: u64, @@ -238,7 +238,7 @@ pub mod pallet { /// Requires: /// 1. The sender is the owner #[pallet::call_index(2)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn claim_owner_shares( origin: OriginFor, vault_pid: u64, @@ -290,7 +290,7 @@ pub mod pallet { /// Requires: /// 1. The sender is the owner #[pallet::call_index(3)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn maybe_gain_owner_shares(origin: OriginFor, vault_pid: u64) -> DispatchResult { let who = ensure_signed(origin)?; let mut pool_info = ensure_vault::(vault_pid)?; @@ -336,7 +336,7 @@ pub mod pallet { /// Note: This function doesn't guarantee no-op when there's error. /// TODO(mingxuan): add more detail comment later. #[pallet::call_index(4)] - #[pallet::weight(0)] + #[pallet::weight({0})] #[frame_support::transactional] pub fn check_and_maybe_force_withdraw( origin: OriginFor, @@ -442,7 +442,7 @@ pub mod pallet { /// 1. The pool exists /// 2. After the deposit, the pool doesn't reach the cap #[pallet::call_index(5)] - #[pallet::weight(0)] + #[pallet::weight({0})] #[frame_support::transactional] pub fn contribute(origin: OriginFor, pid: u64, amount: BalanceOf) -> DispatchResult { let who = ensure_signed(origin)?; @@ -496,7 +496,7 @@ pub mod pallet { /// Afer the withdrawal is queued, The withdraw queue will be automaticly consumed util there are not enough free stakes to fullfill withdrawals. /// Everytime the free stakes in the pools increases, the withdraw queue will be consumed as it describes above. #[pallet::call_index(6)] - #[pallet::weight(0)] + #[pallet::weight({0})] #[frame_support::transactional] pub fn withdraw(origin: OriginFor, pid: u64, shares: BalanceOf) -> DispatchResult { let who = ensure_signed(origin)?; @@ -554,7 +554,7 @@ pub mod pallet { } #[pallet::call_index(7)] - #[pallet::weight(0)] + #[pallet::weight({0})] #[frame_support::transactional] pub fn refresh_vault_lock_and_check(origin: OriginFor, pid: u64) -> DispatchResult { let who = ensure_signed(origin.clone())?; diff --git a/pallets/phala/src/compute/wrapped_balances.rs b/pallets/phala/src/compute/wrapped_balances.rs index a535c967..838fc57a 100644 --- a/pallets/phala/src/compute/wrapped_balances.rs +++ b/pallets/phala/src/compute/wrapped_balances.rs @@ -19,6 +19,7 @@ pub mod pallet { OnUnbalanced, StorageVersion, }, }; + use frame_support::traits::tokens::{Fortitude, Precision}; use frame_system::{pallet_prelude::*, RawOrigin}; use pallet_democracy::{AccountVote, ReferendumIndex, ReferendumInfo}; pub use rmrk_traits::primitives::{CollectionId, NftId}; @@ -187,7 +188,7 @@ pub mod pallet { /// /// The wrapped pha is stored in `WrappedBalancesAccountId`'s wallet and can not be taken away #[pallet::call_index(0)] - #[pallet::weight(0)] + #[pallet::weight({0})] #[frame_support::transactional] pub fn wrap(origin: OriginFor, amount: BalanceOf) -> DispatchResult { let user = ensure_signed(origin)?; @@ -215,7 +216,7 @@ pub mod pallet { /// /// The unwrapped pha is transfered from `WrappedBalancesAccountId` to the user's wallet #[pallet::call_index(1)] - #[pallet::weight(0)] + #[pallet::weight({0})] #[frame_support::transactional] pub fn unwrap_all(origin: OriginFor) -> DispatchResult { let user = ensure_signed(origin)?; @@ -240,7 +241,7 @@ pub mod pallet { /// /// The unwrapped pha is transfered from `WrappedBalancesAccountId` to the user's wallet #[pallet::call_index(2)] - #[pallet::weight(0)] + #[pallet::weight({0})] #[frame_support::transactional] pub fn unwrap(origin: OriginFor, amount: BalanceOf) -> DispatchResult { let user = ensure_signed(origin)?; @@ -274,7 +275,7 @@ pub mod pallet { /// Can both approve and oppose a vote at the same time /// The W-PHA used in vote will be locked until the vote is finished or canceled #[pallet::call_index(3)] - #[pallet::weight(0)] + #[pallet::weight({0})] #[frame_support::transactional] pub fn vote( origin: OriginFor, @@ -314,7 +315,7 @@ pub mod pallet { /// /// Must assign the max iterations to avoid computing complexity overwhelm #[pallet::call_index(4)] - #[pallet::weight(0)] + #[pallet::weight({0})] #[frame_support::transactional] pub fn unlock( origin: OriginFor, @@ -344,7 +345,7 @@ pub mod pallet { } #[pallet::call_index(5)] - #[pallet::weight(0)] + #[pallet::weight({0})] #[frame_support::transactional] pub fn backfill_vote_lock(origin: OriginFor) -> DispatchResult { let who = ensure_signed(origin)?; @@ -379,7 +380,7 @@ pub mod pallet { debug_assert!(dust != Zero::zero()); if dust != Zero::zero() { let actual_removed = - pallet_assets::Pallet::::slash(T::WPhaAssetId::get(), who, dust) + pallet_assets::Pallet::::burn_from(T::WPhaAssetId::get(), who, dust, Precision::BestEffort, Fortitude::Force) .expect("slash should success with correct amount: qed."); let (imbalance, _remaining) = ::Currency::slash( &>::account_id(), @@ -401,7 +402,13 @@ pub mod pallet { /// Burns some W-PHA pub fn burn_from(target: &T::AccountId, amount: BalanceOf) -> DispatchResult { - pallet_assets::Pallet::::burn_from(T::WPhaAssetId::get(), target, amount)?; + pallet_assets::Pallet::::burn_from( + T::WPhaAssetId::get(), + target, + amount, + Precision::BestEffort, + Fortitude::Force + )?; Ok(()) } diff --git a/pallets/phala/src/mock.rs b/pallets/phala/src/mock.rs index 8544034a..7eb11b27 100644 --- a/pallets/phala/src/mock.rs +++ b/pallets/phala/src/mock.rs @@ -127,6 +127,10 @@ impl pallet_balances::Config for Test { type MaxLocks = (); type MaxReserves = (); type ReserveIdentifier = [u8; 8]; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = (); + type MaxFreezes = (); } impl pallet_timestamp::Config for Test { diff --git a/pallets/phala/src/ott.rs b/pallets/phala/src/ott.rs index 955d7ae4..88504138 100644 --- a/pallets/phala/src/ott.rs +++ b/pallets/phala/src/ott.rs @@ -62,7 +62,7 @@ pub mod pallet { /// Distributes some amounts to each specified accounts and mark the sender and destination /// accounts as blacklisted. #[pallet::call_index(0)] - #[pallet::weight(0)] + #[pallet::weight({0})] #[transactional] pub fn distribute( origin: OriginFor, diff --git a/pallets/phala/src/phat.rs b/pallets/phala/src/phat.rs index 71bb15cc..b96def4a 100644 --- a/pallets/phala/src/phat.rs +++ b/pallets/phala/src/phat.rs @@ -217,7 +217,7 @@ pub mod pallet { /// - `deposit_per_byte` - Price for contract storage per byte. /// - `treasury_account` - The treasury account used to collect the gas and storage fee. #[pallet::call_index(0)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn add_cluster( origin: OriginFor, owner: T::AccountId, @@ -307,7 +307,7 @@ pub mod pallet { } #[pallet::call_index(1)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn cluster_upload_resource( origin: OriginFor, cluster_id: ContractClusterId, @@ -342,7 +342,7 @@ pub mod pallet { /// Transfer `amount` of on-chain token to the `dest_account` in the cluster of id `cluster_id`. #[pallet::call_index(2)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn transfer_to_cluster( origin: OriginFor, amount: BalanceOf, @@ -388,7 +388,7 @@ pub mod pallet { } #[pallet::call_index(4)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn instantiate_contract( origin: OriginFor, code_index: CodeIndex>, @@ -447,7 +447,7 @@ pub mod pallet { } #[pallet::call_index(5)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn cluster_destroy(origin: OriginFor, cluster: ContractClusterId) -> DispatchResult { ensure_root(origin)?; @@ -458,7 +458,7 @@ pub mod pallet { } #[pallet::call_index(6)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn set_pink_system_code( origin: OriginFor, code: BoundedVec, @@ -469,7 +469,7 @@ pub mod pallet { } #[pallet::call_index(7)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn set_pink_runtime_version( origin: OriginFor, version: (u32, u32), @@ -481,7 +481,7 @@ pub mod pallet { /// Add a new worker to a cluster #[pallet::call_index(8)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn add_worker_to_cluster( origin: OriginFor, worker_pubkey: WorkerPublicKey, @@ -513,7 +513,7 @@ pub mod pallet { /// Remove a new worker from a cluster #[pallet::call_index(9)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn remove_worker_from_cluster( origin: OriginFor, worker_pubkey: WorkerPublicKey, diff --git a/pallets/phala/src/phat_tokenomic.rs b/pallets/phala/src/phat_tokenomic.rs index 96c01ba1..709e80c4 100644 --- a/pallets/phala/src/phat_tokenomic.rs +++ b/pallets/phala/src/phat_tokenomic.rs @@ -94,7 +94,7 @@ pub mod pallet { /// even if the contract is deployed later. User can re-stake with or without changing the amount /// to sync the depoit the the cluster after the contract is actually deployed. #[pallet::call_index(0)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn adjust_stake( origin: OriginFor, contract: ContractId, diff --git a/pallets/phala/src/phat_tokenomic/snapshots/phala_pallets__phat_tokenomic__tests__can_restake_without_any_changes.snap b/pallets/phala/src/phat_tokenomic/snapshots/phala_pallets__phat_tokenomic__tests__can_restake_without_any_changes.snap index 43d2b1df..daf03403 100644 --- a/pallets/phala/src/phat_tokenomic/snapshots/phala_pallets__phat_tokenomic__tests__can_restake_without_any_changes.snap +++ b/pallets/phala/src/phat_tokenomic/snapshots/phala_pallets__phat_tokenomic__tests__can_restake_without_any_changes.snap @@ -19,7 +19,6 @@ expression: events Event::BalanceSet { who: 0101010101010101010101010101010101010101010101010101010101010101 (5C62Ck4U...), free: 100000000000000, - reserved: 0, }, ), RuntimeEvent::System( @@ -37,7 +36,6 @@ expression: events Event::BalanceSet { who: 0202020202020202020202020202020202020202020202020202020202020202 (5C7LYpP2...), free: 100000000000000, - reserved: 0, }, ), RuntimeEvent::System( diff --git a/pallets/phala/src/phat_tokenomic/snapshots/phala_pallets__phat_tokenomic__tests__should_be_happy_to_stake.snap b/pallets/phala/src/phat_tokenomic/snapshots/phala_pallets__phat_tokenomic__tests__should_be_happy_to_stake.snap index b053a0e3..c93f7bb8 100644 --- a/pallets/phala/src/phat_tokenomic/snapshots/phala_pallets__phat_tokenomic__tests__should_be_happy_to_stake.snap +++ b/pallets/phala/src/phat_tokenomic/snapshots/phala_pallets__phat_tokenomic__tests__should_be_happy_to_stake.snap @@ -19,7 +19,6 @@ expression: events Event::BalanceSet { who: 0101010101010101010101010101010101010101010101010101010101010101 (5C62Ck4U...), free: 100000000000000, - reserved: 0, }, ), RuntimeEvent::System( @@ -37,7 +36,6 @@ expression: events Event::BalanceSet { who: 0202020202020202020202020202020202020202020202020202020202020202 (5C7LYpP2...), free: 100000000000000, - reserved: 0, }, ), RuntimeEvent::System( diff --git a/pallets/phala/src/phat_tokenomic/tests.rs b/pallets/phala/src/phat_tokenomic/tests.rs index e815cd0f..5077fe39 100644 --- a/pallets/phala/src/phat_tokenomic/tests.rs +++ b/pallets/phala/src/phat_tokenomic/tests.rs @@ -31,8 +31,8 @@ fn balance_of_user(user: &AccountId32) -> u128 { fn prapare() { mock::System::set_block_number(1); - mock::Balances::set_balance(Origin::root(), ALICE, 100 * DOLLARS, 0).unwrap(); - mock::Balances::set_balance(Origin::root(), BOB, 100 * DOLLARS, 0).unwrap(); + mock::Balances::force_set_balance(Origin::root(), ALICE, 100 * DOLLARS).unwrap(); + mock::Balances::force_set_balance(Origin::root(), BOB, 100 * DOLLARS).unwrap(); MinStake::::put(DOLLARS); } diff --git a/pallets/phala/src/phat_tokenomic/tests/mock.rs b/pallets/phala/src/phat_tokenomic/tests/mock.rs index 9dc5cea3..4ad29af7 100644 --- a/pallets/phala/src/phat_tokenomic/tests/mock.rs +++ b/pallets/phala/src/phat_tokenomic/tests/mock.rs @@ -78,6 +78,10 @@ impl pallet_balances::Config for Test { type MaxLocks = (); type MaxReserves = (); type ReserveIdentifier = [u8; 8]; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = (); + type MaxFreezes = (); } impl pallet_timestamp::Config for Test { diff --git a/pallets/phala/src/registry.rs b/pallets/phala/src/registry.rs index 14d8441a..368f376c 100644 --- a/pallets/phala/src/registry.rs +++ b/pallets/phala/src/registry.rs @@ -482,7 +482,7 @@ pub mod pallet { /// Usually called by a bridging relayer program (`pherry` and `prb`). Can be called by /// anyone on behalf of a worker. #[pallet::call_index(6)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn register_worker( origin: OriginFor, pruntime_info: WorkerRegistrationInfo, @@ -582,7 +582,7 @@ pub mod pallet { /// Usually called by a bridging relayer program (`pherry` and `prb`). Can be called by /// anyone on behalf of a worker. #[pallet::call_index(7)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn register_worker_v2( origin: OriginFor, pruntime_info: WorkerRegistrationInfoV2, @@ -696,7 +696,7 @@ pub mod pallet { } #[pallet::call_index(8)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn update_worker_endpoint( origin: OriginFor, endpoint_payload: WorkerEndpointPayload, @@ -743,7 +743,7 @@ pub mod pallet { /// /// Can only be called by `GovernanceOrigin`. #[pallet::call_index(9)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn add_pruntime(origin: OriginFor, pruntime_hash: Vec) -> DispatchResult { T::GovernanceOrigin::ensure_origin(origin)?; @@ -766,7 +766,7 @@ pub mod pallet { /// /// Can only be called by `GovernanceOrigin`. #[pallet::call_index(10)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn remove_pruntime(origin: OriginFor, pruntime_hash: Vec) -> DispatchResult { T::GovernanceOrigin::ensure_origin(origin)?; @@ -788,7 +788,7 @@ pub mod pallet { /// /// Can only be called by `GovernanceOrigin`. #[pallet::call_index(11)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn add_relaychain_genesis_block_hash( origin: OriginFor, genesis_block_hash: H256, @@ -811,7 +811,7 @@ pub mod pallet { /// /// Can only be called by `GovernanceOrigin`. #[pallet::call_index(12)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn remove_relaychain_genesis_block_hash( origin: OriginFor, genesis_block_hash: H256, @@ -834,7 +834,7 @@ pub mod pallet { /// /// Can only be called by `GovernanceOrigin`. #[pallet::call_index(13)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn set_minimum_pruntime_version( origin: OriginFor, major: u32, @@ -854,7 +854,7 @@ pub mod pallet { /// /// Can only be called by `GovernanceOrigin`. #[pallet::call_index(14)] - #[pallet::weight(0)] + #[pallet::weight({0})] pub fn set_pruntime_consensus_version( origin: OriginFor, version: u32, diff --git a/pallets/phala/src/test.rs b/pallets/phala/src/test.rs index b81fc72d..28d4737a 100644 --- a/pallets/phala/src/test.rs +++ b/pallets/phala/src/test.rs @@ -2034,10 +2034,9 @@ fn setup_vault(owner: u64) -> u64 { } fn set_balance_proposal(value: u128) -> BoundedCallOf { - let inner = pallet_balances::Call::set_balance { + let inner = pallet_balances::Call::force_set_balance { who: 42, new_free: value, - new_reserved: 0, }; let outer = RuntimeCall::Balances(inner); Preimage::bound(outer).unwrap() diff --git a/pallets/subbridge/Cargo.toml b/pallets/subbridge/Cargo.toml index bffbeff8..3727f70b 100644 --- a/pallets/subbridge/Cargo.toml +++ b/pallets/subbridge/Cargo.toml @@ -15,30 +15,30 @@ log = { version = "0.4.14", default-features = false } funty = { version = "3.0.0-rc2", default-features = false } # Substrate -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false, optional = true } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } # Polkadot -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } # Cumulus -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } # Sygma -sygma-traits = { git = "https://github.com/Phala-Network/sygma-substrate-pallets", branch = "polkadot-v0.9.41", default-features = false } -sygma-bridge = { git = "https://github.com/Phala-Network/sygma-substrate-pallets", branch = "polkadot-v0.9.41", default-features = false } +sygma-traits = { git = "https://github.com/sygmaprotocol/sygma-substrate-pallets", branch = "polkadot-v0.9.42", default-features = false } +sygma-bridge = { git = "https://github.com/sygmaprotocol/sygma-substrate-pallets", branch = "polkadot-v0.9.42", default-features = false } # Local assets-registry = { path = "../assets-registry", default-features = false } @@ -47,38 +47,38 @@ phala-pallet-common = { path = "../../crates/phala-pallet-common", default-featu [dev-dependencies] assert_matches = "1.4.0" -hex-literal = "0.3" +hex-literal = "0.4.1" # Substrate -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } # Polkadot -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } # Cumulus -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41" } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42" } # Sygma -sygma-traits = { git = "https://github.com/Phala-Network/sygma-substrate-pallets", branch = "polkadot-v0.9.41" } -sygma-bridge = { git = "https://github.com/Phala-Network/sygma-substrate-pallets", branch = "polkadot-v0.9.41" } +sygma-traits = { git = "https://github.com/sygmaprotocol/sygma-substrate-pallets", branch = "polkadot-v0.9.42" } +sygma-bridge = { git = "https://github.com/sygmaprotocol/sygma-substrate-pallets", branch = "polkadot-v0.9.42" } # Local assets-registry = { path = "../assets-registry" } diff --git a/pallets/subbridge/src/chainbridge.rs b/pallets/subbridge/src/chainbridge.rs index a85623ec..4c2aa49b 100644 --- a/pallets/subbridge/src/chainbridge.rs +++ b/pallets/subbridge/src/chainbridge.rs @@ -14,6 +14,7 @@ pub mod pallet { traits::{tokens::fungibles::Inspect, Currency, StorageVersion}, transactional, PalletId, Parameter, }; + use frame_support::traits::tokens::{Fortitude, Preservation}; use frame_system::{self as system, pallet_prelude::*}; use phala_pallet_common::WrapSlice; use scale_info::TypeInfo; @@ -336,7 +337,7 @@ pub mod pallet { /// - O(1) lookup and insert /// # #[pallet::call_index(0)] - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] pub fn set_threshold(origin: OriginFor, threshold: u32) -> DispatchResult { T::BridgeCommitteeOrigin::ensure_origin(origin)?; Self::set_relayer_threshold(threshold) @@ -348,7 +349,7 @@ pub mod pallet { /// - O(1) lookup and insert /// # #[pallet::call_index(1)] - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] pub fn whitelist_chain(origin: OriginFor, id: BridgeChainId) -> DispatchResult { T::BridgeCommitteeOrigin::ensure_origin(origin)?; Self::whitelist(id) @@ -360,7 +361,7 @@ pub mod pallet { /// - O(1) lookup and insert /// # #[pallet::call_index(2)] - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] pub fn add_relayer(origin: OriginFor, v: T::AccountId) -> DispatchResult { T::BridgeCommitteeOrigin::ensure_origin(origin)?; Self::register_relayer(v) @@ -372,7 +373,7 @@ pub mod pallet { /// - O(1) lookup and removal /// # #[pallet::call_index(3)] - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] pub fn remove_relayer(origin: OriginFor, v: T::AccountId) -> DispatchResult { T::BridgeCommitteeOrigin::ensure_origin(origin)?; Self::unregister_relayer(v) @@ -384,7 +385,7 @@ pub mod pallet { /// - O(1) lookup and insert /// # #[pallet::call_index(4)] - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] pub fn update_fee( origin: OriginFor, fee: u128, @@ -437,7 +438,7 @@ pub mod pallet { /// - Fixed, since execution of proposal should not be included /// # #[pallet::call_index(6)] - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] #[transactional] pub fn reject_proposal( origin: OriginFor, @@ -483,7 +484,7 @@ pub mod pallet { /// Triggered by a initial transfer on source chain, executed by relayer when proposal was resolved. #[pallet::call_index(8)] - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] #[transactional] pub fn handle_fungible_transfer( origin: OriginFor, @@ -859,7 +860,8 @@ pub mod pallet { let reducible_balance = >::reducible_balance( asset_id.into(), &sender, - false, + Preservation::Expendable, + Fortitude::Polite, ); reducible_balance.into() }; diff --git a/pallets/subbridge/src/mock/para.rs b/pallets/subbridge/src/mock/para.rs index 0b340644..57806da4 100644 --- a/pallets/subbridge/src/mock/para.rs +++ b/pallets/subbridge/src/mock/para.rs @@ -116,6 +116,10 @@ impl pallet_balances::Config for Runtime { type MaxLocks = (); type MaxReserves = (); type ReserveIdentifier = [u8; 8]; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<1>; + type MaxFreezes = ConstU32<1>; } parameter_types! { diff --git a/pallets/subbridge/src/mock/relay.rs b/pallets/subbridge/src/mock/relay.rs index 639434fd..6ff9208a 100644 --- a/pallets/subbridge/src/mock/relay.rs +++ b/pallets/subbridge/src/mock/relay.rs @@ -65,6 +65,10 @@ impl pallet_balances::Config for Runtime { type WeightInfo = (); type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<1>; + type MaxFreezes = ConstU32<1>; } impl shared::Config for Runtime {} @@ -156,6 +160,7 @@ impl pallet_xcm::Config for Runtime { type WeightInfo = pallet_xcm::TestWeightInfo; #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; + type AdminOrigin = EnsureRoot; } parameter_types! { diff --git a/pallets/subbridge/src/xtransfer.rs b/pallets/subbridge/src/xtransfer.rs index ef509d6f..41e04710 100644 --- a/pallets/subbridge/src/xtransfer.rs +++ b/pallets/subbridge/src/xtransfer.rs @@ -61,7 +61,7 @@ pub mod pallet { T::AccountId: Into<[u8; 32]> + From<[u8; 32]>, { #[pallet::call_index(0)] - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] #[transactional] pub fn transfer( origin: OriginFor, @@ -75,7 +75,7 @@ pub mod pallet { } #[pallet::call_index(1)] - #[pallet::weight(195_000_000)] + #[pallet::weight(Weight::from_parts(195_000_000, 0))] #[transactional] pub fn transfer_generic( origin: OriginFor, diff --git a/parachains-common/Cargo.toml b/parachains-common/Cargo.toml index 8007f963..05177f4d 100644 --- a/parachains-common/Cargo.toml +++ b/parachains-common/Cargo.toml @@ -13,35 +13,35 @@ codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive scale-info = { version = "2.3.1", default-features = false, features = ["derive"] } # Substrate dependencies -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.41" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.41" } -pallet-asset-tx-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.41" } -pallet-assets = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.41" } -pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.41" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.41" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.41" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.41" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.41" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.41" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.41" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +pallet-asset-tx-payment = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +pallet-assets = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } # Polkadot -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.41" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.41" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.41" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.41" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" } # Cumulus dependencies -pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } +pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } [dev-dependencies] serde = { version = "1.0.119" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } [features] default = ["std"] diff --git a/parachains-common/src/impls.rs b/parachains-common/src/impls.rs index 69d26dbd..40387617 100644 --- a/parachains-common/src/impls.rs +++ b/parachains-common/src/impls.rs @@ -17,7 +17,7 @@ //! Taken from polkadot/runtime/common (at a21cd64) and adapted for parachains. use frame_support::traits::{ - fungibles::{self, Balanced, CreditOf}, + fungibles::{self, Balanced, Credit}, Contains, ContainsPair, Currency, Get, Imbalance, OnUnbalanced, }; use pallet_asset_tx_payment::HandleCredit; @@ -75,7 +75,7 @@ where R: pallet_authorship::Config + pallet_assets::Config, AccountIdOf: From + Into, { - fn handle_credit(credit: CreditOf, pallet_assets::Pallet>) { + fn handle_credit(credit: Credit, pallet_assets::Pallet>) { if let Some(author) = pallet_authorship::Pallet::::author() { // In case of error: Will drop the result triggering the `OnDrop` of the imbalance. let _ = pallet_assets::Pallet::::resolve(&author, credit); @@ -111,13 +111,13 @@ mod tests { use super::*; use frame_support::{ parameter_types, - traits::{FindAuthor, ValidatorRegistration}, + traits::{ConstU32, FindAuthor, ValidatorRegistration}, PalletId, }; use frame_system::{limits, EnsureRoot}; use pallet_collator_selection::IdentityCollator; use polkadot_primitives::AccountId; - use sp_core::H256; + use sp_core::{ConstU64, H256}; use sp_runtime::{ testing::Header, traits::{BlakeTwo256, IdentityLookup}, @@ -179,12 +179,16 @@ mod tests { type Balance = u64; type RuntimeEvent = RuntimeEvent; type DustRemoval = (); - type ExistentialDeposit = (); + type ExistentialDeposit = ConstU64<1>; type AccountStore = System; type MaxLocks = (); type WeightInfo = (); type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<1>; + type MaxFreezes = ConstU32<1>; } pub struct OneAuthor; @@ -271,4 +275,4 @@ mod tests { "AssetsFrom should allow assets from any of its interior locations" ); } -} \ No newline at end of file +} diff --git a/parachains-common/src/xcm_config.rs b/parachains-common/src/xcm_config.rs index c9f8be46..e6a57c95 100644 --- a/parachains-common/src/xcm_config.rs +++ b/parachains-common/src/xcm_config.rs @@ -2,7 +2,9 @@ use crate::impls::AccountIdOf; use core::marker::PhantomData; use frame_support::{ log, - traits::{fungibles::Inspect, tokens::BalanceConversion, ContainsPair}, + traits::{ + fungibles::Inspect, tokens::ConversionToAssetBalance, ContainsPair, ProcessMessageError, + }, weights::{Weight, WeightToFee, WeightToFeePolynomial}, }; use sp_runtime::traits::Get; @@ -18,16 +20,16 @@ where Allow: ShouldExecute; impl ShouldExecute for DenyThenTry -where - Deny: ShouldExecute, - Allow: ShouldExecute, + where + Deny: ShouldExecute, + Allow: ShouldExecute, { fn should_execute( origin: &MultiLocation, message: &mut [Instruction], max_weight: Weight, weight_credit: &mut Weight, - ) -> Result<(), ()> { + ) -> Result<(), ProcessMessageError> { Deny::should_execute(origin, message, max_weight, weight_credit)?; Allow::should_execute(origin, message, max_weight, weight_credit) } @@ -41,7 +43,7 @@ impl ShouldExecute for DenyReserveTransferToRelayChain { message: &mut [Instruction], _max_weight: Weight, _weight_credit: &mut Weight, - ) -> Result<(), ()> { + ) -> Result<(), ProcessMessageError> { if message.iter().any(|inst| { matches!( inst, @@ -55,7 +57,7 @@ impl ShouldExecute for DenyReserveTransferToRelayChain { } ) }) { - return Err(()) // Deny + return Err(ProcessMessageError::Unsupported) // Deny } // An unexpected reserve transfer has arrived from the Relay Chain. Generally, `IsReserve` @@ -90,7 +92,7 @@ impl where Runtime: pallet_assets::Config, WeightToFee: WeightToFeePolynomial, - BalanceConverter: BalanceConversion< + BalanceConverter: ConversionToAssetBalance< CurrencyBalance, >::AssetId, >::Balance, @@ -127,4 +129,4 @@ impl> ContainsPair asset, origin, Location::get()); matches!(asset.id, Concrete(ref id) if id == origin && origin == &Location::get()) } -} \ No newline at end of file +} diff --git a/polkadot/node/service/Cargo.toml b/polkadot/node/service/Cargo.toml index 21fe8e79..f426eef2 100644 --- a/polkadot/node/service/Cargo.toml +++ b/polkadot/node/service/Cargo.toml @@ -1,138 +1,138 @@ [package] name = "polkadot-service" rust-version = "1.60" -version = "0.9.41" +version = "0.9.42" authors = ["Parity Technologies "] edition = "2021" [dependencies] # Substrate Client -sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -beefy = { package = "sc-consensus-beefy", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -grandpa = { package = "sc-consensus-grandpa", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -mmr-gadget = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-mmr-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-network-sync = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -service = { package = "sc-service", git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.41" } -telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } +sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +beefy = { package = "sc-consensus-beefy", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +grandpa = { package = "sc-consensus-grandpa", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +mmr-gadget = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-mmr-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-network-sync = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +service = { package = "sc-service", git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.42" } +telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } # Substrate Primitives -sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -beefy-primitives = { package = "sp-consensus-beefy", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -grandpa_primitives = { package = "sp-consensus-grandpa", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } +sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +beefy-primitives = { package = "sp-consensus-beefy", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +grandpa_primitives = { package = "sp-consensus-grandpa", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-storage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } # Substrate Pallets -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } +pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } # Substrate Other -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" } # External Crates futures = "0.3.21" -hex-literal = "0.3.4" -gum = { package = "tracing-gum", git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } +hex-literal = "0.4.1" +gum = { package = "tracing-gum", git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } serde = { version = "1.0.137", features = ["derive"] } -serde_json = "1.0.81" +serde_json = "1.0.96" thiserror = "1.0.31" kvdb = "0.13.0" -kvdb-rocksdb = { version = "0.17.0", optional = true } -parity-db = { version = "0.4.4", optional = true } +kvdb-rocksdb = { version = "0.18.0", optional = true } +parity-db = { version = "0.4.6", optional = true } async-trait = "0.1.57" lru = "0.9" log = "0.4.17" # Polkadot -polkadot-node-core-parachains-inherent = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false, optional = true } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -polkadot-rpc = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -polkadot-node-subsystem-util = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -polkadot-node-subsystem-types = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -polkadot-node-network-protocol = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } +polkadot-node-core-parachains-inherent = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false, optional = true } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +polkadot-rpc = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +polkadot-node-subsystem-util = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +polkadot-node-subsystem-types = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +polkadot-node-network-protocol = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } # Polkadot Runtime Constants -polkadot-runtime-constants = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -rococo-runtime-constants = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -westend-runtime-constants = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } +polkadot-runtime-constants = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +rococo-runtime-constants = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +westend-runtime-constants = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } # Polkadot Runtimes -polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -westend-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -rococo-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } +polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +kusama-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +westend-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +rococo-runtime = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } # Polkadot Subsystems -polkadot-approval-distribution = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -polkadot-availability-bitfield-distribution = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -polkadot-availability-distribution = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -polkadot-availability-recovery = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -polkadot-collator-protocol = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -polkadot-dispute-distribution = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -polkadot-gossip-support = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -polkadot-network-bridge = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -polkadot-node-collation-generation = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -polkadot-node-core-approval-voting = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -polkadot-node-core-av-store = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -polkadot-node-core-backing = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -polkadot-node-core-bitfield-signing = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -polkadot-node-core-candidate-validation = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -polkadot-node-core-chain-api = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -polkadot-node-core-chain-selection = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -polkadot-node-core-dispute-coordinator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -polkadot-node-core-provisioner = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -polkadot-node-core-pvf-checker = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -polkadot-node-core-runtime-api = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } -polkadot-statement-distribution = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", optional = true } +polkadot-approval-distribution = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +polkadot-availability-bitfield-distribution = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +polkadot-availability-distribution = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +polkadot-availability-recovery = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +polkadot-collator-protocol = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +polkadot-dispute-distribution = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +polkadot-gossip-support = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +polkadot-network-bridge = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +polkadot-node-collation-generation = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +polkadot-node-core-approval-voting = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +polkadot-node-core-av-store = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +polkadot-node-core-backing = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +polkadot-node-core-bitfield-signing = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +polkadot-node-core-candidate-validation = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +polkadot-node-core-chain-api = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +polkadot-node-core-chain-selection = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +polkadot-node-core-dispute-coordinator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +polkadot-node-core-provisioner = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +polkadot-node-core-pvf-checker = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +polkadot-node-core-runtime-api = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } +polkadot-statement-distribution = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", optional = true } [dev-dependencies] -polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } -polkadot-node-subsystem-test-helpers = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41" } +polkadot-test-client = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } +polkadot-node-subsystem-test-helpers = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" } env_logger = "0.9.0" assert_matches = "1.5.0" tempfile = "3.2" diff --git a/polkadot/node/service/chain-specs/kusama.json b/polkadot/node/service/chain-specs/kusama.json index b917a1fb..be7cf649 100644 --- a/polkadot/node/service/chain-specs/kusama.json +++ b/polkadot/node/service/chain-specs/kusama.json @@ -36,7 +36,9 @@ "/dns/boot-kusama.metaspan.io/tcp/23015/ws/p2p/12D3KooWE1tq9ZL9AAxMiUBBqy1ENmh5pwfWabnoBPMo8gFPXhn6", "/dns/boot-kusama.metaspan.io/tcp/23016/wss/p2p/12D3KooWE1tq9ZL9AAxMiUBBqy1ENmh5pwfWabnoBPMo8gFPXhn6", "/dns/kusama-bootnode.turboflakes.io/tcp/30305/p2p/12D3KooWR6cMhCYRhbJdqYZfzWZT6bcck3unpRLk8GBQGmHBgPwu", - "/dns/kusama-bootnode.turboflakes.io/tcp/30405/wss/p2p/12D3KooWR6cMhCYRhbJdqYZfzWZT6bcck3unpRLk8GBQGmHBgPwu" + "/dns/kusama-bootnode.turboflakes.io/tcp/30405/wss/p2p/12D3KooWR6cMhCYRhbJdqYZfzWZT6bcck3unpRLk8GBQGmHBgPwu", + "/dns/kusama-boot-ng.dwellir.com/tcp/443/wss/p2p/12D3KooWLswepVYVdCNduvWRTyNTaDMXEBcmvJdZ9Bhw3u2Jhad2", + "/dns/kusama-boot-ng.dwellir.com/tcp/30334/p2p/12D3KooWLswepVYVdCNduvWRTyNTaDMXEBcmvJdZ9Bhw3u2Jhad2" ], "telemetryEndpoints": [ [ diff --git a/polkadot/node/service/chain-specs/polkadot.json b/polkadot/node/service/chain-specs/polkadot.json index cc7d3266..ed7050b5 100644 --- a/polkadot/node/service/chain-specs/polkadot.json +++ b/polkadot/node/service/chain-specs/polkadot.json @@ -36,7 +36,9 @@ "/dns/boot-polkadot.metaspan.io/tcp/13015/ws/p2p/12D3KooWRjHFApinuqSBjoaDjQHvxwubQSpEVy5hrgC9Smvh92WF", "/dns/boot-polkadot.metaspan.io/tcp/13016/wss/p2p/12D3KooWRjHFApinuqSBjoaDjQHvxwubQSpEVy5hrgC9Smvh92WF", "/dns/polkadot-bootnode.turboflakes.io/tcp/30300/p2p/12D3KooWHJBMZgt7ymAdTRtadPcGXpJw79vBGe8z53r9JMkZW7Ha", - "/dns/polkadot-bootnode.turboflakes.io/tcp/30400/wss/p2p/12D3KooWHJBMZgt7ymAdTRtadPcGXpJw79vBGe8z53r9JMkZW7Ha" + "/dns/polkadot-bootnode.turboflakes.io/tcp/30400/wss/p2p/12D3KooWHJBMZgt7ymAdTRtadPcGXpJw79vBGe8z53r9JMkZW7Ha", + "/dns/polkadot-boot-ng.dwellir.com/tcp/443/wss/p2p/12D3KooWFFqjBKoSdQniRpw1Y8W6kkV7takWv1DU2ZMkaA81PYVq", + "/dns/polkadot-boot-ng.dwellir.com/tcp/30336/p2p/12D3KooWFFqjBKoSdQniRpw1Y8W6kkV7takWv1DU2ZMkaA81PYVq" ], "telemetryEndpoints": [ [ diff --git a/polkadot/node/service/chain-specs/rococo.json b/polkadot/node/service/chain-specs/rococo.json index ba1ad29c..43dc959b 100644 --- a/polkadot/node/service/chain-specs/rococo.json +++ b/polkadot/node/service/chain-specs/rococo.json @@ -3,14 +3,22 @@ "id": "rococo_v2_2", "chainType": "Live", "bootNodes": [ - "/ip4/34.90.151.124/tcp/30333/p2p/12D3KooWF7BUbG5ErMZ47ZdarRwtpZamgcZqxwpnFzkhjc1spHnP", - "/ip4/34.90.137.14/tcp/30333/p2p/12D3KooWLcpkpvjr5ccgtUdTSYtNDjEdsDcPNrt2Rb7yXuAf7bUE", - "/ip4/35.204.67.254/tcp/30333/p2p/12D3KooWGjEEDmNbBkXLM1uKMseK9iYD3osKA4JGdGKMZDCusjd6", - "/ip4/34.90.121.39/tcp/30333/p2p/12D3KooWBhkZQydNHDR3XSehnrfj1KNFCdpwgDrYpX54FrUR1FRS", - "/ip4/34.91.145.35/tcp/30333/p2p/12D3KooWBuLAMevZexnFKCgTyoz3AnHQn98D9cfe1Mg3kPoCjkwf", - "/ip4/34.91.77.80/tcp/30333/p2p/12D3KooWA5BAM71y9NtV5NH6EjANgYKRZ8jNLJ5z8GJ5RPdjt63n", - "/ip4/34.91.84.25/tcp/30333/p2p/12D3KooWSV4VqhBHZKKBsZKmVU462qRW9PmXTSuYvuajt1P93djA", - "/ip4/34.91.97.19/tcp/30333/p2p/12D3KooWD6wC88atMMyVeP6ZKg9sK7QmUL8x8m1RxMW8rhv2vWyg" + "/dns/rococo-bootnode-0.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWGikJMBmRiG5ofCqn8aijCijgfmZR5H9f53yUF3srm6Nm", + "/dns/rococo-bootnode-1.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWLDfH9mHRCidrd5NfQjp7rRMUcJSEUwSvEKyu7xU2cG3d", + "/dns/rococo-bootnode-2.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWSikgbrcWjVgSed7r1uXk4TeAieDnHKtrPDVZBu5XkQha", + "/dns/rococo-bootnode-3.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWPeKuW1BBPv4pNr8xqEv7jqy7rQnS3oq9U7xTCvj9qt2k", + "/dns/rococo-bootnode-4.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWNy7K8TNaP2Whcp3tsjBVUg2HcKMUvAArsimjvd1g31w4", + "/dns/rococo-bootnode-5.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWAVV9DZfvJp2brvs5zcQDTBFxNmEFJKy2dsvezWL4Bmy8", + "/dns/rococo-bootnode-6.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWM3hvXvaShyp7drQCavFHuwobkYdnCp2uHU5iRRAQwsw2", + "/dns/rococo-bootnode-7.parity-testnet.parity.io/tcp/30333/p2p/12D3KooWSbGtxfWCwn1tdmfZYESbmxzbTG2LKwKUrioDaZBcdMY4", + "/dns/rococo-bootnode-0.polkadot.io/tcp/443/wss/p2p/12D3KooWGikJMBmRiG5ofCqn8aijCijgfmZR5H9f53yUF3srm6Nm", + "/dns/rococo-bootnode-1.polkadot.io/tcp/443/wss/p2p/12D3KooWLDfH9mHRCidrd5NfQjp7rRMUcJSEUwSvEKyu7xU2cG3d", + "/dns/rococo-bootnode-2.polkadot.io/tcp/443/wss/p2p/12D3KooWSikgbrcWjVgSed7r1uXk4TeAieDnHKtrPDVZBu5XkQha", + "/dns/rococo-bootnode-3.polkadot.io/tcp/443/wss/p2p/12D3KooWPeKuW1BBPv4pNr8xqEv7jqy7rQnS3oq9U7xTCvj9qt2k", + "/dns/rococo-bootnode-4.polkadot.io/tcp/443/wss/p2p/12D3KooWNy7K8TNaP2Whcp3tsjBVUg2HcKMUvAArsimjvd1g31w4", + "/dns/rococo-bootnode-5.polkadot.io/tcp/443/wss/p2p/12D3KooWAVV9DZfvJp2brvs5zcQDTBFxNmEFJKy2dsvezWL4Bmy8", + "/dns/rococo-bootnode-6.polkadot.io/tcp/443/wss/p2p/12D3KooWM3hvXvaShyp7drQCavFHuwobkYdnCp2uHU5iRRAQwsw2", + "/dns/rococo-bootnode-7.polkadot.io/tcp/443/wss/p2p/12D3KooWSbGtxfWCwn1tdmfZYESbmxzbTG2LKwKUrioDaZBcdMY4" ], "telemetryEndpoints": [ [ @@ -208,4 +216,4 @@ "childrenDefault": {} } } -} \ No newline at end of file +} diff --git a/polkadot/node/service/chain-specs/westend.json b/polkadot/node/service/chain-specs/westend.json index 43c7333f..299a1d13 100644 --- a/polkadot/node/service/chain-specs/westend.json +++ b/polkadot/node/service/chain-specs/westend.json @@ -27,7 +27,9 @@ "/dns/boot-westend.metaspan.io/tcp/33015/ws/p2p/12D3KooWNTau7iG4G9cUJSwwt2QJP1W88pUf2SgqsHjRU2RL8pfa", "/dns/boot-westend.metaspan.io/tcp/33016/wss/p2p/12D3KooWNTau7iG4G9cUJSwwt2QJP1W88pUf2SgqsHjRU2RL8pfa", "/dns/westend-bootnode.turboflakes.io/tcp/30310/p2p/12D3KooWJvPDCZmReU46ghpCMJCPVUvUCav4WQdKtXQhZgJdH6tZ", - "/dns/westend-bootnode.turboflakes.io/tcp/30410/wss/p2p/12D3KooWJvPDCZmReU46ghpCMJCPVUvUCav4WQdKtXQhZgJdH6tZ" + "/dns/westend-bootnode.turboflakes.io/tcp/30410/wss/p2p/12D3KooWJvPDCZmReU46ghpCMJCPVUvUCav4WQdKtXQhZgJdH6tZ", + "/dns/westend-boot-ng.dwellir.com/tcp/443/wss/p2p/12D3KooWJifoDhCL3swAKt7MWhFb7wLRFD9oG33AL3nAathmU24x", + "/dns/westend-boot-ng.dwellir.com/tcp/30335/p2p/12D3KooWJifoDhCL3swAKt7MWhFb7wLRFD9oG33AL3nAathmU24x" ], "telemetryEndpoints": [ [ diff --git a/polkadot/node/service/src/chain_spec.rs b/polkadot/node/service/src/chain_spec.rs index 12b65c7b..431af1ec 100644 --- a/polkadot/node/service/src/chain_spec.rs +++ b/polkadot/node/service/src/chain_spec.rs @@ -1,4 +1,4 @@ -// Copyright 2017-2020 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Polkadot. // Polkadot is free software: you can redistribute it and/or modify @@ -743,14 +743,6 @@ fn kusama_staging_testnet_config_genesis(wasm_binary: &[u8]) -> kusama::GenesisC slash_reward_fraction: Perbill::from_percent(10), ..Default::default() }, - phragmen_election: Default::default(), - democracy: Default::default(), - council: kusama::CouncilConfig { members: vec![], phantom: Default::default() }, - technical_committee: kusama::TechnicalCommitteeConfig { - members: vec![], - phantom: Default::default(), - }, - technical_membership: Default::default(), babe: kusama::BabeConfig { authorities: Default::default(), epoch_config: Some(kusama::BABE_GENESIS_EPOCH_CONFIG), @@ -1442,14 +1434,6 @@ pub fn kusama_testnet_genesis( slash_reward_fraction: Perbill::from_percent(10), ..Default::default() }, - phragmen_election: Default::default(), - democracy: kusama::DemocracyConfig::default(), - council: kusama::CouncilConfig { members: vec![], phantom: Default::default() }, - technical_committee: kusama::TechnicalCommitteeConfig { - members: vec![], - phantom: Default::default(), - }, - technical_membership: Default::default(), babe: kusama::BabeConfig { authorities: Default::default(), epoch_config: Some(kusama::BABE_GENESIS_EPOCH_CONFIG), diff --git a/polkadot/node/service/src/grandpa_support.rs b/polkadot/node/service/src/grandpa_support.rs index 14507e87..3a767d97 100644 --- a/polkadot/node/service/src/grandpa_support.rs +++ b/polkadot/node/service/src/grandpa_support.rs @@ -1,4 +1,4 @@ -// Copyright 2017-2020 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Polkadot. // Polkadot is free software: you can redistribute it and/or modify diff --git a/polkadot/node/service/src/lib.rs b/polkadot/node/service/src/lib.rs index 1cb36ea7..a8c305ae 100644 --- a/polkadot/node/service/src/lib.rs +++ b/polkadot/node/service/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2017-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Polkadot. // Polkadot is free software: you can redistribute it and/or modify @@ -104,8 +104,10 @@ pub use polkadot_client::{ pub use polkadot_primitives::{Block, BlockId, BlockNumber, CollatorPair, Hash, Id as ParaId}; pub use sc_client_api::{Backend, CallExecutor, ExecutionStrategy}; pub use sc_consensus::{BlockImport, LongestChain}; -use sc_executor::NativeElseWasmExecutor; pub use sc_executor::NativeExecutionDispatch; +use sc_executor::{ + HeapAllocStrategy, NativeElseWasmExecutor, WasmExecutor, DEFAULT_HEAP_ALLOC_STRATEGY, +}; pub use service::{ config::{DatabaseSource, PrometheusConfig}, ChainSpec, Configuration, Error as SubstrateServiceError, PruningMode, Role, RuntimeGenesis, @@ -404,12 +406,19 @@ where }) .transpose()?; - let executor = NativeElseWasmExecutor::::new( - config.wasm_method, - config.default_heap_pages, - config.max_runtime_instances, - config.runtime_cache_size, - ); + let heap_pages = config + .default_heap_pages + .map_or(DEFAULT_HEAP_ALLOC_STRATEGY, |h| HeapAllocStrategy::Static { extra_pages: h as _ }); + + let wasm = WasmExecutor::builder() + .with_execution_method(config.wasm_method) + .with_onchain_heap_alloc_strategy(heap_pages) + .with_offchain_heap_alloc_strategy(heap_pages) + .with_max_runtime_instances(config.max_runtime_instances) + .with_runtime_cache_size(config.runtime_cache_size) + .build(); + + let executor = NativeElseWasmExecutor::::new_with_wasm_executor(wasm); let (client, backend, keystore_container, task_manager) = service::new_full_parts::( @@ -522,7 +531,7 @@ where babe::block_import(babe_config.clone(), beefy_block_import, client.clone())?; let slot_duration = babe_link.config().slot_duration(); - let import_queue = babe::import_queue( + let (import_queue, babe_worker_handle) = babe::import_queue( babe_link.clone(), block_import.clone(), Some(Box::new(justification_import)), @@ -552,15 +561,12 @@ where Some(shared_authority_set.clone()), ); - let shared_epoch_changes = babe_link.epoch_changes().clone(); - let slot_duration = babe_config.slot_duration(); - let import_setup = (block_import, grandpa_link, babe_link, beefy_voter_links); let rpc_setup = shared_voter_state.clone(); let rpc_extensions_builder = { let client = client.clone(); - let keystore = keystore_container.sync_keystore(); + let keystore = keystore_container.keystore(); let transaction_pool = transaction_pool.clone(); let select_chain = select_chain.clone(); let chain_spec = config.chain_spec.cloned_box(); @@ -576,8 +582,7 @@ where chain_spec: chain_spec.cloned_box(), deny_unsafe, babe: polkadot_rpc::BabeDeps { - babe_config: babe_config.clone(), - shared_epoch_changes: shared_epoch_changes.clone(), + babe_worker_handle: babe_worker_handle.clone(), keystore: keystore.clone(), }, grandpa: polkadot_rpc::GrandpaDeps { @@ -751,13 +756,11 @@ where let chain_spec = config.chain_spec.cloned_box(); - let local_keystore = basics.keystore_container.local_keystore(); + let keystore = basics.keystore_container.local_keystore(); let auth_or_collator = role.is_authority() || is_collator.is_collator(); - let requires_overseer_for_chain_sel = local_keystore.is_some() && auth_or_collator; - let pvf_checker_enabled = role.is_authority() && !is_collator.is_collator(); - let select_chain = if requires_overseer_for_chain_sel { + let select_chain = if auth_or_collator { let metrics = polkadot_node_subsystem_util::metrics::Metrics::register(prometheus_registry.as_ref())?; @@ -765,6 +768,7 @@ where basics.backend.clone(), overseer_handle.clone(), metrics, + Some(basics.task_manager.spawn_handle()), ) } else { SelectRelayChain::new_longest_chain(basics.backend.clone()) @@ -924,7 +928,7 @@ where config, backend: backend.clone(), client: client.clone(), - keystore: keystore_container.sync_keystore(), + keystore: keystore_container.keystore(), network: network.clone(), sync_service: sync_service.clone(), rpc_builder: Box::new(rpc_extensions_builder), @@ -1000,14 +1004,7 @@ where None }; - if local_keystore.is_none() { - gum::info!("Cannot run as validator without local keystore."); - } - - let maybe_params = - local_keystore.and_then(move |k| authority_discovery_service.map(|a| (a, k))); - - let overseer_handle = if let Some((authority_discovery_service, keystore)) = maybe_params { + let overseer_handle = if let Some(authority_discovery_service) = authority_discovery_service { let (overseer, overseer_handle) = overseer_gen .generate::>( overseer_connector, @@ -1071,7 +1068,7 @@ where Some(handle) } else { assert!( - !requires_overseer_for_chain_sel, + !auth_or_collator, "Precondition congruence (false) is guaranteed by manual checking. qed" ); None @@ -1091,7 +1088,7 @@ where overseer_handle.as_ref().ok_or(Error::AuthoritiesRequireRealOverseer)?.clone(); let slot_duration = babe_link.config().slot_duration(); let babe_config = babe::BabeParams { - keystore: keystore_container.sync_keystore(), + keystore: keystore_container.keystore(), client: client.clone(), select_chain, block_import, @@ -1135,8 +1132,7 @@ where // if the node isn't actively participating in consensus then it doesn't // need a keystore, regardless of which protocol we use below. - let keystore_opt = - if role.is_authority() { Some(keystore_container.sync_keystore()) } else { None }; + let keystore_opt = if role.is_authority() { Some(keystore_container.keystore()) } else { None }; if enable_beefy { let justifications_protocol_name = beefy_on_demand_justifications_handler.protocol_name(); diff --git a/polkadot/node/service/src/overseer.rs b/polkadot/node/service/src/overseer.rs index 39a57289..d669a41f 100644 --- a/polkadot/node/service/src/overseer.rs +++ b/polkadot/node/service/src/overseer.rs @@ -1,4 +1,4 @@ -// Copyright 2017-2020 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Polkadot. // Polkadot is free software: you can redistribute it and/or modify diff --git a/polkadot/node/service/src/parachains_db/mod.rs b/polkadot/node/service/src/parachains_db/mod.rs index 74e7e13d..918aecd2 100644 --- a/polkadot/node/service/src/parachains_db/mod.rs +++ b/polkadot/node/service/src/parachains_db/mod.rs @@ -1,4 +1,4 @@ -// Copyright 2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Polkadot. // Polkadot is free software: you can redistribute it and/or modify diff --git a/polkadot/node/service/src/parachains_db/upgrade.rs b/polkadot/node/service/src/parachains_db/upgrade.rs index 01d4fb62..c52bd21c 100644 --- a/polkadot/node/service/src/parachains_db/upgrade.rs +++ b/polkadot/node/service/src/parachains_db/upgrade.rs @@ -1,4 +1,4 @@ -// Copyright 2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Polkadot. // Polkadot is free software: you can redistribute it and/or modify diff --git a/polkadot/node/service/src/relay_chain_selection.rs b/polkadot/node/service/src/relay_chain_selection.rs index 41bd08e6..afc0ce32 100644 --- a/polkadot/node/service/src/relay_chain_selection.rs +++ b/polkadot/node/service/src/relay_chain_selection.rs @@ -1,4 +1,4 @@ -// Copyright 2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Polkadot. // Polkadot is free software: you can redistribute it and/or modify @@ -40,14 +40,16 @@ use consensus_common::{Error as ConsensusError, SelectChain}; use futures::channel::oneshot; use polkadot_node_primitives::MAX_FINALITY_LAG as PRIMITIVES_MAX_FINALITY_LAG; use polkadot_node_subsystem::messages::{ - ApprovalVotingMessage, ChainSelectionMessage, DisputeCoordinatorMessage, - HighestApprovedAncestorBlock, + ApprovalDistributionMessage, ApprovalVotingMessage, ChainSelectionMessage, + DisputeCoordinatorMessage, HighestApprovedAncestorBlock, }; use polkadot_node_subsystem_util::metrics::{self, prometheus}; use polkadot_overseer::{AllMessages, Handle}; use polkadot_primitives::{Block as PolkadotBlock, BlockNumber, Hash, Header as PolkadotHeader}; use std::sync::Arc; +pub use service::SpawnTaskHandle; + /// The maximum amount of unfinalized blocks we are willing to allow due to approval checking /// or disputes. /// @@ -162,13 +164,21 @@ where /// Create a new [`SelectRelayChain`] wrapping the given chain backend /// and a handle to the overseer. - pub fn new_with_overseer(backend: Arc, overseer: Handle, metrics: Metrics) -> Self { + pub fn new_with_overseer( + backend: Arc, + overseer: Handle, + metrics: Metrics, + spawn_handle: Option, + ) -> Self { gum::debug!(target: LOG_TARGET, "Using dispute aware relay-chain selection algorithm",); SelectRelayChain { longest_chain: sc_consensus::LongestChain::new(backend.clone()), selection: IsDisputesAwareWithOverseer::Yes(SelectRelayChainInner::new( - backend, overseer, metrics, + backend, + overseer, + metrics, + spawn_handle, )), } } @@ -219,6 +229,7 @@ pub struct SelectRelayChainInner { backend: Arc, overseer: OH, metrics: Metrics, + spawn_handle: Option, } impl SelectRelayChainInner @@ -228,8 +239,13 @@ where { /// Create a new [`SelectRelayChainInner`] wrapping the given chain backend /// and a handle to the overseer. - pub fn new(backend: Arc, overseer: OH, metrics: Metrics) -> Self { - SelectRelayChainInner { backend, overseer, metrics } + pub fn new( + backend: Arc, + overseer: OH, + metrics: Metrics, + spawn_handle: Option, + ) -> Self { + SelectRelayChainInner { backend, overseer, metrics, spawn_handle } } fn block_header(&self, hash: Hash) -> Result { @@ -267,6 +283,7 @@ where backend: self.backend.clone(), overseer: self.overseer.clone(), metrics: self.metrics.clone(), + spawn_handle: self.spawn_handle.clone(), } } } @@ -307,7 +324,7 @@ impl OverseerHandleT for Handle { impl SelectRelayChainInner where B: HeaderProviderProvider, - OH: OverseerHandleT, + OH: OverseerHandleT + 'static, { /// Get all leaves of the chain, i.e. block hashes that are suitable to /// build upon and have no suitable children. @@ -455,6 +472,26 @@ where let lag = initial_leaf_number.saturating_sub(subchain_number); self.metrics.note_approval_checking_finality_lag(lag); + // Messages sent to `approval-distrbution` are known to have high `ToF`, we need to spawn a task for sending + // the message to not block here and delay finality. + if let Some(spawn_handle) = &self.spawn_handle { + let mut overseer_handle = self.overseer.clone(); + let lag_update_task = async move { + overseer_handle + .send_msg( + ApprovalDistributionMessage::ApprovalCheckingLagUpdate(lag), + std::any::type_name::(), + ) + .await; + }; + + spawn_handle.spawn( + "approval-checking-lag-update", + Some("relay-chain-selection"), + Box::pin(lag_update_task), + ); + } + let (lag, subchain_head) = { // Prevent sending flawed data to the dispute-coordinator. if Some(subchain_block_descriptions.len() as _) != diff --git a/polkadot/node/service/src/tests.rs b/polkadot/node/service/src/tests.rs index 1a2997fe..758581e1 100644 --- a/polkadot/node/service/src/tests.rs +++ b/polkadot/node/service/src/tests.rs @@ -1,4 +1,4 @@ -// Copyright 2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Polkadot. // Polkadot is free software: you can redistribute it and/or modify @@ -17,15 +17,16 @@ use super::{relay_chain_selection::*, *}; use futures::channel::oneshot::Receiver; -use polkadot_node_primitives::approval::{VRFOutput, VRFProof}; +use polkadot_node_primitives::approval::VrfSignature; use polkadot_node_subsystem::messages::{AllMessages, BlockDescription}; use polkadot_node_subsystem_test_helpers as test_helpers; use polkadot_node_subsystem_util::TimeoutExt; use polkadot_test_client::Sr25519Keyring; use sp_consensus_babe::{ digests::{CompatibleDigestItem, PreDigest, SecondaryVRFPreDigest}, - Transcript, + VrfTranscript, }; +use sp_core::{crypto::VrfSigner, testing::TaskExecutor}; use sp_runtime::{testing::*, DigestItem}; use std::{ collections::{BTreeMap, HashMap, HashSet}, @@ -74,7 +75,7 @@ fn test_harness>( .filter_level(log::LevelFilter::Trace) .try_init(); - let pool = sp_core::testing::TaskExecutor::new(); + let pool = TaskExecutor::new(); let (mut context, virtual_overseer) = test_helpers::make_subsystem_context(pool); let (finality_target_tx, finality_target_rx) = oneshot::channel::>(); @@ -83,6 +84,7 @@ fn test_harness>( Arc::new(case_vars.chain.clone()), context.sender().clone(), Default::default(), + None, ); let target_hash = case_vars.target_block.clone(); @@ -99,7 +101,6 @@ fn test_harness>( futures::pin_mut!(test_fut); futures::pin_mut!(selection_process); - futures::executor::block_on(future::join( async move { let _overseer = test_fut.await; @@ -129,12 +130,9 @@ async fn overseer_recv_with_timeout( const TIMEOUT: Duration = Duration::from_millis(2000); // used for generating assignments where the validity of the VRF doesn't matter. -fn garbage_vrf() -> (VRFOutput, VRFProof) { - let key = Sr25519Keyring::Alice.pair(); - let key = key.as_ref(); - - let (o, p, _) = key.vrf_sign(Transcript::new(b"test-garbage")); - (VRFOutput(o.to_output()), VRFProof(p)) +fn garbage_vrf_signature() -> VrfSignature { + let transcript = VrfTranscript::new(b"test-garbage", &[]); + Sr25519Keyring::Alice.pair().vrf_sign(&transcript) } /// Representation of a local representation @@ -316,13 +314,12 @@ impl ChainBuilder { fn make_header(parent_hash: Hash, number: u32) -> Header { let digest = { let mut digest = Digest::default(); - let (vrf_output, vrf_proof) = garbage_vrf(); + let vrf_signature = garbage_vrf_signature(); digest.push(DigestItem::babe_pre_digest(PreDigest::SecondaryVRF( SecondaryVRFPreDigest { authority_index: 0, slot: 1.into(), // slot, unused - vrf_output, - vrf_proof, + vrf_signature, }, ))); digest diff --git a/runtime/khala/Cargo.toml b/runtime/khala/Cargo.toml index 8ead67ef..250f1dd8 100644 --- a/runtime/khala/Cargo.toml +++ b/runtime/khala/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Phala Network"] edition = "2021" [dependencies] -hex-literal = "0.3.1" +hex-literal = "0.4.1" codec = { package = "parity-scale-codec", version = "3.0", default-features = false, features = ["derive", "max-encoded-len"] } log = { version = "0.4.14", default-features = false } scale-info = { version = "2.0", default-features = false, features = ["derive"] } @@ -17,84 +17,84 @@ phala-types = { path = "../../crates/phala-types", default-features = false } parachains-common = { path = "../../parachains-common", default-features = false } # Substrate dependencies -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", optional = true, default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", optional = true, default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", optional = true, default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", optional = true, default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-child-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-lottery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-uniques = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-child-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-lottery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-uniques = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } # Cumulus dependencies -pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } +pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } # Polkadot dependencies -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } # RMRK dependencies -pallet-rmrk-core = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-rmrk-equip = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-rmrk-market = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } -rmrk-traits = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-rmrk-rpc-runtime-api = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } +pallet-rmrk-core = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-rmrk-equip = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-rmrk-market = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } +rmrk-traits = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-rmrk-rpc-runtime-api = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } # Sygma -sygma-traits = { git = "https://github.com/Phala-Network/sygma-substrate-pallets", branch = "polkadot-v0.9.41", default-features = false } -sygma-runtime-api = { git = "https://github.com/Phala-Network/sygma-substrate-pallets", branch = "polkadot-v0.9.41", default-features = false } +sygma-traits = { git = "https://github.com/sygmaprotocol/sygma-substrate-pallets", branch = "polkadot-v0.9.42", default-features = false } +sygma-runtime-api = { git = "https://github.com/sygmaprotocol/sygma-substrate-pallets", branch = "polkadot-v0.9.42", default-features = false } # Local dependencies assets-registry = { path = "../../pallets/assets-registry", default-features = false } @@ -106,7 +106,7 @@ pallet-phala-world = { path = "../../pallets/phala-world", default-features = fa pallet-index = { path = "../../pallets/index", default-features = false } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", optional = true } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", optional = true } [features] default = ["std", "include-wasm"] diff --git a/runtime/khala/src/lib.rs b/runtime/khala/src/lib.rs index 561ed0b7..41e21375 100644 --- a/runtime/khala/src/lib.rs +++ b/runtime/khala/src/lib.rs @@ -440,6 +440,7 @@ parameter_types! { .avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO) .build_or_panic(); pub const SS58Prefix: u16 = 30; + pub MaxCollectivesProposalWeight: Weight = Perbill::from_percent(50) * RuntimeBlockWeights::get().max_block; } impl frame_system::Config for Runtime { @@ -723,6 +724,10 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = frame_system::Pallet; type WeightInfo = pallet_balances::weights::SubstrateWeight; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<0>; + type MaxFreezes = ConstU32<0>; } parameter_types! { @@ -1198,6 +1203,7 @@ impl pallet_xcm::Config for Runtime { type WeightInfo = crate::weights::pallet_xcm::WeightInfo; #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; + type AdminOrigin = EnsureRootOrHalfCouncil; } impl xcmbridge::Config for Runtime { @@ -1250,6 +1256,7 @@ impl pallet_collective::Config for Runtime { type DefaultVote = pallet_collective::PrimeDefaultVote; type SetMembersOrigin = EnsureRoot; type WeightInfo = pallet_collective::weights::SubstrateWeight; + type MaxProposalWeight = MaxCollectivesProposalWeight; } parameter_types! { @@ -1309,6 +1316,7 @@ impl pallet_collective::Config for Runtime { type DefaultVote = pallet_collective::PrimeDefaultVote; type SetMembersOrigin = EnsureRootOrHalfCouncil; type WeightInfo = pallet_collective::weights::SubstrateWeight; + type MaxProposalWeight = MaxCollectivesProposalWeight; } impl pallet_membership::Config for Runtime { @@ -1808,6 +1816,14 @@ impl_runtime_apis! { fn metadata() -> OpaqueMetadata { OpaqueMetadata::new(Runtime::metadata().into()) } + + fn metadata_at_version(version: u32) -> Option { + Runtime::metadata_at_version(version) + } + + fn metadata_versions() -> sp_std::vec::Vec { + Runtime::metadata_versions() + } } impl sp_block_builder::BlockBuilder for Runtime { diff --git a/runtime/khala/src/weights/pallet_xcm.rs b/runtime/khala/src/weights/pallet_xcm.rs index 74f90f7c..9f27ce92 100644 --- a/runtime/khala/src/weights/pallet_xcm.rs +++ b/runtime/khala/src/weights/pallet_xcm.rs @@ -1,4 +1,4 @@ -// Copyright 2021 Parity Technologies (UK) Ltd. +// Copyright Parity Technologies (UK) Ltd. // This file is part of Cumulus. // Cumulus is free software: you can redistribute it and/or modify @@ -17,16 +17,16 @@ //! Autogenerated weights for `pallet_xcm` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-02-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemint-dev +// --chain=statemine-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_xcm @@ -35,14 +35,15 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemint/src/weights/pallet_xcm.rs +// --output=./parachains/runtimes/assets/statemine/src/weights/pallet_xcm.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_xcm`. pub struct WeightInfo(PhantomData); @@ -59,11 +60,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) fn send() -> Weight { // Proof Size summary in bytes: - // Measured: `38` - // Estimated: `4645` - // Minimum execution time: 24_132 nanoseconds. - Weight::from_parts(24_554_000, 0) - .saturating_add(Weight::from_parts(0, 4645)) + // Measured: `75` + // Estimated: `3540` + // Minimum execution time: 29_342_000 picoseconds. + Weight::from_parts(29_952_000, 0) + .saturating_add(Weight::from_parts(0, 3540)) .saturating_add(T::DbWeight::get().reads(5)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -72,10 +73,10 @@ impl pallet_xcm::WeightInfo for WeightInfo { fn teleport_assets() -> Weight { // Proof Size summary in bytes: // Measured: `0` - // Estimated: `499` - // Minimum execution time: 22_350 nanoseconds. - Weight::from_parts(22_760_000, 0) - .saturating_add(Weight::from_parts(0, 499)) + // Estimated: `1489` + // Minimum execution time: 28_744_000 picoseconds. + Weight::from_parts(29_193_000, 0) + .saturating_add(Weight::from_parts(0, 1489)) .saturating_add(T::DbWeight::get().reads(1)) } /// Storage: ParachainInfo ParachainId (r:1 w:0) @@ -83,10 +84,10 @@ impl pallet_xcm::WeightInfo for WeightInfo { fn reserve_transfer_assets() -> Weight { // Proof Size summary in bytes: // Measured: `0` - // Estimated: `499` - // Minimum execution time: 17_723 nanoseconds. - Weight::from_parts(17_951_000, 0) - .saturating_add(Weight::from_parts(0, 499)) + // Estimated: `1489` + // Minimum execution time: 21_757_000 picoseconds. + Weight::from_parts(22_088_000, 0) + .saturating_add(Weight::from_parts(0, 1489)) .saturating_add(T::DbWeight::get().reads(1)) } /// Storage: Benchmark Override (r:0 w:0) @@ -95,7 +96,7 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551 nanoseconds. + // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. Weight::from_parts(18_446_744_073_709_551_000, 0) .saturating_add(Weight::from_parts(0, 0)) } @@ -105,8 +106,8 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 8_641 nanoseconds. - Weight::from_parts(8_925_000, 0) + // Minimum execution time: 10_671_000 picoseconds. + Weight::from_parts(10_948_000, 0) .saturating_add(Weight::from_parts(0, 0)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -116,8 +117,8 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_427 nanoseconds. - Weight::from_parts(2_598_000, 0) + // Minimum execution time: 3_132_000 picoseconds. + Weight::from_parts(3_374_000, 0) .saturating_add(Weight::from_parts(0, 0)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -139,11 +140,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: PolkadotXcm Queries (max_values: None, max_size: None, mode: Measured) fn force_subscribe_version_notify() -> Weight { // Proof Size summary in bytes: - // Measured: `38` - // Estimated: `7729` - // Minimum execution time: 28_650 nanoseconds. - Weight::from_parts(29_035_000, 0) - .saturating_add(Weight::from_parts(0, 7729)) + // Measured: `75` + // Estimated: `3540` + // Minimum execution time: 33_780_000 picoseconds. + Weight::from_parts(34_531_000, 0) + .saturating_add(Weight::from_parts(0, 3540)) .saturating_add(T::DbWeight::get().reads(7)) .saturating_add(T::DbWeight::get().writes(5)) } @@ -163,23 +164,34 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: PolkadotXcm Queries (max_values: None, max_size: None, mode: Measured) fn force_unsubscribe_version_notify() -> Weight { // Proof Size summary in bytes: - // Measured: `220` - // Estimated: `8470` - // Minimum execution time: 30_797 nanoseconds. - Weight::from_parts(31_491_000, 0) - .saturating_add(Weight::from_parts(0, 8470)) + // Measured: `257` + // Estimated: `3722` + // Minimum execution time: 35_215_000 picoseconds. + Weight::from_parts(35_685_000, 0) + .saturating_add(Weight::from_parts(0, 3722)) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(4)) } + /// Storage: PolkadotXcm XcmExecutionSuspended (r:0 w:1) + /// Proof Skipped: PolkadotXcm XcmExecutionSuspended (max_values: Some(1), max_size: None, mode: Measured) + fn force_suspension() -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 3_252_000 picoseconds. + Weight::from_parts(3_392_000, 0) + .saturating_add(Weight::from_parts(0, 0)) + .saturating_add(T::DbWeight::get().writes(1)) + } /// Storage: PolkadotXcm SupportedVersion (r:4 w:2) /// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured) fn migrate_supported_version() -> Weight { // Proof Size summary in bytes: - // Measured: `95` - // Estimated: `9995` - // Minimum execution time: 13_639 nanoseconds. - Weight::from_parts(13_980_000, 0) - .saturating_add(Weight::from_parts(0, 9995)) + // Measured: `129` + // Estimated: `11019` + // Minimum execution time: 17_330_000 picoseconds. + Weight::from_parts(17_730_000, 0) + .saturating_add(Weight::from_parts(0, 11019)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -187,11 +199,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: PolkadotXcm VersionNotifiers (max_values: None, max_size: None, mode: Measured) fn migrate_version_notifiers() -> Weight { // Proof Size summary in bytes: - // Measured: `99` - // Estimated: `9999` - // Minimum execution time: 13_954 nanoseconds. - Weight::from_parts(14_276_000, 0) - .saturating_add(Weight::from_parts(0, 9999)) + // Measured: `133` + // Estimated: `11023` + // Minimum execution time: 17_129_000 picoseconds. + Weight::from_parts(17_665_000, 0) + .saturating_add(Weight::from_parts(0, 11023)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -199,11 +211,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured) fn already_notified_target() -> Weight { // Proof Size summary in bytes: - // Measured: `106` - // Estimated: `12481` - // Minimum execution time: 15_217 nanoseconds. - Weight::from_parts(15_422_000, 0) - .saturating_add(Weight::from_parts(0, 12481)) + // Measured: `140` + // Estimated: `13505` + // Minimum execution time: 18_220_000 picoseconds. + Weight::from_parts(18_764_000, 0) + .saturating_add(Weight::from_parts(0, 13505)) .saturating_add(T::DbWeight::get().reads(5)) } /// Storage: PolkadotXcm VersionNotifyTargets (r:2 w:1) @@ -220,11 +232,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) fn notify_current_targets() -> Weight { // Proof Size summary in bytes: - // Measured: `106` - // Estimated: `10041` - // Minimum execution time: 27_362 nanoseconds. - Weight::from_parts(28_034_000, 0) - .saturating_add(Weight::from_parts(0, 10041)) + // Measured: `142` + // Estimated: `6082` + // Minimum execution time: 31_356_000 picoseconds. + Weight::from_parts(31_850_000, 0) + .saturating_add(Weight::from_parts(0, 6082)) .saturating_add(T::DbWeight::get().reads(7)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -232,22 +244,22 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured) fn notify_target_migration_fail() -> Weight { // Proof Size summary in bytes: - // Measured: `136` - // Estimated: `7561` - // Minimum execution time: 7_768 nanoseconds. - Weight::from_parts(7_890_000, 0) - .saturating_add(Weight::from_parts(0, 7561)) + // Measured: `172` + // Estimated: `8587` + // Minimum execution time: 9_299_000 picoseconds. + Weight::from_parts(9_515_000, 0) + .saturating_add(Weight::from_parts(0, 8587)) .saturating_add(T::DbWeight::get().reads(3)) } /// Storage: PolkadotXcm VersionNotifyTargets (r:4 w:2) /// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured) fn migrate_version_notify_targets() -> Weight { // Proof Size summary in bytes: - // Measured: `106` - // Estimated: `10006` - // Minimum execution time: 15_165 nanoseconds. - Weight::from_parts(15_430_000, 0) - .saturating_add(Weight::from_parts(0, 10006)) + // Measured: `140` + // Estimated: `11030` + // Minimum execution time: 17_472_000 picoseconds. + Weight::from_parts(18_170_000, 0) + .saturating_add(Weight::from_parts(0, 11030)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -265,11 +277,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) fn migrate_and_notify_old_targets() -> Weight { // Proof Size summary in bytes: - // Measured: `112` - // Estimated: `15027` - // Minimum execution time: 35_310 nanoseconds. - Weight::from_parts(35_698_000, 0) - .saturating_add(Weight::from_parts(0, 15027)) + // Measured: `146` + // Estimated: `11036` + // Minimum execution time: 39_134_000 picoseconds. + Weight::from_parts(39_847_000, 0) + .saturating_add(Weight::from_parts(0, 11036)) .saturating_add(T::DbWeight::get().reads(9)) .saturating_add(T::DbWeight::get().writes(4)) } diff --git a/runtime/phala/Cargo.toml b/runtime/phala/Cargo.toml index f225ed72..fe5f5921 100644 --- a/runtime/phala/Cargo.toml +++ b/runtime/phala/Cargo.toml @@ -9,7 +9,7 @@ codec = { package = "parity-scale-codec", version = "3.0", default-features = fa log = { version = "0.4.14", default-features = false } scale-info = { version = "2.0", default-features = false, features = ["derive"] } serde = { version = "1.0.132", optional = true, features = ["derive"] } -hex-literal = "0.3.1" +hex-literal = "0.4.1" smallvec = "1.6.1" static_assertions = "1.1.0" @@ -17,84 +17,84 @@ phala-types = { path = "../../crates/phala-types", default-features = false } parachains-common = { path = "../../parachains-common", default-features = false } # Substrate dependencies -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", optional = true, default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", optional = true, default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", optional = true, default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", optional = true, default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-child-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-lottery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-uniques = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-child-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-lottery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-uniques = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } # Cumulus dependencies -pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } +pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } # Polkadot dependencies -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } # RMRK dependencies -pallet-rmrk-core = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-rmrk-equip = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-rmrk-market = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } -rmrk-traits = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-rmrk-rpc-runtime-api = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } +pallet-rmrk-core = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-rmrk-equip = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-rmrk-market = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } +rmrk-traits = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-rmrk-rpc-runtime-api = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } # Sygma -sygma-traits = { git = "https://github.com/Phala-Network/sygma-substrate-pallets", branch = "polkadot-v0.9.41", default-features = false } -sygma-runtime-api = { git = "https://github.com/Phala-Network/sygma-substrate-pallets", branch = "polkadot-v0.9.41", default-features = false } +sygma-traits = { git = "https://github.com/sygmaprotocol/sygma-substrate-pallets", branch = "polkadot-v0.9.42", default-features = false } +sygma-runtime-api = { git = "https://github.com/sygmaprotocol/sygma-substrate-pallets", branch = "polkadot-v0.9.42", default-features = false } # Local dependencies assets-registry = { path = "../../pallets/assets-registry", default-features = false } @@ -105,7 +105,7 @@ subbridge-pallets = { path = "../../pallets/subbridge", default-features = false pallet-index = { path = "../../pallets/index", default-features = false } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", optional = true } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", optional = true } [features] default = ["std", "include-wasm"] diff --git a/runtime/phala/src/lib.rs b/runtime/phala/src/lib.rs index 43476cfe..77880a22 100644 --- a/runtime/phala/src/lib.rs +++ b/runtime/phala/src/lib.rs @@ -432,6 +432,7 @@ parameter_types! { .avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO) .build_or_panic(); pub const SS58Prefix: u16 = 30; + pub MaxCollectivesProposalWeight: Weight = Perbill::from_percent(50) * RuntimeBlockWeights::get().max_block; } impl frame_system::Config for Runtime { @@ -715,6 +716,10 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = frame_system::Pallet; type WeightInfo = pallet_balances::weights::SubstrateWeight; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<0>; + type MaxFreezes = ConstU32<0>; } parameter_types! { @@ -972,6 +977,7 @@ impl pallet_collective::Config for Runtime { type DefaultVote = pallet_collective::PrimeDefaultVote; type SetMembersOrigin = EnsureRoot; type WeightInfo = pallet_collective::weights::SubstrateWeight; + type MaxProposalWeight = MaxCollectivesProposalWeight; } parameter_types! { @@ -1031,6 +1037,7 @@ impl pallet_collective::Config for Runtime { type DefaultVote = pallet_collective::PrimeDefaultVote; type SetMembersOrigin = EnsureRootOrHalfCouncil; type WeightInfo = pallet_collective::weights::SubstrateWeight; + type MaxProposalWeight = MaxCollectivesProposalWeight; } impl pallet_membership::Config for Runtime { @@ -1471,6 +1478,7 @@ impl pallet_xcm::Config for Runtime { type WeightInfo = crate::weights::pallet_xcm::WeightInfo; #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; + type AdminOrigin = EnsureRootOrHalfCouncil; } impl xcmbridge::Config for Runtime { @@ -1766,6 +1774,14 @@ impl_runtime_apis! { fn metadata() -> OpaqueMetadata { OpaqueMetadata::new(Runtime::metadata().into()) } + + fn metadata_at_version(version: u32) -> Option { + Runtime::metadata_at_version(version) + } + + fn metadata_versions() -> sp_std::vec::Vec { + Runtime::metadata_versions() + } } impl sp_block_builder::BlockBuilder for Runtime { diff --git a/runtime/phala/src/weights/pallet_xcm.rs b/runtime/phala/src/weights/pallet_xcm.rs index 74f90f7c..9f27ce92 100644 --- a/runtime/phala/src/weights/pallet_xcm.rs +++ b/runtime/phala/src/weights/pallet_xcm.rs @@ -1,4 +1,4 @@ -// Copyright 2021 Parity Technologies (UK) Ltd. +// Copyright Parity Technologies (UK) Ltd. // This file is part of Cumulus. // Cumulus is free software: you can redistribute it and/or modify @@ -17,16 +17,16 @@ //! Autogenerated weights for `pallet_xcm` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-02-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemint-dev +// --chain=statemine-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_xcm @@ -35,14 +35,15 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemint/src/weights/pallet_xcm.rs +// --output=./parachains/runtimes/assets/statemine/src/weights/pallet_xcm.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_xcm`. pub struct WeightInfo(PhantomData); @@ -59,11 +60,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) fn send() -> Weight { // Proof Size summary in bytes: - // Measured: `38` - // Estimated: `4645` - // Minimum execution time: 24_132 nanoseconds. - Weight::from_parts(24_554_000, 0) - .saturating_add(Weight::from_parts(0, 4645)) + // Measured: `75` + // Estimated: `3540` + // Minimum execution time: 29_342_000 picoseconds. + Weight::from_parts(29_952_000, 0) + .saturating_add(Weight::from_parts(0, 3540)) .saturating_add(T::DbWeight::get().reads(5)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -72,10 +73,10 @@ impl pallet_xcm::WeightInfo for WeightInfo { fn teleport_assets() -> Weight { // Proof Size summary in bytes: // Measured: `0` - // Estimated: `499` - // Minimum execution time: 22_350 nanoseconds. - Weight::from_parts(22_760_000, 0) - .saturating_add(Weight::from_parts(0, 499)) + // Estimated: `1489` + // Minimum execution time: 28_744_000 picoseconds. + Weight::from_parts(29_193_000, 0) + .saturating_add(Weight::from_parts(0, 1489)) .saturating_add(T::DbWeight::get().reads(1)) } /// Storage: ParachainInfo ParachainId (r:1 w:0) @@ -83,10 +84,10 @@ impl pallet_xcm::WeightInfo for WeightInfo { fn reserve_transfer_assets() -> Weight { // Proof Size summary in bytes: // Measured: `0` - // Estimated: `499` - // Minimum execution time: 17_723 nanoseconds. - Weight::from_parts(17_951_000, 0) - .saturating_add(Weight::from_parts(0, 499)) + // Estimated: `1489` + // Minimum execution time: 21_757_000 picoseconds. + Weight::from_parts(22_088_000, 0) + .saturating_add(Weight::from_parts(0, 1489)) .saturating_add(T::DbWeight::get().reads(1)) } /// Storage: Benchmark Override (r:0 w:0) @@ -95,7 +96,7 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551 nanoseconds. + // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. Weight::from_parts(18_446_744_073_709_551_000, 0) .saturating_add(Weight::from_parts(0, 0)) } @@ -105,8 +106,8 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 8_641 nanoseconds. - Weight::from_parts(8_925_000, 0) + // Minimum execution time: 10_671_000 picoseconds. + Weight::from_parts(10_948_000, 0) .saturating_add(Weight::from_parts(0, 0)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -116,8 +117,8 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_427 nanoseconds. - Weight::from_parts(2_598_000, 0) + // Minimum execution time: 3_132_000 picoseconds. + Weight::from_parts(3_374_000, 0) .saturating_add(Weight::from_parts(0, 0)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -139,11 +140,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: PolkadotXcm Queries (max_values: None, max_size: None, mode: Measured) fn force_subscribe_version_notify() -> Weight { // Proof Size summary in bytes: - // Measured: `38` - // Estimated: `7729` - // Minimum execution time: 28_650 nanoseconds. - Weight::from_parts(29_035_000, 0) - .saturating_add(Weight::from_parts(0, 7729)) + // Measured: `75` + // Estimated: `3540` + // Minimum execution time: 33_780_000 picoseconds. + Weight::from_parts(34_531_000, 0) + .saturating_add(Weight::from_parts(0, 3540)) .saturating_add(T::DbWeight::get().reads(7)) .saturating_add(T::DbWeight::get().writes(5)) } @@ -163,23 +164,34 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: PolkadotXcm Queries (max_values: None, max_size: None, mode: Measured) fn force_unsubscribe_version_notify() -> Weight { // Proof Size summary in bytes: - // Measured: `220` - // Estimated: `8470` - // Minimum execution time: 30_797 nanoseconds. - Weight::from_parts(31_491_000, 0) - .saturating_add(Weight::from_parts(0, 8470)) + // Measured: `257` + // Estimated: `3722` + // Minimum execution time: 35_215_000 picoseconds. + Weight::from_parts(35_685_000, 0) + .saturating_add(Weight::from_parts(0, 3722)) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(4)) } + /// Storage: PolkadotXcm XcmExecutionSuspended (r:0 w:1) + /// Proof Skipped: PolkadotXcm XcmExecutionSuspended (max_values: Some(1), max_size: None, mode: Measured) + fn force_suspension() -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 3_252_000 picoseconds. + Weight::from_parts(3_392_000, 0) + .saturating_add(Weight::from_parts(0, 0)) + .saturating_add(T::DbWeight::get().writes(1)) + } /// Storage: PolkadotXcm SupportedVersion (r:4 w:2) /// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured) fn migrate_supported_version() -> Weight { // Proof Size summary in bytes: - // Measured: `95` - // Estimated: `9995` - // Minimum execution time: 13_639 nanoseconds. - Weight::from_parts(13_980_000, 0) - .saturating_add(Weight::from_parts(0, 9995)) + // Measured: `129` + // Estimated: `11019` + // Minimum execution time: 17_330_000 picoseconds. + Weight::from_parts(17_730_000, 0) + .saturating_add(Weight::from_parts(0, 11019)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -187,11 +199,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: PolkadotXcm VersionNotifiers (max_values: None, max_size: None, mode: Measured) fn migrate_version_notifiers() -> Weight { // Proof Size summary in bytes: - // Measured: `99` - // Estimated: `9999` - // Minimum execution time: 13_954 nanoseconds. - Weight::from_parts(14_276_000, 0) - .saturating_add(Weight::from_parts(0, 9999)) + // Measured: `133` + // Estimated: `11023` + // Minimum execution time: 17_129_000 picoseconds. + Weight::from_parts(17_665_000, 0) + .saturating_add(Weight::from_parts(0, 11023)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -199,11 +211,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured) fn already_notified_target() -> Weight { // Proof Size summary in bytes: - // Measured: `106` - // Estimated: `12481` - // Minimum execution time: 15_217 nanoseconds. - Weight::from_parts(15_422_000, 0) - .saturating_add(Weight::from_parts(0, 12481)) + // Measured: `140` + // Estimated: `13505` + // Minimum execution time: 18_220_000 picoseconds. + Weight::from_parts(18_764_000, 0) + .saturating_add(Weight::from_parts(0, 13505)) .saturating_add(T::DbWeight::get().reads(5)) } /// Storage: PolkadotXcm VersionNotifyTargets (r:2 w:1) @@ -220,11 +232,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) fn notify_current_targets() -> Weight { // Proof Size summary in bytes: - // Measured: `106` - // Estimated: `10041` - // Minimum execution time: 27_362 nanoseconds. - Weight::from_parts(28_034_000, 0) - .saturating_add(Weight::from_parts(0, 10041)) + // Measured: `142` + // Estimated: `6082` + // Minimum execution time: 31_356_000 picoseconds. + Weight::from_parts(31_850_000, 0) + .saturating_add(Weight::from_parts(0, 6082)) .saturating_add(T::DbWeight::get().reads(7)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -232,22 +244,22 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured) fn notify_target_migration_fail() -> Weight { // Proof Size summary in bytes: - // Measured: `136` - // Estimated: `7561` - // Minimum execution time: 7_768 nanoseconds. - Weight::from_parts(7_890_000, 0) - .saturating_add(Weight::from_parts(0, 7561)) + // Measured: `172` + // Estimated: `8587` + // Minimum execution time: 9_299_000 picoseconds. + Weight::from_parts(9_515_000, 0) + .saturating_add(Weight::from_parts(0, 8587)) .saturating_add(T::DbWeight::get().reads(3)) } /// Storage: PolkadotXcm VersionNotifyTargets (r:4 w:2) /// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured) fn migrate_version_notify_targets() -> Weight { // Proof Size summary in bytes: - // Measured: `106` - // Estimated: `10006` - // Minimum execution time: 15_165 nanoseconds. - Weight::from_parts(15_430_000, 0) - .saturating_add(Weight::from_parts(0, 10006)) + // Measured: `140` + // Estimated: `11030` + // Minimum execution time: 17_472_000 picoseconds. + Weight::from_parts(18_170_000, 0) + .saturating_add(Weight::from_parts(0, 11030)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -265,11 +277,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) fn migrate_and_notify_old_targets() -> Weight { // Proof Size summary in bytes: - // Measured: `112` - // Estimated: `15027` - // Minimum execution time: 35_310 nanoseconds. - Weight::from_parts(35_698_000, 0) - .saturating_add(Weight::from_parts(0, 15027)) + // Measured: `146` + // Estimated: `11036` + // Minimum execution time: 39_134_000 picoseconds. + Weight::from_parts(39_847_000, 0) + .saturating_add(Weight::from_parts(0, 11036)) .saturating_add(T::DbWeight::get().reads(9)) .saturating_add(T::DbWeight::get().writes(4)) } diff --git a/runtime/rhala/Cargo.toml b/runtime/rhala/Cargo.toml index 98930c64..f4d3f48c 100644 --- a/runtime/rhala/Cargo.toml +++ b/runtime/rhala/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" codec = { package = "parity-scale-codec", version = "3.0", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.0", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } -hex-literal = "0.3.1" +hex-literal = "0.4.1" static_assertions = "1.1.0" smallvec = "1.6.1" @@ -19,89 +19,89 @@ phala-types = { path = "../../crates/phala-types", default-features = false } parachains-common = { path = "../../parachains-common", default-features = false } # Substrate dependencies -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", optional = true, default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", optional = true, default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", optional = true, default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", optional = true, default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-child-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-lottery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-uniques = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-child-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-lottery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-uniques = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } # Cumulus dependencies -pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } +pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } # Polkadot dependencies -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } # RMRK dependencies -pallet-rmrk-core = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-rmrk-equip = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-rmrk-market = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } -rmrk-traits = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-rmrk-rpc-runtime-api = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } +pallet-rmrk-core = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-rmrk-equip = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-rmrk-market = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } +rmrk-traits = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-rmrk-rpc-runtime-api = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } # Sygma dependencies -sygma-basic-feehandler = { git = "https://github.com/Phala-Network/sygma-substrate-pallets", branch = "polkadot-v0.9.41", default-features = false } -sygma-traits = { git = "https://github.com/Phala-Network/sygma-substrate-pallets", branch = "polkadot-v0.9.41", default-features = false } -sygma-bridge = { git = "https://github.com/Phala-Network/sygma-substrate-pallets", branch = "polkadot-v0.9.41", default-features = false } -sygma-access-segregator = { git = "https://github.com/Phala-Network/sygma-substrate-pallets", branch = "polkadot-v0.9.41", default-features = false } -sygma-fee-handler-router = { git = "https://github.com/Phala-Network/sygma-substrate-pallets", branch = "polkadot-v0.9.41", default-features = false } -sygma-runtime-api = { git = "https://github.com/Phala-Network/sygma-substrate-pallets", branch = "polkadot-v0.9.41", default-features = false } +sygma-basic-feehandler = { git = "https://github.com/sygmaprotocol/sygma-substrate-pallets", branch = "polkadot-v0.9.42", default-features = false } +sygma-traits = { git = "https://github.com/sygmaprotocol/sygma-substrate-pallets", branch = "polkadot-v0.9.42", default-features = false } +sygma-bridge = { git = "https://github.com/sygmaprotocol/sygma-substrate-pallets", branch = "polkadot-v0.9.42", default-features = false } +sygma-access-segregator = { git = "https://github.com/sygmaprotocol/sygma-substrate-pallets", branch = "polkadot-v0.9.42", default-features = false } +sygma-fee-handler-router = { git = "https://github.com/sygmaprotocol/sygma-substrate-pallets", branch = "polkadot-v0.9.42", default-features = false } +sygma-runtime-api = { git = "https://github.com/sygmaprotocol/sygma-substrate-pallets", branch = "polkadot-v0.9.42", default-features = false } # Local dependencies assets-registry = { path = "../../pallets/assets-registry", default-features = false } @@ -112,10 +112,10 @@ subbridge-pallets = { path = "../../pallets/subbridge", default-features = false pallet-phala-world = { path = "../../pallets/phala-world", default-features = false } # InvArch Tinkernet Multisig dependencies -invarch-xcm-builder = { git = "https://github.com/InvArch/InvArch-XCM-Builder", branch = "polkadot-v0.9.41", default-features = false } +invarch-xcm-builder = { git = "https://github.com/InvArch/InvArch-XCM-Builder", branch = "polkadot-v0.9.42", default-features = false } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", optional = true } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", optional = true } [features] default = ["std", "include-wasm"] diff --git a/runtime/rhala/src/lib.rs b/runtime/rhala/src/lib.rs index e72f3a2f..7db55a04 100644 --- a/runtime/rhala/src/lib.rs +++ b/runtime/rhala/src/lib.rs @@ -442,6 +442,7 @@ parameter_types! { .avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO) .build_or_panic(); pub const SS58Prefix: u16 = 30; + pub MaxCollectivesProposalWeight: Weight = Perbill::from_percent(50) * RuntimeBlockWeights::get().max_block; } impl frame_system::Config for Runtime { @@ -725,6 +726,10 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = frame_system::Pallet; type WeightInfo = pallet_balances::weights::SubstrateWeight; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<0>; + type MaxFreezes = ConstU32<0>; } parameter_types! { @@ -1213,6 +1218,7 @@ impl pallet_xcm::Config for Runtime { type WeightInfo = crate::weights::pallet_xcm::WeightInfo; #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; + type AdminOrigin = EnsureRootOrHalfCouncil; } impl xcmbridge::Config for Runtime { @@ -1265,6 +1271,7 @@ impl pallet_collective::Config for Runtime { type DefaultVote = pallet_collective::PrimeDefaultVote; type SetMembersOrigin = EnsureRoot; type WeightInfo = pallet_collective::weights::SubstrateWeight; + type MaxProposalWeight = MaxCollectivesProposalWeight; } parameter_types! { @@ -1324,6 +1331,7 @@ impl pallet_collective::Config for Runtime { type DefaultVote = pallet_collective::PrimeDefaultVote; type SetMembersOrigin = EnsureRoot; type WeightInfo = pallet_collective::weights::SubstrateWeight; + type MaxProposalWeight = MaxCollectivesProposalWeight; } impl pallet_membership::Config for Runtime { @@ -1638,12 +1646,14 @@ impl sygma_access_segregator::Config for Runtime { type BridgeCommitteeOrigin = EnsureRootOrHalfCouncil; type PalletIndex = SygmaAccessSegregatorPalletIndex; type Extrinsics = RegisteredExtrinsics; + type WeightInfo = sygma_access_segregator::weights::SygmaWeightInfo; } impl sygma_basic_feehandler::Config for Runtime { type RuntimeEvent = RuntimeEvent; type BridgeCommitteeOrigin = EnsureRootOrHalfCouncil; type PalletIndex = SygmaBasicFeeHandlerPalletIndex; + type WeightInfo = sygma_basic_feehandler::weights::SygmaWeightInfo; } impl sygma_fee_handler_router::Config for Runtime { @@ -1652,6 +1662,7 @@ impl sygma_fee_handler_router::Config for Runtime { type BasicFeeHandler = SygmaBasicFeeHandler; type DynamicFeeHandler = (); type PalletIndex = SygmaFeeHandlerRouterPalletIndex; + type WeightInfo = sygma_fee_handler_router::weights::SygmaWeightInfo; } impl sygma_bridge::Config for Runtime { @@ -1678,6 +1689,7 @@ impl sygma_bridge::Config for Runtime { type PalletId = SygmaBridgePalletId; type PalletIndex = SygmaBridgePalletIndex; type DecimalConverter = assets_registry::SygmaDecimalConverter; + type WeightInfo = sygma_bridge::weights::SygmaWeightInfo; } impl sygma_wrapper::Config for Runtime { @@ -1905,6 +1917,14 @@ impl_runtime_apis! { fn metadata() -> OpaqueMetadata { OpaqueMetadata::new(Runtime::metadata().into()) } + + fn metadata_at_version(version: u32) -> Option { + Runtime::metadata_at_version(version) + } + + fn metadata_versions() -> sp_std::vec::Vec { + Runtime::metadata_versions() + } } impl sp_block_builder::BlockBuilder for Runtime { diff --git a/runtime/rhala/src/weights/pallet_xcm.rs b/runtime/rhala/src/weights/pallet_xcm.rs index 74f90f7c..9f27ce92 100644 --- a/runtime/rhala/src/weights/pallet_xcm.rs +++ b/runtime/rhala/src/weights/pallet_xcm.rs @@ -1,4 +1,4 @@ -// Copyright 2021 Parity Technologies (UK) Ltd. +// Copyright Parity Technologies (UK) Ltd. // This file is part of Cumulus. // Cumulus is free software: you can redistribute it and/or modify @@ -17,16 +17,16 @@ //! Autogenerated weights for `pallet_xcm` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-02-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemint-dev +// --chain=statemine-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_xcm @@ -35,14 +35,15 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemint/src/weights/pallet_xcm.rs +// --output=./parachains/runtimes/assets/statemine/src/weights/pallet_xcm.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_xcm`. pub struct WeightInfo(PhantomData); @@ -59,11 +60,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) fn send() -> Weight { // Proof Size summary in bytes: - // Measured: `38` - // Estimated: `4645` - // Minimum execution time: 24_132 nanoseconds. - Weight::from_parts(24_554_000, 0) - .saturating_add(Weight::from_parts(0, 4645)) + // Measured: `75` + // Estimated: `3540` + // Minimum execution time: 29_342_000 picoseconds. + Weight::from_parts(29_952_000, 0) + .saturating_add(Weight::from_parts(0, 3540)) .saturating_add(T::DbWeight::get().reads(5)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -72,10 +73,10 @@ impl pallet_xcm::WeightInfo for WeightInfo { fn teleport_assets() -> Weight { // Proof Size summary in bytes: // Measured: `0` - // Estimated: `499` - // Minimum execution time: 22_350 nanoseconds. - Weight::from_parts(22_760_000, 0) - .saturating_add(Weight::from_parts(0, 499)) + // Estimated: `1489` + // Minimum execution time: 28_744_000 picoseconds. + Weight::from_parts(29_193_000, 0) + .saturating_add(Weight::from_parts(0, 1489)) .saturating_add(T::DbWeight::get().reads(1)) } /// Storage: ParachainInfo ParachainId (r:1 w:0) @@ -83,10 +84,10 @@ impl pallet_xcm::WeightInfo for WeightInfo { fn reserve_transfer_assets() -> Weight { // Proof Size summary in bytes: // Measured: `0` - // Estimated: `499` - // Minimum execution time: 17_723 nanoseconds. - Weight::from_parts(17_951_000, 0) - .saturating_add(Weight::from_parts(0, 499)) + // Estimated: `1489` + // Minimum execution time: 21_757_000 picoseconds. + Weight::from_parts(22_088_000, 0) + .saturating_add(Weight::from_parts(0, 1489)) .saturating_add(T::DbWeight::get().reads(1)) } /// Storage: Benchmark Override (r:0 w:0) @@ -95,7 +96,7 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551 nanoseconds. + // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. Weight::from_parts(18_446_744_073_709_551_000, 0) .saturating_add(Weight::from_parts(0, 0)) } @@ -105,8 +106,8 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 8_641 nanoseconds. - Weight::from_parts(8_925_000, 0) + // Minimum execution time: 10_671_000 picoseconds. + Weight::from_parts(10_948_000, 0) .saturating_add(Weight::from_parts(0, 0)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -116,8 +117,8 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_427 nanoseconds. - Weight::from_parts(2_598_000, 0) + // Minimum execution time: 3_132_000 picoseconds. + Weight::from_parts(3_374_000, 0) .saturating_add(Weight::from_parts(0, 0)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -139,11 +140,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: PolkadotXcm Queries (max_values: None, max_size: None, mode: Measured) fn force_subscribe_version_notify() -> Weight { // Proof Size summary in bytes: - // Measured: `38` - // Estimated: `7729` - // Minimum execution time: 28_650 nanoseconds. - Weight::from_parts(29_035_000, 0) - .saturating_add(Weight::from_parts(0, 7729)) + // Measured: `75` + // Estimated: `3540` + // Minimum execution time: 33_780_000 picoseconds. + Weight::from_parts(34_531_000, 0) + .saturating_add(Weight::from_parts(0, 3540)) .saturating_add(T::DbWeight::get().reads(7)) .saturating_add(T::DbWeight::get().writes(5)) } @@ -163,23 +164,34 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: PolkadotXcm Queries (max_values: None, max_size: None, mode: Measured) fn force_unsubscribe_version_notify() -> Weight { // Proof Size summary in bytes: - // Measured: `220` - // Estimated: `8470` - // Minimum execution time: 30_797 nanoseconds. - Weight::from_parts(31_491_000, 0) - .saturating_add(Weight::from_parts(0, 8470)) + // Measured: `257` + // Estimated: `3722` + // Minimum execution time: 35_215_000 picoseconds. + Weight::from_parts(35_685_000, 0) + .saturating_add(Weight::from_parts(0, 3722)) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(4)) } + /// Storage: PolkadotXcm XcmExecutionSuspended (r:0 w:1) + /// Proof Skipped: PolkadotXcm XcmExecutionSuspended (max_values: Some(1), max_size: None, mode: Measured) + fn force_suspension() -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 3_252_000 picoseconds. + Weight::from_parts(3_392_000, 0) + .saturating_add(Weight::from_parts(0, 0)) + .saturating_add(T::DbWeight::get().writes(1)) + } /// Storage: PolkadotXcm SupportedVersion (r:4 w:2) /// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured) fn migrate_supported_version() -> Weight { // Proof Size summary in bytes: - // Measured: `95` - // Estimated: `9995` - // Minimum execution time: 13_639 nanoseconds. - Weight::from_parts(13_980_000, 0) - .saturating_add(Weight::from_parts(0, 9995)) + // Measured: `129` + // Estimated: `11019` + // Minimum execution time: 17_330_000 picoseconds. + Weight::from_parts(17_730_000, 0) + .saturating_add(Weight::from_parts(0, 11019)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -187,11 +199,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: PolkadotXcm VersionNotifiers (max_values: None, max_size: None, mode: Measured) fn migrate_version_notifiers() -> Weight { // Proof Size summary in bytes: - // Measured: `99` - // Estimated: `9999` - // Minimum execution time: 13_954 nanoseconds. - Weight::from_parts(14_276_000, 0) - .saturating_add(Weight::from_parts(0, 9999)) + // Measured: `133` + // Estimated: `11023` + // Minimum execution time: 17_129_000 picoseconds. + Weight::from_parts(17_665_000, 0) + .saturating_add(Weight::from_parts(0, 11023)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -199,11 +211,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured) fn already_notified_target() -> Weight { // Proof Size summary in bytes: - // Measured: `106` - // Estimated: `12481` - // Minimum execution time: 15_217 nanoseconds. - Weight::from_parts(15_422_000, 0) - .saturating_add(Weight::from_parts(0, 12481)) + // Measured: `140` + // Estimated: `13505` + // Minimum execution time: 18_220_000 picoseconds. + Weight::from_parts(18_764_000, 0) + .saturating_add(Weight::from_parts(0, 13505)) .saturating_add(T::DbWeight::get().reads(5)) } /// Storage: PolkadotXcm VersionNotifyTargets (r:2 w:1) @@ -220,11 +232,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) fn notify_current_targets() -> Weight { // Proof Size summary in bytes: - // Measured: `106` - // Estimated: `10041` - // Minimum execution time: 27_362 nanoseconds. - Weight::from_parts(28_034_000, 0) - .saturating_add(Weight::from_parts(0, 10041)) + // Measured: `142` + // Estimated: `6082` + // Minimum execution time: 31_356_000 picoseconds. + Weight::from_parts(31_850_000, 0) + .saturating_add(Weight::from_parts(0, 6082)) .saturating_add(T::DbWeight::get().reads(7)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -232,22 +244,22 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured) fn notify_target_migration_fail() -> Weight { // Proof Size summary in bytes: - // Measured: `136` - // Estimated: `7561` - // Minimum execution time: 7_768 nanoseconds. - Weight::from_parts(7_890_000, 0) - .saturating_add(Weight::from_parts(0, 7561)) + // Measured: `172` + // Estimated: `8587` + // Minimum execution time: 9_299_000 picoseconds. + Weight::from_parts(9_515_000, 0) + .saturating_add(Weight::from_parts(0, 8587)) .saturating_add(T::DbWeight::get().reads(3)) } /// Storage: PolkadotXcm VersionNotifyTargets (r:4 w:2) /// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured) fn migrate_version_notify_targets() -> Weight { // Proof Size summary in bytes: - // Measured: `106` - // Estimated: `10006` - // Minimum execution time: 15_165 nanoseconds. - Weight::from_parts(15_430_000, 0) - .saturating_add(Weight::from_parts(0, 10006)) + // Measured: `140` + // Estimated: `11030` + // Minimum execution time: 17_472_000 picoseconds. + Weight::from_parts(18_170_000, 0) + .saturating_add(Weight::from_parts(0, 11030)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -265,11 +277,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) fn migrate_and_notify_old_targets() -> Weight { // Proof Size summary in bytes: - // Measured: `112` - // Estimated: `15027` - // Minimum execution time: 35_310 nanoseconds. - Weight::from_parts(35_698_000, 0) - .saturating_add(Weight::from_parts(0, 15027)) + // Measured: `146` + // Estimated: `11036` + // Minimum execution time: 39_134_000 picoseconds. + Weight::from_parts(39_847_000, 0) + .saturating_add(Weight::from_parts(0, 11036)) .saturating_add(T::DbWeight::get().reads(9)) .saturating_add(T::DbWeight::get().writes(4)) } diff --git a/runtime/shell/Cargo.toml b/runtime/shell/Cargo.toml index a369ece2..2f59f931 100644 --- a/runtime/shell/Cargo.toml +++ b/runtime/shell/Cargo.toml @@ -11,45 +11,45 @@ serde = { version = "1.0.132", optional = true, features = ["derive"] } log = { version = "0.4.14", default-features = false } # Substrate dependencies -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.41" } -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.41" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.41" } -sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.41" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.41" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.41" } -sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.41" } -sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.41" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.41" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.41" } -sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.41" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" } +sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" } +sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" } +sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" } +sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.41" } -frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.41" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.41" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" } +frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } # try-runtime stuff. -frame-try-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.41" } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.42" } # Cumulus dependencies -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.41" } -xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.41" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.41" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.41" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" } # Pallets -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", optional = true } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", optional = true } [features] default = ["std"] diff --git a/runtime/shell/src/lib.rs b/runtime/shell/src/lib.rs index 971879a3..9cb4150a 100644 --- a/runtime/shell/src/lib.rs +++ b/runtime/shell/src/lib.rs @@ -199,6 +199,10 @@ impl pallet_balances::Config for Runtime { type WeightInfo = pallet_balances::weights::SubstrateWeight; type MaxReserves = ConstU32<50>; type ReserveIdentifier = [u8; 8]; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<0>; + type MaxFreezes = ConstU32<0>; } construct_runtime! { @@ -323,6 +327,14 @@ impl_runtime_apis! { fn metadata() -> OpaqueMetadata { OpaqueMetadata::new(Runtime::metadata().into()) } + + fn metadata_at_version(version: u32) -> Option { + Runtime::metadata_at_version(version) + } + + fn metadata_versions() -> sp_std::vec::Vec { + Runtime::metadata_versions() + } } impl sp_block_builder::BlockBuilder for Runtime { @@ -400,17 +412,12 @@ impl Contains for BaseCallFilter { fn contains(call: &RuntimeCall) -> bool { if let RuntimeCall::PolkadotXcm(xcm_method) = call { return match xcm_method { - pallet_xcm::Call::execute { .. } - | pallet_xcm::Call::teleport_assets { .. } - | pallet_xcm::Call::reserve_transfer_assets { .. } - | pallet_xcm::Call::limited_reserve_transfer_assets { .. } - | pallet_xcm::Call::limited_teleport_assets { .. } - | pallet_xcm::Call::__Ignore { .. } => false, pallet_xcm::Call::force_xcm_version { .. } | pallet_xcm::Call::force_default_xcm_version { .. } | pallet_xcm::Call::force_subscribe_version_notify { .. } | pallet_xcm::Call::force_unsubscribe_version_notify { .. } | pallet_xcm::Call::send { .. } => true, + _ => false, }; } diff --git a/runtime/shell/src/weights/pallet_xcm.rs b/runtime/shell/src/weights/pallet_xcm.rs index 74f90f7c..9f27ce92 100644 --- a/runtime/shell/src/weights/pallet_xcm.rs +++ b/runtime/shell/src/weights/pallet_xcm.rs @@ -1,4 +1,4 @@ -// Copyright 2021 Parity Technologies (UK) Ltd. +// Copyright Parity Technologies (UK) Ltd. // This file is part of Cumulus. // Cumulus is free software: you can redistribute it and/or modify @@ -17,16 +17,16 @@ //! Autogenerated weights for `pallet_xcm` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-02-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemint-dev +// --chain=statemine-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_xcm @@ -35,14 +35,15 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemint/src/weights/pallet_xcm.rs +// --output=./parachains/runtimes/assets/statemine/src/weights/pallet_xcm.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_xcm`. pub struct WeightInfo(PhantomData); @@ -59,11 +60,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) fn send() -> Weight { // Proof Size summary in bytes: - // Measured: `38` - // Estimated: `4645` - // Minimum execution time: 24_132 nanoseconds. - Weight::from_parts(24_554_000, 0) - .saturating_add(Weight::from_parts(0, 4645)) + // Measured: `75` + // Estimated: `3540` + // Minimum execution time: 29_342_000 picoseconds. + Weight::from_parts(29_952_000, 0) + .saturating_add(Weight::from_parts(0, 3540)) .saturating_add(T::DbWeight::get().reads(5)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -72,10 +73,10 @@ impl pallet_xcm::WeightInfo for WeightInfo { fn teleport_assets() -> Weight { // Proof Size summary in bytes: // Measured: `0` - // Estimated: `499` - // Minimum execution time: 22_350 nanoseconds. - Weight::from_parts(22_760_000, 0) - .saturating_add(Weight::from_parts(0, 499)) + // Estimated: `1489` + // Minimum execution time: 28_744_000 picoseconds. + Weight::from_parts(29_193_000, 0) + .saturating_add(Weight::from_parts(0, 1489)) .saturating_add(T::DbWeight::get().reads(1)) } /// Storage: ParachainInfo ParachainId (r:1 w:0) @@ -83,10 +84,10 @@ impl pallet_xcm::WeightInfo for WeightInfo { fn reserve_transfer_assets() -> Weight { // Proof Size summary in bytes: // Measured: `0` - // Estimated: `499` - // Minimum execution time: 17_723 nanoseconds. - Weight::from_parts(17_951_000, 0) - .saturating_add(Weight::from_parts(0, 499)) + // Estimated: `1489` + // Minimum execution time: 21_757_000 picoseconds. + Weight::from_parts(22_088_000, 0) + .saturating_add(Weight::from_parts(0, 1489)) .saturating_add(T::DbWeight::get().reads(1)) } /// Storage: Benchmark Override (r:0 w:0) @@ -95,7 +96,7 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551 nanoseconds. + // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. Weight::from_parts(18_446_744_073_709_551_000, 0) .saturating_add(Weight::from_parts(0, 0)) } @@ -105,8 +106,8 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 8_641 nanoseconds. - Weight::from_parts(8_925_000, 0) + // Minimum execution time: 10_671_000 picoseconds. + Weight::from_parts(10_948_000, 0) .saturating_add(Weight::from_parts(0, 0)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -116,8 +117,8 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_427 nanoseconds. - Weight::from_parts(2_598_000, 0) + // Minimum execution time: 3_132_000 picoseconds. + Weight::from_parts(3_374_000, 0) .saturating_add(Weight::from_parts(0, 0)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -139,11 +140,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: PolkadotXcm Queries (max_values: None, max_size: None, mode: Measured) fn force_subscribe_version_notify() -> Weight { // Proof Size summary in bytes: - // Measured: `38` - // Estimated: `7729` - // Minimum execution time: 28_650 nanoseconds. - Weight::from_parts(29_035_000, 0) - .saturating_add(Weight::from_parts(0, 7729)) + // Measured: `75` + // Estimated: `3540` + // Minimum execution time: 33_780_000 picoseconds. + Weight::from_parts(34_531_000, 0) + .saturating_add(Weight::from_parts(0, 3540)) .saturating_add(T::DbWeight::get().reads(7)) .saturating_add(T::DbWeight::get().writes(5)) } @@ -163,23 +164,34 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: PolkadotXcm Queries (max_values: None, max_size: None, mode: Measured) fn force_unsubscribe_version_notify() -> Weight { // Proof Size summary in bytes: - // Measured: `220` - // Estimated: `8470` - // Minimum execution time: 30_797 nanoseconds. - Weight::from_parts(31_491_000, 0) - .saturating_add(Weight::from_parts(0, 8470)) + // Measured: `257` + // Estimated: `3722` + // Minimum execution time: 35_215_000 picoseconds. + Weight::from_parts(35_685_000, 0) + .saturating_add(Weight::from_parts(0, 3722)) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(4)) } + /// Storage: PolkadotXcm XcmExecutionSuspended (r:0 w:1) + /// Proof Skipped: PolkadotXcm XcmExecutionSuspended (max_values: Some(1), max_size: None, mode: Measured) + fn force_suspension() -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 3_252_000 picoseconds. + Weight::from_parts(3_392_000, 0) + .saturating_add(Weight::from_parts(0, 0)) + .saturating_add(T::DbWeight::get().writes(1)) + } /// Storage: PolkadotXcm SupportedVersion (r:4 w:2) /// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured) fn migrate_supported_version() -> Weight { // Proof Size summary in bytes: - // Measured: `95` - // Estimated: `9995` - // Minimum execution time: 13_639 nanoseconds. - Weight::from_parts(13_980_000, 0) - .saturating_add(Weight::from_parts(0, 9995)) + // Measured: `129` + // Estimated: `11019` + // Minimum execution time: 17_330_000 picoseconds. + Weight::from_parts(17_730_000, 0) + .saturating_add(Weight::from_parts(0, 11019)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -187,11 +199,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: PolkadotXcm VersionNotifiers (max_values: None, max_size: None, mode: Measured) fn migrate_version_notifiers() -> Weight { // Proof Size summary in bytes: - // Measured: `99` - // Estimated: `9999` - // Minimum execution time: 13_954 nanoseconds. - Weight::from_parts(14_276_000, 0) - .saturating_add(Weight::from_parts(0, 9999)) + // Measured: `133` + // Estimated: `11023` + // Minimum execution time: 17_129_000 picoseconds. + Weight::from_parts(17_665_000, 0) + .saturating_add(Weight::from_parts(0, 11023)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -199,11 +211,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured) fn already_notified_target() -> Weight { // Proof Size summary in bytes: - // Measured: `106` - // Estimated: `12481` - // Minimum execution time: 15_217 nanoseconds. - Weight::from_parts(15_422_000, 0) - .saturating_add(Weight::from_parts(0, 12481)) + // Measured: `140` + // Estimated: `13505` + // Minimum execution time: 18_220_000 picoseconds. + Weight::from_parts(18_764_000, 0) + .saturating_add(Weight::from_parts(0, 13505)) .saturating_add(T::DbWeight::get().reads(5)) } /// Storage: PolkadotXcm VersionNotifyTargets (r:2 w:1) @@ -220,11 +232,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) fn notify_current_targets() -> Weight { // Proof Size summary in bytes: - // Measured: `106` - // Estimated: `10041` - // Minimum execution time: 27_362 nanoseconds. - Weight::from_parts(28_034_000, 0) - .saturating_add(Weight::from_parts(0, 10041)) + // Measured: `142` + // Estimated: `6082` + // Minimum execution time: 31_356_000 picoseconds. + Weight::from_parts(31_850_000, 0) + .saturating_add(Weight::from_parts(0, 6082)) .saturating_add(T::DbWeight::get().reads(7)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -232,22 +244,22 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured) fn notify_target_migration_fail() -> Weight { // Proof Size summary in bytes: - // Measured: `136` - // Estimated: `7561` - // Minimum execution time: 7_768 nanoseconds. - Weight::from_parts(7_890_000, 0) - .saturating_add(Weight::from_parts(0, 7561)) + // Measured: `172` + // Estimated: `8587` + // Minimum execution time: 9_299_000 picoseconds. + Weight::from_parts(9_515_000, 0) + .saturating_add(Weight::from_parts(0, 8587)) .saturating_add(T::DbWeight::get().reads(3)) } /// Storage: PolkadotXcm VersionNotifyTargets (r:4 w:2) /// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured) fn migrate_version_notify_targets() -> Weight { // Proof Size summary in bytes: - // Measured: `106` - // Estimated: `10006` - // Minimum execution time: 15_165 nanoseconds. - Weight::from_parts(15_430_000, 0) - .saturating_add(Weight::from_parts(0, 10006)) + // Measured: `140` + // Estimated: `11030` + // Minimum execution time: 17_472_000 picoseconds. + Weight::from_parts(18_170_000, 0) + .saturating_add(Weight::from_parts(0, 11030)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -265,11 +277,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) fn migrate_and_notify_old_targets() -> Weight { // Proof Size summary in bytes: - // Measured: `112` - // Estimated: `15027` - // Minimum execution time: 35_310 nanoseconds. - Weight::from_parts(35_698_000, 0) - .saturating_add(Weight::from_parts(0, 15027)) + // Measured: `146` + // Estimated: `11036` + // Minimum execution time: 39_134_000 picoseconds. + Weight::from_parts(39_847_000, 0) + .saturating_add(Weight::from_parts(0, 11036)) .saturating_add(T::DbWeight::get().reads(9)) .saturating_add(T::DbWeight::get().writes(4)) } diff --git a/runtime/shell/src/xcm_config.rs b/runtime/shell/src/xcm_config.rs index dbcf6ac7..26bce595 100644 --- a/runtime/shell/src/xcm_config.rs +++ b/runtime/shell/src/xcm_config.rs @@ -21,6 +21,7 @@ use frame_support::{ match_types, parameter_types, traits::{ConstU32, Everything, Nothing}, }; +use frame_system::EnsureRoot; use xcm::latest::{prelude::*, Weight as XCMWeight}; use xcm_builder::{ AllowUnpaidExecutionFrom, EnsureXcmOrigin, FixedWeightBounds, @@ -121,4 +122,5 @@ impl pallet_xcm::Config for Runtime { type WeightInfo = crate::weights::pallet_xcm::WeightInfo; #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; + type AdminOrigin = EnsureRoot; } diff --git a/runtime/thala/Cargo.toml b/runtime/thala/Cargo.toml index 24607428..5ab0665d 100644 --- a/runtime/thala/Cargo.toml +++ b/runtime/thala/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" codec = { package = "parity-scale-codec", version = "3.0", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.0", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } -hex-literal = "0.3.1" +hex-literal = "0.4.1" static_assertions = "1.1.0" smallvec = "1.6.1" primitive-types = { version = "0.12", default-features = false, features = ["scale-info", "serde_no_std"] } @@ -18,89 +18,89 @@ phala-types = { path = "../../crates/phala-types", default-features = false } parachains-common = { path = "../../parachains-common", default-features = false } # Substrate dependencies -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", optional = true, default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", optional = true, default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false, optional = true } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", optional = true, default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", optional = true, default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false, optional = true } -pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-child-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-lottery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-uniques = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", default-features = false } +pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-child-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-lottery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-uniques = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", default-features = false } # Cumulus dependencies -pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.41", default-features = false } +pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-session-benchmarking = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.42", default-features = false } # Polkadot dependencies -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.41", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42", default-features = false } # RMRK dependencies -pallet-rmrk-core = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-rmrk-equip = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-rmrk-market = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } -rmrk-traits = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } -pallet-rmrk-rpc-runtime-api = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.41", default-features = false } +pallet-rmrk-core = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-rmrk-equip = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-rmrk-market = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } +rmrk-traits = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } +pallet-rmrk-rpc-runtime-api = { git = "https://github.com/Phala-Network/rmrk-substrate", branch = "polkadot-v0.9.42", default-features = false } # Sygma dependencies -sygma-basic-feehandler = { git = "https://github.com/Phala-Network/sygma-substrate-pallets", branch = "polkadot-v0.9.41", default-features = false } -sygma-traits = { git = "https://github.com/Phala-Network/sygma-substrate-pallets", branch = "polkadot-v0.9.41", default-features = false } -sygma-bridge = { git = "https://github.com/Phala-Network/sygma-substrate-pallets", branch = "polkadot-v0.9.41", default-features = false } -sygma-access-segregator = { git = "https://github.com/Phala-Network/sygma-substrate-pallets", branch = "polkadot-v0.9.41", default-features = false } -sygma-fee-handler-router = { git = "https://github.com/Phala-Network/sygma-substrate-pallets", branch = "polkadot-v0.9.41", default-features = false } -sygma-runtime-api = { git = "https://github.com/Phala-Network/sygma-substrate-pallets", branch = "polkadot-v0.9.41", default-features = false } +sygma-basic-feehandler = { git = "https://github.com/sygmaprotocol/sygma-substrate-pallets", branch = "polkadot-v0.9.42", default-features = false } +sygma-traits = { git = "https://github.com/sygmaprotocol/sygma-substrate-pallets", branch = "polkadot-v0.9.42", default-features = false } +sygma-bridge = { git = "https://github.com/sygmaprotocol/sygma-substrate-pallets", branch = "polkadot-v0.9.42", default-features = false } +sygma-access-segregator = { git = "https://github.com/sygmaprotocol/sygma-substrate-pallets", branch = "polkadot-v0.9.42", default-features = false } +sygma-fee-handler-router = { git = "https://github.com/sygmaprotocol/sygma-substrate-pallets", branch = "polkadot-v0.9.42", default-features = false } +sygma-runtime-api = { git = "https://github.com/sygmaprotocol/sygma-substrate-pallets", branch = "polkadot-v0.9.42", default-features = false } # Local dependencies assets-registry = { path = "../../pallets/assets-registry", default-features = false } @@ -112,7 +112,7 @@ pallet-phala-world = { path = "../../pallets/phala-world", default-features = fa pallet-index = { path = "../../pallets/index", default-features = false } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.41", optional = true } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42", optional = true } [features] default = ["std", "include-wasm"] diff --git a/runtime/thala/src/lib.rs b/runtime/thala/src/lib.rs index ee2d0670..01ef8c3e 100644 --- a/runtime/thala/src/lib.rs +++ b/runtime/thala/src/lib.rs @@ -447,6 +447,7 @@ parameter_types! { .avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO) .build_or_panic(); pub const SS58Prefix: u16 = 30; + pub MaxCollectivesProposalWeight: Weight = Perbill::from_percent(50) * RuntimeBlockWeights::get().max_block; } impl frame_system::Config for Runtime { @@ -730,6 +731,10 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = frame_system::Pallet; type WeightInfo = pallet_balances::weights::SubstrateWeight; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<0>; + type MaxFreezes = ConstU32<0>; } parameter_types! { @@ -1216,6 +1221,7 @@ impl pallet_xcm::Config for Runtime { type WeightInfo = crate::weights::pallet_xcm::WeightInfo; #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; + type AdminOrigin = EnsureRootOrHalfCouncil; } impl xcmbridge::Config for Runtime { @@ -1268,6 +1274,7 @@ impl pallet_collective::Config for Runtime { type DefaultVote = pallet_collective::PrimeDefaultVote; type SetMembersOrigin = EnsureRoot; type WeightInfo = pallet_collective::weights::SubstrateWeight; + type MaxProposalWeight = MaxCollectivesProposalWeight; } parameter_types! { @@ -1327,6 +1334,7 @@ impl pallet_collective::Config for Runtime { type DefaultVote = pallet_collective::PrimeDefaultVote; type SetMembersOrigin = EnsureRoot; type WeightInfo = pallet_collective::weights::SubstrateWeight; + type MaxProposalWeight = MaxCollectivesProposalWeight; } impl pallet_membership::Config for Runtime { @@ -1635,12 +1643,14 @@ impl sygma_access_segregator::Config for Runtime { type BridgeCommitteeOrigin = EnsureRootOrHalfCouncil; type PalletIndex = SygmaAccessSegregatorPalletIndex; type Extrinsics = RegisteredExtrinsics; + type WeightInfo = sygma_access_segregator::weights::SygmaWeightInfo; } impl sygma_basic_feehandler::Config for Runtime { type RuntimeEvent = RuntimeEvent; type BridgeCommitteeOrigin = EnsureRootOrHalfCouncil; type PalletIndex = SygmaBasicFeeHandlerPalletIndex; + type WeightInfo = sygma_basic_feehandler::weights::SygmaWeightInfo; } impl sygma_fee_handler_router::Config for Runtime { @@ -1649,6 +1659,7 @@ impl sygma_fee_handler_router::Config for Runtime { type BasicFeeHandler = SygmaBasicFeeHandler; type DynamicFeeHandler = (); type PalletIndex = SygmaFeeHandlerRouterPalletIndex; + type WeightInfo = sygma_fee_handler_router::weights::SygmaWeightInfo; } // This address is defined in the substrate E2E test of sygma-relayer @@ -1678,6 +1689,7 @@ impl sygma_bridge::Config for Runtime { type PalletId = SygmaBridgePalletId; type PalletIndex = SygmaBridgePalletIndex; type DecimalConverter = assets_registry::SygmaDecimalConverter; + type WeightInfo = sygma_bridge::weights::SygmaWeightInfo; } impl sygma_wrapper::Config for Runtime { @@ -1911,6 +1923,14 @@ impl_runtime_apis! { fn metadata() -> OpaqueMetadata { OpaqueMetadata::new(Runtime::metadata().into()) } + + fn metadata_at_version(version: u32) -> Option { + Runtime::metadata_at_version(version) + } + + fn metadata_versions() -> sp_std::vec::Vec { + Runtime::metadata_versions() + } } impl sp_block_builder::BlockBuilder for Runtime { diff --git a/runtime/thala/src/weights/pallet_xcm.rs b/runtime/thala/src/weights/pallet_xcm.rs index 74f90f7c..9f27ce92 100644 --- a/runtime/thala/src/weights/pallet_xcm.rs +++ b/runtime/thala/src/weights/pallet_xcm.rs @@ -1,4 +1,4 @@ -// Copyright 2021 Parity Technologies (UK) Ltd. +// Copyright Parity Technologies (UK) Ltd. // This file is part of Cumulus. // Cumulus is free software: you can redistribute it and/or modify @@ -17,16 +17,16 @@ //! Autogenerated weights for `pallet_xcm` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-02-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` //! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemint-dev"), DB CACHE: 1024 +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024 // Executed Command: // ./artifacts/polkadot-parachain // benchmark // pallet -// --chain=statemint-dev +// --chain=statemine-dev // --execution=wasm // --wasm-execution=compiled // --pallet=pallet_xcm @@ -35,14 +35,15 @@ // --repeat=20 // --json // --header=./file_header.txt -// --output=./parachains/runtimes/assets/statemint/src/weights/pallet_xcm.rs +// --output=./parachains/runtimes/assets/statemine/src/weights/pallet_xcm.rs #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] +#![allow(missing_docs)] use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use core::marker::PhantomData; /// Weight functions for `pallet_xcm`. pub struct WeightInfo(PhantomData); @@ -59,11 +60,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) fn send() -> Weight { // Proof Size summary in bytes: - // Measured: `38` - // Estimated: `4645` - // Minimum execution time: 24_132 nanoseconds. - Weight::from_parts(24_554_000, 0) - .saturating_add(Weight::from_parts(0, 4645)) + // Measured: `75` + // Estimated: `3540` + // Minimum execution time: 29_342_000 picoseconds. + Weight::from_parts(29_952_000, 0) + .saturating_add(Weight::from_parts(0, 3540)) .saturating_add(T::DbWeight::get().reads(5)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -72,10 +73,10 @@ impl pallet_xcm::WeightInfo for WeightInfo { fn teleport_assets() -> Weight { // Proof Size summary in bytes: // Measured: `0` - // Estimated: `499` - // Minimum execution time: 22_350 nanoseconds. - Weight::from_parts(22_760_000, 0) - .saturating_add(Weight::from_parts(0, 499)) + // Estimated: `1489` + // Minimum execution time: 28_744_000 picoseconds. + Weight::from_parts(29_193_000, 0) + .saturating_add(Weight::from_parts(0, 1489)) .saturating_add(T::DbWeight::get().reads(1)) } /// Storage: ParachainInfo ParachainId (r:1 w:0) @@ -83,10 +84,10 @@ impl pallet_xcm::WeightInfo for WeightInfo { fn reserve_transfer_assets() -> Weight { // Proof Size summary in bytes: // Measured: `0` - // Estimated: `499` - // Minimum execution time: 17_723 nanoseconds. - Weight::from_parts(17_951_000, 0) - .saturating_add(Weight::from_parts(0, 499)) + // Estimated: `1489` + // Minimum execution time: 21_757_000 picoseconds. + Weight::from_parts(22_088_000, 0) + .saturating_add(Weight::from_parts(0, 1489)) .saturating_add(T::DbWeight::get().reads(1)) } /// Storage: Benchmark Override (r:0 w:0) @@ -95,7 +96,7 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 18_446_744_073_709_551 nanoseconds. + // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. Weight::from_parts(18_446_744_073_709_551_000, 0) .saturating_add(Weight::from_parts(0, 0)) } @@ -105,8 +106,8 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 8_641 nanoseconds. - Weight::from_parts(8_925_000, 0) + // Minimum execution time: 10_671_000 picoseconds. + Weight::from_parts(10_948_000, 0) .saturating_add(Weight::from_parts(0, 0)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -116,8 +117,8 @@ impl pallet_xcm::WeightInfo for WeightInfo { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 2_427 nanoseconds. - Weight::from_parts(2_598_000, 0) + // Minimum execution time: 3_132_000 picoseconds. + Weight::from_parts(3_374_000, 0) .saturating_add(Weight::from_parts(0, 0)) .saturating_add(T::DbWeight::get().writes(1)) } @@ -139,11 +140,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: PolkadotXcm Queries (max_values: None, max_size: None, mode: Measured) fn force_subscribe_version_notify() -> Weight { // Proof Size summary in bytes: - // Measured: `38` - // Estimated: `7729` - // Minimum execution time: 28_650 nanoseconds. - Weight::from_parts(29_035_000, 0) - .saturating_add(Weight::from_parts(0, 7729)) + // Measured: `75` + // Estimated: `3540` + // Minimum execution time: 33_780_000 picoseconds. + Weight::from_parts(34_531_000, 0) + .saturating_add(Weight::from_parts(0, 3540)) .saturating_add(T::DbWeight::get().reads(7)) .saturating_add(T::DbWeight::get().writes(5)) } @@ -163,23 +164,34 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: PolkadotXcm Queries (max_values: None, max_size: None, mode: Measured) fn force_unsubscribe_version_notify() -> Weight { // Proof Size summary in bytes: - // Measured: `220` - // Estimated: `8470` - // Minimum execution time: 30_797 nanoseconds. - Weight::from_parts(31_491_000, 0) - .saturating_add(Weight::from_parts(0, 8470)) + // Measured: `257` + // Estimated: `3722` + // Minimum execution time: 35_215_000 picoseconds. + Weight::from_parts(35_685_000, 0) + .saturating_add(Weight::from_parts(0, 3722)) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(4)) } + /// Storage: PolkadotXcm XcmExecutionSuspended (r:0 w:1) + /// Proof Skipped: PolkadotXcm XcmExecutionSuspended (max_values: Some(1), max_size: None, mode: Measured) + fn force_suspension() -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 3_252_000 picoseconds. + Weight::from_parts(3_392_000, 0) + .saturating_add(Weight::from_parts(0, 0)) + .saturating_add(T::DbWeight::get().writes(1)) + } /// Storage: PolkadotXcm SupportedVersion (r:4 w:2) /// Proof Skipped: PolkadotXcm SupportedVersion (max_values: None, max_size: None, mode: Measured) fn migrate_supported_version() -> Weight { // Proof Size summary in bytes: - // Measured: `95` - // Estimated: `9995` - // Minimum execution time: 13_639 nanoseconds. - Weight::from_parts(13_980_000, 0) - .saturating_add(Weight::from_parts(0, 9995)) + // Measured: `129` + // Estimated: `11019` + // Minimum execution time: 17_330_000 picoseconds. + Weight::from_parts(17_730_000, 0) + .saturating_add(Weight::from_parts(0, 11019)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -187,11 +199,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: PolkadotXcm VersionNotifiers (max_values: None, max_size: None, mode: Measured) fn migrate_version_notifiers() -> Weight { // Proof Size summary in bytes: - // Measured: `99` - // Estimated: `9999` - // Minimum execution time: 13_954 nanoseconds. - Weight::from_parts(14_276_000, 0) - .saturating_add(Weight::from_parts(0, 9999)) + // Measured: `133` + // Estimated: `11023` + // Minimum execution time: 17_129_000 picoseconds. + Weight::from_parts(17_665_000, 0) + .saturating_add(Weight::from_parts(0, 11023)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -199,11 +211,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured) fn already_notified_target() -> Weight { // Proof Size summary in bytes: - // Measured: `106` - // Estimated: `12481` - // Minimum execution time: 15_217 nanoseconds. - Weight::from_parts(15_422_000, 0) - .saturating_add(Weight::from_parts(0, 12481)) + // Measured: `140` + // Estimated: `13505` + // Minimum execution time: 18_220_000 picoseconds. + Weight::from_parts(18_764_000, 0) + .saturating_add(Weight::from_parts(0, 13505)) .saturating_add(T::DbWeight::get().reads(5)) } /// Storage: PolkadotXcm VersionNotifyTargets (r:2 w:1) @@ -220,11 +232,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) fn notify_current_targets() -> Weight { // Proof Size summary in bytes: - // Measured: `106` - // Estimated: `10041` - // Minimum execution time: 27_362 nanoseconds. - Weight::from_parts(28_034_000, 0) - .saturating_add(Weight::from_parts(0, 10041)) + // Measured: `142` + // Estimated: `6082` + // Minimum execution time: 31_356_000 picoseconds. + Weight::from_parts(31_850_000, 0) + .saturating_add(Weight::from_parts(0, 6082)) .saturating_add(T::DbWeight::get().reads(7)) .saturating_add(T::DbWeight::get().writes(3)) } @@ -232,22 +244,22 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured) fn notify_target_migration_fail() -> Weight { // Proof Size summary in bytes: - // Measured: `136` - // Estimated: `7561` - // Minimum execution time: 7_768 nanoseconds. - Weight::from_parts(7_890_000, 0) - .saturating_add(Weight::from_parts(0, 7561)) + // Measured: `172` + // Estimated: `8587` + // Minimum execution time: 9_299_000 picoseconds. + Weight::from_parts(9_515_000, 0) + .saturating_add(Weight::from_parts(0, 8587)) .saturating_add(T::DbWeight::get().reads(3)) } /// Storage: PolkadotXcm VersionNotifyTargets (r:4 w:2) /// Proof Skipped: PolkadotXcm VersionNotifyTargets (max_values: None, max_size: None, mode: Measured) fn migrate_version_notify_targets() -> Weight { // Proof Size summary in bytes: - // Measured: `106` - // Estimated: `10006` - // Minimum execution time: 15_165 nanoseconds. - Weight::from_parts(15_430_000, 0) - .saturating_add(Weight::from_parts(0, 10006)) + // Measured: `140` + // Estimated: `11030` + // Minimum execution time: 17_472_000 picoseconds. + Weight::from_parts(18_170_000, 0) + .saturating_add(Weight::from_parts(0, 11030)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(2)) } @@ -265,11 +277,11 @@ impl pallet_xcm::WeightInfo for WeightInfo { /// Proof Skipped: ParachainSystem PendingUpwardMessages (max_values: Some(1), max_size: None, mode: Measured) fn migrate_and_notify_old_targets() -> Weight { // Proof Size summary in bytes: - // Measured: `112` - // Estimated: `15027` - // Minimum execution time: 35_310 nanoseconds. - Weight::from_parts(35_698_000, 0) - .saturating_add(Weight::from_parts(0, 15027)) + // Measured: `146` + // Estimated: `11036` + // Minimum execution time: 39_134_000 picoseconds. + Weight::from_parts(39_847_000, 0) + .saturating_add(Weight::from_parts(0, 11036)) .saturating_add(T::DbWeight::get().reads(9)) .saturating_add(T::DbWeight::get().writes(4)) }