diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f203055d2f..1877d7196d5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,31 +14,26 @@ env: try-runtime-uri: wss://eden-rpc.dwellir.com:443 jobs: - clippy_lint: + lints: runs-on: ubuntu-latest-8-cores steps: - uses: actions/checkout@v3 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: ${{ env.nightly }} + components: rustfmt, clippy target: ${{ env.target }} - components: clippy + - name: Rustfmt Check + uses: actions-rust-lang/rustfmt@v1 + - name: Install protobuf-compiler + run: | + sudo apt-get install protobuf-compiler - name: Clippy uses: actions-rs/clippy-check@v1 with: token: ${{ secrets.GITHUB_TOKEN }} args: --all-features -- -A clippy::type_complexity -A clippy::identity_op -A clippy::boxed_local -D dead_code toolchain: ${{ env.nightly }} - rustfmt: - runs-on: ubuntu-latest-8-cores - steps: - - uses: actions/checkout@v3 - - uses: actions-rust-lang/setup-rust-toolchain@v1 - with: - toolchain: ${{ env.nightly }} - components: rustfmt - - name: Rustfmt Check - uses: actions-rust-lang/rustfmt@v1 tests: runs-on: ubuntu-latest-16-cores @@ -49,7 +44,9 @@ jobs: with: toolchain: ${{ env.nightly }} target: ${{ env.target }} - + - name: Install protobuf-compiler + run: | + sudo apt-get install protobuf-compiler - name: Cache cargo registry uses: actions/cache@v3 with: @@ -100,7 +97,9 @@ jobs: with: toolchain: ${{ env.nightly }} target: ${{ env.target }} - + - name: Install protobuf-compiler + run: | + sudo apt-get install protobuf-compiler - name: Run cargo-tarpaulin uses: actions-rs/tarpaulin@v0.1 with: @@ -128,7 +127,9 @@ jobs: }' | jq '{"result"}[]' >> $GITHUB_OUTPUT cat $GITHUB_OUTPUT id: get_version - + - name: Install protobuf-compiler + run: | + sudo apt-get install protobuf-compiler - name: Install Rust nightly uses: actions-rust-lang/setup-rust-toolchain@v1 with: @@ -140,17 +141,21 @@ jobs: with: path: snapshots key: ${{steps.get_version.outputs.eden_rev}} - - - name: Try runtime update snap + - name: Cargo build + run: cargo build --release --features=try-runtime --bin nodle-parachain + - name: Fetch snapshot if: steps.cachedir.outputs.cache-hit != 'true' + continue-on-error: true run: | install -d snapshots date > snapshots/created_at - cargo run --release --bin nodle-parachain --features=try-runtime try-runtime --execution native --chain ${{ env.try-runtime-chain }} --no-spec-name-check on-runtime-upgrade live --snapshot-path="snapshots/paradis-snapshot-full" -u ${{ env.try-runtime-uri}} + ./target/release/nodle-parachain try-runtime --runtime existing -lruntime=debug --chain ${{ env.try-runtime-chain }} create-snapshot "snapshots/eden-snapshot-full" -u ${{ env.try-runtime-uri}} + - name: Run Migration on new snapshot + if: steps.cachedir.outputs.cache-hit != 'true' + run: | + ./target/release/nodle-parachain try-runtime --runtime target/release/wbuild/runtime-eden/runtime_eden.wasm -lruntime=debug --chain ${{ env.try-runtime-chain }} on-runtime-upgrade snap -s snapshots/eden-snapshot-full - name: Try runtime reuse snap if: steps.cachedir.outputs.cache-hit == 'true' run: | cat snapshots/created_at - cargo run --release --bin nodle-parachain --features=try-runtime try-runtime --execution native --chain ${{ env.try-runtime-chain }} --no-spec-name-check on-runtime-upgrade snap --snapshot-path="snapshots/paradis-snapshot-full" - - + ./target/release/nodle-parachain try-runtime --runtime target/release/wbuild/runtime-eden/runtime_eden.wasm --chain ${{ env.try-runtime-chain }} on-runtime-upgrade snap --snapshot-path="snapshots/eden-snapshot-full" diff --git a/Cargo.lock b/Cargo.lock index f9ad3b0feee..dab36873e79 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18,7 +18,16 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" dependencies = [ - "gimli", + "gimli 0.26.2", +] + +[[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli 0.27.2", ] [[package]] @@ -27,6 +36,15 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "aead" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" +dependencies = [ + "generic-array 0.14.6", +] + [[package]] name = "aead" version = "0.4.3" @@ -34,6 +52,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" dependencies = [ "generic-array 0.14.6", + "rand_core 0.6.4", +] + +[[package]] +name = "aes" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" +dependencies = [ + "aes-soft", + "aesni", + "cipher 0.2.5", ] [[package]] @@ -42,26 +72,60 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cipher 0.3.0", "cpufeatures", "opaque-debug 0.3.0", ] +[[package]] +name = "aes-gcm" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da" +dependencies = [ + "aead 0.3.2", + "aes 0.6.0", + "cipher 0.2.5", + "ctr 0.6.0", + "ghash 0.3.1", + "subtle", +] + [[package]] name = "aes-gcm" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" dependencies = [ - "aead", - "aes", + "aead 0.4.3", + "aes 0.7.5", "cipher 0.3.0", - "ctr", - "ghash", + "ctr 0.8.0", + "ghash 0.4.4", "subtle", ] +[[package]] +name = "aes-soft" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" +dependencies = [ + "cipher 0.2.5", + "opaque-debug 0.3.0", +] + +[[package]] +name = "aesni" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" +dependencies = [ + "cipher 0.2.5", + "opaque-debug 0.3.0", +] + [[package]] name = "ahash" version = "0.7.6" @@ -108,9 +172,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.66" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" +checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" [[package]] name = "approx" @@ -122,19 +186,28 @@ dependencies = [ ] [[package]] -name = "arrayref" -version = "0.3.6" +name = "arc-swap" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] -name = "arrayvec" -version = "0.4.12" +name = "array-bytes" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" -dependencies = [ - "nodrop", -] +checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6" + +[[package]] +name = "array-bytes" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22f72e9d6fac4bc80778ea470b20197b88d28c292bb7d60c3fb099280003cd19" + +[[package]] +name = "arrayref" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" [[package]] name = "arrayvec" @@ -149,66 +222,83 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] -name = "asn1_der" -version = "0.7.5" +name = "asn1-rs" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22d1f4b888c298a027c99dc9048015fac177587de20fc30232a057dfbe24a21" +checksum = "30ff05a702273012438132f449575dbc804e27b2f3cbe3069aa237d26c98fa33" +dependencies = [ + "asn1-rs-derive 0.1.0", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time 0.3.18", +] [[package]] -name = "assert_matches" -version = "1.5.0" +name = "asn1-rs" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" +checksum = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4" +dependencies = [ + "asn1-rs-derive 0.4.0", + "asn1-rs-impl", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time 0.3.18", +] [[package]] -name = "async-attributes" -version = "1.1.2" +name = "asn1-rs-derive" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" +checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf" dependencies = [ + "proc-macro2", "quote", "syn", + "synstructure", ] [[package]] -name = "async-channel" -version = "1.8.0" +name = "asn1-rs-derive" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", + "proc-macro2", + "quote", + "syn", + "synstructure", ] [[package]] -name = "async-executor" -version = "1.5.0" +name = "asn1-rs-impl" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" +checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ - "async-lock", - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "slab", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "async-global-executor" -version = "2.3.1" +name = "asn1_der" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" -dependencies = [ - "async-channel", - "async-executor", - "async-io", - "async-lock", - "blocking", - "futures-lite", - "once_cell", -] +checksum = "e22d1f4b888c298a027c99dc9048015fac177587de20fc30232a057dfbe24a21" + +[[package]] +name = "assert_matches" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-io" @@ -240,78 +330,11 @@ dependencies = [ "futures-lite", ] -[[package]] -name = "async-process" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6381ead98388605d0d9ff86371043b5aa922a3905824244de40dc263a14fcba4" -dependencies = [ - "async-io", - "async-lock", - "autocfg", - "blocking", - "cfg-if 1.0.0", - "event-listener", - "futures-lite", - "libc", - "signal-hook", - "windows-sys 0.42.0", -] - -[[package]] -name = "async-std" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" -dependencies = [ - "async-attributes", - "async-channel", - "async-global-executor", - "async-io", - "async-lock", - "async-process", - "crossbeam-utils", - "futures-channel", - "futures-core", - "futures-io", - "futures-lite", - "gloo-timers", - "kv-log-macro", - "log", - "memchr", - "once_cell", - "pin-project-lite 0.2.9", - "pin-utils", - "slab", - "wasm-bindgen-futures", -] - -[[package]] -name = "async-std-resolver" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f2f8a4a203be3325981310ab243a28e6e4ea55b6519bffce05d41ab60e09ad8" -dependencies = [ - "async-std", - "async-trait", - "futures-io", - "futures-util", - "pin-utils", - "socket2", - "trust-dns-resolver", -] - -[[package]] -name = "async-task" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" - [[package]] name = "async-trait" -version = "0.1.59" +version = "0.1.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364" +checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" dependencies = [ "proc-macro2", "quote", @@ -333,9 +356,9 @@ dependencies = [ [[package]] name = "atomic-waker" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" +checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" [[package]] name = "atty" @@ -343,7 +366,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] @@ -354,32 +377,18 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "backoff" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" -dependencies = [ - "futures-core", - "getrandom 0.2.8", - "instant", - "pin-project-lite 0.2.9", - "rand 0.8.5", - "tokio", -] - [[package]] name = "backtrace" -version = "0.3.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" dependencies = [ - "addr2line", + "addr2line 0.19.0", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", - "miniz_oxide 0.5.4", - "object 0.29.0", + "miniz_oxide", + "object 0.30.3", "rustc-demangle", ] @@ -407,6 +416,18 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + +[[package]] +name = "base64ct" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" + [[package]] name = "beef" version = "0.5.2" @@ -419,28 +440,26 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ + "array-bytes 4.2.0", "async-trait", - "beefy-primitives", "fnv", "futures", - "futures-timer", - "hex", "log", "parity-scale-codec", "parking_lot 0.12.1", - "sc-chain-spec", "sc-client-api", "sc-consensus", - "sc-finality-grandpa", "sc-keystore", "sc-network", + "sc-network-common", "sc-network-gossip", "sc-utils", "sp-api", "sp-application-crypto", "sp-arithmetic", + "sp-beefy", "sp-blockchain", "sp-consensus", "sp-core", @@ -455,18 +474,17 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "beefy-gadget", - "beefy-primitives", "futures", "jsonrpsee", "log", "parity-scale-codec", "parking_lot 0.12.1", "sc-rpc", - "sc-utils", "serde", + "sp-beefy", "sp-core", "sp-runtime", "thiserror", @@ -475,32 +493,13 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "beefy-primitives", - "sp-api", -] - -[[package]] -name = "beefy-primitives" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ - "parity-scale-codec", - "scale-info", "sp-api", - "sp-application-crypto", - "sp-core", + "sp-beefy", "sp-runtime", - "sp-std", ] -[[package]] -name = "bimap" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0455254eb5c6964c4545d8bac815e1a1be4f3afe0ae695ea539c12d728d44b" - [[package]] name = "bincode" version = "1.3.3" @@ -512,9 +511,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.59.2" +version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" dependencies = [ "bitflags", "cexpr", @@ -527,6 +526,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", + "syn", ] [[package]] @@ -549,43 +549,33 @@ dependencies = [ [[package]] name = "blake2" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b12e5fd123190ce1c2e559308a94c9bacad77907d4c6005d9e58fe1a0689e55e" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ "digest 0.10.6", ] -[[package]] -name = "blake2-rfc" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" -dependencies = [ - "arrayvec 0.4.12", - "constant_time_eq 0.1.5", -] - [[package]] name = "blake2b_simd" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127" +checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc" dependencies = [ "arrayref", "arrayvec 0.7.2", - "constant_time_eq 0.1.5", + "constant_time_eq", ] [[package]] name = "blake2s_simd" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db539cc2b5f6003621f1cd9ef92d7ded8ea5232c7de0f9faa2de251cd98730d4" +checksum = "6637f448b9e61dfadbdcbae9a885fadee1f3eaffb1f8d3c1965d3ade8bdfd44f" dependencies = [ "arrayref", "arrayvec 0.7.2", - "constant_time_eq 0.1.5", + "constant_time_eq", ] [[package]] @@ -597,8 +587,8 @@ dependencies = [ "arrayref", "arrayvec 0.7.2", "cc", - "cfg-if 1.0.0", - "constant_time_eq 0.2.4", + "cfg-if", + "constant_time_eq", "digest 0.10.6", ] @@ -608,7 +598,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" dependencies = [ - "block-padding", + "block-padding 0.1.5", "byte-tools", "byteorder", "generic-array 0.12.4", @@ -632,6 +622,16 @@ dependencies = [ "generic-array 0.14.6", ] +[[package]] +name = "block-modes" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57a0e8073e8baa88212fb5823574c02ebccb395136ba9a164ab89379ec6072f0" +dependencies = [ + "block-padding 0.2.1", + "cipher 0.2.5", +] + [[package]] name = "block-padding" version = "0.1.5" @@ -642,18 +642,10 @@ dependencies = [ ] [[package]] -name = "blocking" -version = "1.3.0" +name = "block-padding" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" -dependencies = [ - "async-channel", - "async-lock", - "async-task", - "atomic-waker", - "fastrand", - "futures-lite", -] +checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "bounded-vec" @@ -672,11 +664,12 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bstr" -version = "0.2.17" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +checksum = "b7f0778972c64420fdedc63f09919c8a88bda7b25135357fd25a5d9f3257e832" dependencies = [ "memchr", + "serde", ] [[package]] @@ -690,9 +683,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "byte-slice-cast" @@ -714,9 +707,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "bzip2-sys" @@ -731,9 +724,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e" +checksum = "c77df041dc383319cc661b428b6961a005db4d6808d5e12536931b1ca9556055" dependencies = [ "serde", ] @@ -755,20 +748,31 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ "camino", "cargo-platform", - "semver 1.0.14", + "semver 1.0.16", "serde", "serde_json", ] [[package]] name = "cc" -version = "1.0.77" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" dependencies = [ "jobserver", ] +[[package]] +name = "ccm" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aca1a8fbc20b50ac9673ff014abfb2b5f4085ee1a850d408f14a159c5853ac7" +dependencies = [ + "aead 0.3.2", + "cipher 0.2.5", + "subtle", +] + [[package]] name = "cexpr" version = "0.6.0" @@ -787,12 +791,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -811,7 +809,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cipher 0.3.0", "cpufeatures", "zeroize", @@ -823,7 +821,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" dependencies = [ - "aead", + "aead 0.4.3", "chacha20", "cipher 0.3.0", "poly1305", @@ -840,7 +838,7 @@ dependencies = [ "js-sys", "num-integer", "num-traits", - "time", + "time 0.1.45", "wasm-bindgen", "winapi", ] @@ -860,30 +858,29 @@ dependencies = [ [[package]] name = "cipher" -version = "0.3.0" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" dependencies = [ "generic-array 0.14.6", ] [[package]] name = "cipher" -version = "0.4.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" +checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" dependencies = [ - "crypto-common", - "inout", + "generic-array 0.14.6", ] [[package]] name = "ckb-merkle-mountain-range" -version = "0.3.2" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f061f97d64fd1822664bdfb722f7ae5469a97b77567390f7442be5b5dc82a5b" +checksum = "56ccb671c5921be8a84686e6212ca184cb1d7c51cadcdbfcbd1cc3f042f5dfb8" dependencies = [ - "cfg-if 0.1.10", + "cfg-if", ] [[package]] @@ -894,31 +891,29 @@ checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" dependencies = [ "glob", "libc", - "libloading 0.7.4", + "libloading", ] [[package]] name = "clap" -version = "3.2.23" +version = "4.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3" dependencies = [ - "atty", "bitflags", "clap_derive", "clap_lex", - "indexmap", + "is-terminal", "once_cell", "strsim", "termcolor", - "textwrap", ] [[package]] name = "clap_derive" -version = "3.2.18" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" dependencies = [ "heck", "proc-macro-error", @@ -929,22 +924,13 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" dependencies = [ "os_str_bytes", ] -[[package]] -name = "cmake" -version = "0.1.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c" -dependencies = [ - "cc", -] - [[package]] name = "coarsetime" version = "0.1.22" @@ -969,9 +955,9 @@ dependencies = [ [[package]] name = "comfy-table" -version = "6.1.3" +version = "6.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e621e7e86c46fd8a14c32c6ae3cb95656621b4743a27d0cffedb831d46e7ad21" +checksum = "6e7b787b0dc42e8111badfdbe4c3059158ccb2db8780352fa1b01e8ccf45cc4d" dependencies = [ "strum", "strum_macros", @@ -980,24 +966,18 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" dependencies = [ "crossbeam-utils", ] [[package]] name = "const-oid" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" - -[[package]] -name = "constant_time_eq" -version = "0.1.5" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b" [[package]] name = "constant_time_eq" @@ -1042,7 +1022,17 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", +] + +[[package]] +name = "cpu-time" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9e393a7668fe1fad3075085b86c781883000b4ede868f43627b34a87c8b7ded" +dependencies = [ + "libc", + "winapi", ] [[package]] @@ -1054,27 +1044,35 @@ dependencies = [ "libc", ] +[[package]] +name = "cpuid-bool" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" + [[package]] name = "cranelift-bforest" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "749d0d6022c9038dccf480bdde2a38d435937335bf2bb0f14e815d94517cdce8" +checksum = "52056f6d0584484b57fa6c1a65c1fcb15f3780d8b6a758426d9e3084169b2ddd" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94370cc7b37bf652ccd8bb8f09bd900997f7ccf97520edfc75554bb5c4abbea" +checksum = "18fed94c8770dc25d01154c3ffa64ed0b3ba9d583736f305fed7beebe5d9cf74" dependencies = [ + "arrayvec 0.7.2", + "bumpalo", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-entity", "cranelift-isle", - "gimli", + "gimli 0.26.2", "log", "regalloc2", "smallvec", @@ -1083,33 +1081,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a3cea8fdab90e44018c5b9a1dfd460d8ee265ac354337150222a354628bdb6" +checksum = "1c451b81faf237d11c7e4f3165eeb6bac61112762c5cfe7b4c0fb7241474358f" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ac72f76f2698598951ab26d8c96eaa854810e693e7dd52523958b5909fde6b2" +checksum = "e7c940133198426d26128f08be2b40b0bd117b84771fd36798969c4d712d81fc" [[package]] name = "cranelift-entity" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09eaeacfcd2356fe0e66b295e8f9d59fdd1ac3ace53ba50de14d628ec902f72d" +checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba69c9980d5ffd62c18a2bde927855fcd7c8dc92f29feaf8636052662cbd99c" +checksum = "34897538b36b216cc8dd324e73263596d51b8cf610da6498322838b2546baf8a" dependencies = [ "cranelift-codegen", "log", @@ -1119,15 +1117,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2920dc1e05cac40304456ed3301fde2c09bd6a9b0210bcfa2f101398d628d5b" +checksum = "1b2629a569fae540f16a76b70afcc87ad7decb38dc28fa6c648ac73b51e78470" [[package]] name = "cranelift-native" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04dfa45f9b2a6f587c564d6b63388e00cd6589d2df6ea2758cf79e1a13285e6" +checksum = "20937dab4e14d3e225c5adfc9c7106bafd4ac669bdb43027b911ff794c6fb318" dependencies = [ "cranelift-codegen", "libc", @@ -1136,9 +1134,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.85.3" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31a46513ae6f26f3f267d8d75b5373d555fbbd1e68681f348d99df43f747ec54" +checksum = "80fc2288957a94fd342a015811479de1837850924166d1f1856d8406e6f3609b" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1150,13 +1148,28 @@ dependencies = [ "wasmtime-types", ] +[[package]] +name = "crc" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" + [[package]] name = "crc32fast" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1165,7 +1178,7 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] @@ -1175,7 +1188,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] @@ -1187,7 +1200,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", "memoffset 0.7.1", "scopeguard", @@ -1199,7 +1212,7 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] @@ -1209,7 +1222,7 @@ version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1220,9 +1233,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-bigint" -version = "0.3.2" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" +checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" dependencies = [ "generic-array 0.14.6", "rand_core 0.6.4", @@ -1252,48 +1265,46 @@ dependencies = [ [[package]] name = "crypto-mac" -version = "0.11.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" dependencies = [ "generic-array 0.14.6", "subtle", ] [[package]] -name = "ctor" -version = "0.1.26" +name = "crypto-mac" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" dependencies = [ - "quote", - "syn", + "generic-array 0.14.6", + "subtle", ] [[package]] name = "ctr" -version = "0.8.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" +checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" dependencies = [ - "cipher 0.3.0", + "cipher 0.2.5", ] [[package]] -name = "cuckoofilter" -version = "0.5.0" +name = "ctr" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b810a8449931679f64cd7eef1bbd0fa315801b6d5d9cdc1ace2804d6529eee18" +checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ - "byteorder", - "fnv", - "rand 0.7.3", + "cipher 0.3.0", ] [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.37#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "clap", "parity-scale-codec", @@ -1308,12 +1319,11 @@ dependencies = [ [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.37#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", "cumulus-primitives-core", - "cumulus-relay-chain-interface", "futures", "parity-scale-codec", "parking_lot 0.12.1", @@ -1332,7 +1342,7 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.37#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -1361,17 +1371,19 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.37#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "async-trait", + "cumulus-client-pov-recovery", + "cumulus-primitives-core", "cumulus-relay-chain-interface", "dyn-clone", "futures", + "log", "parity-scale-codec", "polkadot-primitives", "sc-client-api", "sc-consensus", - "sp-api", "sp-blockchain", "sp-consensus", "sp-runtime", @@ -1382,11 +1394,10 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.37#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "async-trait", "cumulus-relay-chain-interface", - "derive_more", "futures", "futures-timer", "parity-scale-codec", @@ -1395,7 +1406,6 @@ dependencies = [ "polkadot-parachain", "polkadot-primitives", "sc-client-api", - "sp-api", "sp-blockchain", "sp-consensus", "sp-core", @@ -1407,7 +1417,7 @@ dependencies = [ [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.37#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", @@ -1421,7 +1431,6 @@ dependencies = [ "rand 0.8.5", "sc-client-api", "sc-consensus", - "sp-api", "sp-consensus", "sp-maybe-compressed-blob", "sp-runtime", @@ -1431,43 +1440,41 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.37#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", "cumulus-client-consensus-common", "cumulus-client-pov-recovery", "cumulus-primitives-core", + "cumulus-relay-chain-inprocess-interface", "cumulus-relay-chain-interface", + "cumulus-relay-chain-minimal-node", + "futures", "parking_lot 0.12.1", - "polkadot-overseer", "polkadot-primitives", "sc-client-api", "sc-consensus", - "sc-consensus-babe", "sc-service", + "sc-sysinfo", "sc-telemetry", - "sc-tracing", "sp-api", "sp-blockchain", "sp-consensus", "sp-core", "sp-runtime", - "tracing", ] [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.37#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ - "frame-executive", "frame-support", "frame-system", "pallet-aura", "parity-scale-codec", "scale-info", - "serde", "sp-application-crypto", "sp-consensus-aura", "sp-runtime", @@ -1477,7 +1484,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.37#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1489,13 +1496,12 @@ dependencies = [ "sp-runtime", "sp-std", "xcm", - "xcm-executor", ] [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.37#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "bytes", "cumulus-pallet-parachain-system-proc-macro", @@ -1506,11 +1512,9 @@ dependencies = [ "frame-system", "impl-trait-for-tuples", "log", - "pallet-balances", "parity-scale-codec", "polkadot-parachain", "scale-info", - "serde", "sp-core", "sp-externalities", "sp-inherents", @@ -1520,13 +1524,12 @@ dependencies = [ "sp-std", "sp-trie", "sp-version", - "xcm", ] [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.37#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -1537,14 +1540,13 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.37#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "serde", "sp-io", "sp-runtime", "sp-std", @@ -1554,7 +1556,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.37#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "cumulus-primitives-core", "frame-benchmarking", @@ -1573,9 +1575,8 @@ dependencies = [ [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.37#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ - "frame-support", "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain", @@ -1589,7 +1590,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.37#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -1612,7 +1613,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.37#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "cumulus-primitives-core", "futures", @@ -1625,18 +1626,14 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.37#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "cumulus-primitives-core", "frame-support", "log", "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain", - "polkadot-primitives", "sp-runtime", "sp-std", - "sp-trie", "xcm", "xcm-builder", "xcm-executor", @@ -1645,7 +1642,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-inprocess-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.37#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -1657,63 +1654,98 @@ dependencies = [ "polkadot-service", "sc-cli", "sc-client-api", - "sc-consensus-babe", - "sc-network", "sc-sysinfo", "sc-telemetry", "sc-tracing", "sp-api", - "sp-blockchain", "sp-consensus", "sp-core", "sp-runtime", "sp-state-machine", - "tracing", ] [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.37#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "async-trait", "cumulus-primitives-core", - "derive_more", "futures", "jsonrpsee-core", "parity-scale-codec", - "parking_lot 0.12.1", "polkadot-overseer", "polkadot-service", "sc-client-api", "sp-api", "sp-blockchain", - "sp-core", - "sp-runtime", "sp-state-machine", "thiserror", + "tokio", +] + +[[package]] +name = "cumulus-relay-chain-minimal-node" +version = "0.1.0" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.37#09418fc04c2608b123f36ca80f16df3d2096753b" +dependencies = [ + "array-bytes 6.0.0", + "async-trait", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "cumulus-relay-chain-rpc-interface", + "futures", + "lru", + "polkadot-core-primitives", + "polkadot-network-bridge", + "polkadot-node-network-protocol", + "polkadot-node-subsystem-util", + "polkadot-overseer", + "polkadot-primitives", + "polkadot-service", + "sc-authority-discovery", + "sc-client-api", + "sc-consensus", + "sc-keystore", + "sc-network", + "sc-network-common", + "sc-service", + "sc-telemetry", + "sc-tracing", + "sc-transaction-pool", + "sc-transaction-pool-api", + "sp-api", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", + "sp-runtime", + "tokio", + "tracing", + "url", ] [[package]] name = "cumulus-relay-chain-rpc-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.37#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "async-trait", - "backoff", "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures", "futures-timer", "jsonrpsee", + "lru", "parity-scale-codec", - "parking_lot 0.12.1", "polkadot-service", "sc-client-api", "sc-rpc-api", + "serde", + "serde_json", "sp-api", + "sp-authority-discovery", + "sp-consensus-babe", "sp-core", - "sp-runtime", "sp-state-machine", "sp-storage", "tokio", @@ -1724,7 +1756,7 @@ dependencies = [ [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.37#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", @@ -1762,22 +1794,23 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-pre.1" +version = "4.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4033478fbf70d6acf2655ac70da91ee65852d69daf7a67bf7a2f518fb47aafcf" +checksum = "8da00a7a9a4eb92a0a0f8e75660926d48f0d0f3c537e455c457bcdaa1e16b1ac" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.6.4", + "cfg-if", + "fiat-crypto", + "packed_simd_2", + "platforms 3.0.2", "subtle", "zeroize", ] [[package]] name = "cxx" -version = "1.0.83" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf" +checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62" dependencies = [ "cc", "cxxbridge-flags", @@ -1787,9 +1820,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.83" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39" +checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690" dependencies = [ "cc", "codespan-reporting", @@ -1802,18 +1835,53 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.83" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12" +checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf" [[package]] name = "cxxbridge-macro" -version = "1.0.83" +version = "1.0.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "darling" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0808e1bd8671fb44a113a14e13497557533369847788fa2ae912b6ebfce9fa8" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6" +checksum = "001d80444f28e193f30c2f293455da62dcf9a6b29918a4253152ae2b1de592cb" dependencies = [ + "fnv", + "ident_case", "proc-macro2", "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685" +dependencies = [ + "darling_core", + "quote", "syn", ] @@ -1845,11 +1913,41 @@ dependencies = [ [[package]] name = "der" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" dependencies = [ "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "der-parser" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe398ac75057914d7d07307bf67dc7f3f574a26783b4fc7805a20ffa9f506e82" +dependencies = [ + "asn1-rs 0.3.1", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "der-parser" +version = "8.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42d4bc9b0db0a0df9ae64634ac5bdefb7afcb534e182275ca0beadbe486701c1" +dependencies = [ + "asn1-rs 0.5.1", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", ] [[package]] @@ -1863,6 +1961,37 @@ dependencies = [ "syn", ] +[[package]] +name = "derive_builder" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "derive_builder_macro" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" +dependencies = [ + "derive_builder_core", + "syn", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -1876,6 +2005,12 @@ dependencies = [ "syn", ] +[[package]] +name = "difflib" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" + [[package]] name = "digest" version = "0.8.1" @@ -1920,7 +2055,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "dirs-sys-next", ] @@ -1947,15 +2082,22 @@ dependencies = [ ] [[package]] -name = "dns-parser" -version = "0.8.0" +name = "displaydoc" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea" +checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" dependencies = [ - "byteorder", - "quick-error", + "proc-macro2", + "quote", + "syn", ] +[[package]] +name = "downcast" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" + [[package]] name = "downcast-rs" version = "1.2.0" @@ -1964,9 +2106,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dtoa" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a6eee2d5d0d113f015688310da018bd1d864d86bd567c8fca9c266889e1bfa" +checksum = "c00704156a7de8df8da0911424e30c2049957b0a714542a44e05fe693dd85313" [[package]] name = "dyn-clonable" @@ -1991,15 +2133,15 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2" +checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60" [[package]] name = "ecdsa" -version = "0.13.4" +version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9" +checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" dependencies = [ "der", "elliptic-curve", @@ -2009,9 +2151,9 @@ dependencies = [ [[package]] name = "ed25519" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ "signature", ] @@ -2037,7 +2179,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6" dependencies = [ "curve25519-dalek 3.2.0", - "hashbrown 0.12.3", + "hashbrown", "hex", "rand_core 0.6.4", "sha2 0.9.9", @@ -2046,22 +2188,26 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "elliptic-curve" -version = "0.11.12" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6" +checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ "base16ct", "crypto-bigint", "der", + "digest 0.10.6", "ff", "generic-array 0.14.6", "group", + "hkdf", + "pem-rfc7468", + "pkcs8", "rand_core 0.6.4", "sec1", "subtle", @@ -2070,9 +2216,9 @@ dependencies = [ [[package]] name = "enum-as-inner" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" +checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ "heck", "proc-macro2", @@ -2102,9 +2248,9 @@ dependencies = [ [[package]] name = "enumn" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038b1afa59052df211f9efd58f8b1d84c242935ede1c3dbaed26b018a9e06ae2" +checksum = "e88bcb3a067a6555d577aba299e75eff9942da276e6506fc6274327daa026132" dependencies = [ "proc-macro2", "quote", @@ -2125,14 +2271,27 @@ dependencies = [ ] [[package]] -name = "environmental" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b" - -[[package]] -name = "errno" -version = "0.2.8" +name = "env_logger" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "environmental" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b" + +[[package]] +name = "errno" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" dependencies = [ @@ -2205,9 +2364,9 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fastrand" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] @@ -2248,41 +2407,47 @@ dependencies = [ [[package]] name = "ff" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "131655483be284720a17d74ff97592b8e76576dc25563148601df2d7c9080924" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" dependencies = [ "rand_core 0.6.4", "subtle", ] +[[package]] +name = "fiat-crypto" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a214f5bb88731d436478f3ae1f8a277b62124089ba9fb67f4f93fb100ef73c90" + [[package]] name = "file-per-thread-logger" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e16290574b39ee41c71aeb90ae960c504ebaf1e2a1c87bd52aa56ed6e1a02f" +checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866" dependencies = [ - "env_logger", + "env_logger 0.10.0", "log", ] [[package]] name = "filetime" -version = "0.2.19" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" +checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "finality-grandpa" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22349c6a11563a202d95772a68e0fcf56119e74ea8a2a19cf2301460fcd0df5" +checksum = "e24e6c429951433ccb7c87fd528c60084834dcd14763182c1f83291bcde24c34" dependencies = [ "either", "futures", @@ -2296,9 +2461,9 @@ dependencies = [ [[package]] name = "fixed-hash" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" +checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", "rand 0.8.5", @@ -2320,7 +2485,16 @@ checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", "libz-sys", - "miniz_oxide 0.6.2", + "miniz_oxide", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", ] [[package]] @@ -2332,7 +2506,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "parity-scale-codec", ] @@ -2346,10 +2520,16 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fragile" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" + [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-support", "frame-system", @@ -2372,9 +2552,10 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "Inflector", + "array-bytes 4.2.0", "chrono", "clap", "comfy-table", @@ -2383,17 +2564,13 @@ dependencies = [ "frame-system", "gethostname", "handlebars", - "hash-db", - "hex", "itertools", - "kvdb", "lazy_static", "linked-hash-map", "log", - "memory-db", "parity-scale-codec", "rand 0.8.5", - "rand_pcg 0.3.1", + "rand_pcg", "sc-block-builder", "sc-cli", "sc-client-api", @@ -2403,7 +2580,6 @@ dependencies = [ "sc-sysinfo", "serde", "serde_json", - "serde_nanos", "sp-api", "sp-blockchain", "sp-core", @@ -2413,9 +2589,9 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-state-machine", + "sp-std", "sp-storage", "sp-trie", - "tempfile", "thiserror", "thousands", ] @@ -2423,7 +2599,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2434,7 +2610,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -2442,6 +2618,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-arithmetic", + "sp-core", "sp-npos-elections", "sp-runtime", "sp-std", @@ -2450,7 +2627,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-support", "frame-system", @@ -2470,16 +2647,32 @@ version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df6bb8542ef006ef0de09a5c4420787d79823c0ed7924225822362fd2bf2ff2d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "parity-scale-codec", "scale-info", "serde", ] +[[package]] +name = "frame-remote-externalities" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" +dependencies = [ + "futures", + "log", + "parity-scale-codec", + "serde", + "sp-core", + "sp-io", + "sp-runtime", + "substrate-rpc-client", + "tokio", +] + [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "bitflags", "frame-metadata", @@ -2504,13 +2697,14 @@ dependencies = [ "sp-state-machine", "sp-std", "sp-tracing", + "sp-weights", "tt-call", ] [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "Inflector", "cfg-expr", @@ -2524,7 +2718,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -2536,7 +2730,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "proc-macro2", "quote", @@ -2546,7 +2740,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-support", "log", @@ -2558,12 +2752,13 @@ dependencies = [ "sp-runtime", "sp-std", "sp-version", + "sp-weights", ] [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-support", @@ -2578,7 +2773,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.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "parity-scale-codec", "sp-api", @@ -2587,7 +2782,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-support", "parity-scale-codec", @@ -2602,18 +2797,6 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" -[[package]] -name = "fs-swap" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d47dad3685eceed8488986cad3d5027165ea5edb164331770e2059555f10a5" -dependencies = [ - "lazy_static", - "libc", - "libloading 0.5.2", - "winapi", -] - [[package]] name = "fs2" version = "0.4.3" @@ -2624,12 +2807,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "fs_extra" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" - [[package]] name = "funty" version = "2.0.0" @@ -2638,9 +2815,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84" dependencies = [ "futures-channel", "futures-core", @@ -2653,9 +2830,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" dependencies = [ "futures-core", "futures-sink", @@ -2663,15 +2840,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e" dependencies = [ "futures-core", "futures-task", @@ -2681,9 +2858,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" [[package]] name = "futures-lite" @@ -2702,9 +2879,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" dependencies = [ "proc-macro2", "quote", @@ -2718,21 +2895,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" dependencies = [ "futures-io", - "rustls", - "webpki", + "rustls 0.20.8", + "webpki 0.22.0", ] [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" [[package]] name = "futures-timer" @@ -2742,9 +2919,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" dependencies = [ "futures-channel", "futures-core", @@ -2802,11 +2979,9 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "cfg-if 1.0.0", - "js-sys", + "cfg-if", "libc", "wasi 0.9.0+wasi-snapshot-preview1", - "wasm-bindgen", ] [[package]] @@ -2815,13 +2990,23 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", "wasm-bindgen", ] +[[package]] +name = "ghash" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375" +dependencies = [ + "opaque-debug 0.3.0", + "polyval 0.4.5", +] + [[package]] name = "ghash" version = "0.4.4" @@ -2829,7 +3014,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" dependencies = [ "opaque-debug 0.3.0", - "polyval", + "polyval 0.5.3", ] [[package]] @@ -2843,17 +3028,23 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "gimli" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" + [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" +checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ "aho-corasick", "bstr", @@ -2862,23 +3053,11 @@ dependencies = [ "regex", ] -[[package]] -name = "gloo-timers" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c4a8d6391675c6b2ee1a6c8d06e8e2d03605c44cec1270675985a4c2a5500b" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - [[package]] name = "group" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89" +checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" dependencies = [ "ff", "rand_core 0.6.4", @@ -2906,9 +3085,9 @@ dependencies = [ [[package]] name = "handlebars" -version = "4.3.5" +version = "4.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433e4ab33f1213cdc25b5fa45c76881240cfe79284cf2b395e8b9e312a30a2fd" +checksum = "035ef95d03713f2c347a72547b7cd38cbc9af7cd51e6099fb62d586d4a6dee3a" dependencies = [ "log", "pest", @@ -2933,15 +3112,6 @@ dependencies = [ "crunchy", ] -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash", -] - [[package]] name = "hashbrown" version = "0.12.3" @@ -2953,9 +3123,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -2966,6 +3136,21 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + [[package]] name = "hex" version = "0.4.3" @@ -2979,10 +3164,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" [[package]] -name = "hex_fmt" -version = "0.3.0" +name = "hkdf" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +dependencies = [ + "hmac 0.12.1", +] [[package]] name = "hmac" @@ -2994,6 +3182,16 @@ dependencies = [ "digest 0.9.0", ] +[[package]] +name = "hmac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" +dependencies = [ + "crypto-mac 0.10.1", + "digest 0.9.0", +] + [[package]] name = "hmac" version = "0.11.0" @@ -3004,6 +3202,15 @@ dependencies = [ "digest 0.9.0", ] +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest 0.10.6", +] + [[package]] name = "hmac-drbg" version = "0.3.0" @@ -3048,6 +3255,12 @@ dependencies = [ "pin-project-lite 0.2.9", ] +[[package]] +name = "http-range-header" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" + [[package]] name = "httparse" version = "1.8.0" @@ -3068,9 +3281,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.23" +version = "0.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" dependencies = [ "bytes", "futures-channel", @@ -3099,7 +3312,7 @@ dependencies = [ "http", "hyper", "log", - "rustls", + "rustls 0.20.8", "rustls-native-certs", "tokio", "tokio-rustls", @@ -3129,6 +3342,12 @@ dependencies = [ "cxx-build", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "0.2.3" @@ -3162,9 +3381,9 @@ dependencies = [ [[package]] name = "if-watch" -version = "1.1.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "015a7df1eb6dda30df37f34b63ada9b7b352984b0e84de2a20ed526345000791" +checksum = "ba7abdbb86e485125dad06c2691e1e393bf3b08c7b743b43aa162a00fd39062e" dependencies = [ "async-io", "core-foundation", @@ -3175,6 +3394,7 @@ dependencies = [ "log", "rtnetlink", "system-configuration", + "tokio", "windows", ] @@ -3189,9 +3409,9 @@ dependencies = [ [[package]] name = "impl-serde" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c" +checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd" dependencies = [ "serde", ] @@ -3214,18 +3434,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", - "hashbrown 0.12.3", + "hashbrown", "serde", ] [[package]] -name = "inout" -version = "0.1.3" +name = "indexmap-nostd" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array 0.14.6", -] +checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" [[package]] name = "instant" @@ -3233,7 +3450,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -3252,10 +3469,23 @@ dependencies = [ ] [[package]] -name = "io-lifetimes" -version = "0.5.3" +name = "interceptor" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec58677acfea8a15352d42fc87d11d63596ade9239e0a7c9352914417515dbe6" +checksum = "1e8a11ae2da61704edada656798b61c94b35ecac2c58eb955156987d5e6be90b" +dependencies = [ + "async-trait", + "bytes", + "log", + "rand 0.8.5", + "rtcp", + "rtp", + "thiserror", + "tokio", + "waitgroup", + "webrtc-srtp", + "webrtc-util", +] [[package]] name = "io-lifetimes" @@ -3263,6 +3493,16 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" +[[package]] +name = "io-lifetimes" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" +dependencies = [ + "libc", + "windows-sys 0.45.0", +] + [[package]] name = "ip_network" version = "0.4.1" @@ -3283,9 +3523,21 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.7.0" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" + +[[package]] +name = "is-terminal" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" +checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes 1.0.5", + "rustix 0.36.8", + "windows-sys 0.45.0", +] [[package]] name = "itertools" @@ -3298,9 +3550,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "jobserver" @@ -3313,33 +3565,32 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] [[package]] name = "jsonrpsee" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd0d559d5e679b1ab2f869b486a11182923863b1b3ee8b421763cdd707b783a" +checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e" dependencies = [ "jsonrpsee-core", - "jsonrpsee-http-server", "jsonrpsee-proc-macros", + "jsonrpsee-server", "jsonrpsee-types", "jsonrpsee-ws-client", - "jsonrpsee-ws-server", "tracing", ] [[package]] name = "jsonrpsee-client-transport" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8752740ecd374bcbf8b69f3e80b0327942df76f793f8d4e60d3355650c31fb74" +checksum = "965de52763f2004bc91ac5bcec504192440f0b568a5d621c59d9dbd6f886c3fb" dependencies = [ "futures-util", "http", @@ -3358,9 +3609,9 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3dc3e9cf2ba50b7b1d7d76a667619f82846caa39e8e8daa8a4962d74acaddca" +checksum = "a4e70b4439a751a5de7dd5ed55eacff78ebf4ffe0fc009cb1ebb11417f5b536b" dependencies = [ "anyhow", "arrayvec 0.7.2", @@ -3371,10 +3622,8 @@ dependencies = [ "futures-timer", "futures-util", "globset", - "http", "hyper", "jsonrpsee-types", - "lazy_static", "parking_lot 0.12.1", "rand 0.8.5", "rustc-hash", @@ -3384,45 +3633,48 @@ dependencies = [ "thiserror", "tokio", "tracing", - "tracing-futures", - "unicase", ] [[package]] -name = "jsonrpsee-http-server" -version = "0.15.1" +name = "jsonrpsee-proc-macros" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baa6da1e4199c10d7b1d0a6e5e8bd8e55f351163b6f4b3cbb044672a69bd4c1c" +dependencies = [ + "heck", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "jsonrpsee-server" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03802f0373a38c2420c70b5144742d800b509e2937edc4afb116434f07120117" +checksum = "1fb69dad85df79527c019659a992498d03f8495390496da2f07e6c24c2b356fc" dependencies = [ "futures-channel", "futures-util", + "http", "hyper", "jsonrpsee-core", "jsonrpsee-types", "serde", "serde_json", + "soketto", "tokio", + "tokio-stream", + "tokio-util", + "tower", "tracing", - "tracing-futures", -] - -[[package]] -name = "jsonrpsee-proc-macros" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd67957d4280217247588ac86614ead007b301ca2fa9f19c19f880a536f029e3" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", ] [[package]] name = "jsonrpsee-types" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e290bba767401b646812f608c099b922d8142603c9e73a50fb192d3ac86f4a0d" +checksum = "5bd522fe1ce3702fd94812965d7bb7a3364b1c9aba743944c5a00529aae80f8c" dependencies = [ "anyhow", "beef", @@ -3434,9 +3686,9 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee5feddd5188e62ac08fcf0e56478138e581509d4730f3f7be9b57dd402a4ff" +checksum = "0b83daeecfc6517cfe210df24e570fb06213533dfb990318fae781f4c7119dd9" dependencies = [ "http", "jsonrpsee-client-transport", @@ -3444,36 +3696,16 @@ dependencies = [ "jsonrpsee-types", ] -[[package]] -name = "jsonrpsee-ws-server" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d488ba74fb369e5ab68926feb75a483458b88e768d44319f37e4ecad283c7325" -dependencies = [ - "futures-channel", - "futures-util", - "http", - "jsonrpsee-core", - "jsonrpsee-types", - "serde_json", - "soketto", - "tokio", - "tokio-stream", - "tokio-util", - "tracing", - "tracing-futures", -] - [[package]] name = "k256" -version = "0.10.4" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d" +checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "ecdsa", "elliptic-curve", - "sec1", + "sha2 0.10.6", ] [[package]] @@ -3487,10 +3719,9 @@ dependencies = [ [[package]] name = "kusama-runtime" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "beefy-primitives", "bitvec", "frame-benchmarking", "frame-election-provider-support", @@ -3511,17 +3742,19 @@ dependencies = [ "pallet-bounties", "pallet-child-bounties", "pallet-collective", + "pallet-conviction-voting", "pallet-democracy", "pallet-election-provider-multi-phase", "pallet-election-provider-support-benchmarking", "pallet-elections-phragmen", - "pallet-gilt", + "pallet-fast-unstake", "pallet-grandpa", "pallet-identity", "pallet-im-online", "pallet-indices", "pallet-membership", "pallet-multisig", + "pallet-nis", "pallet-nomination-pools", "pallet-nomination-pools-benchmarking", "pallet-nomination-pools-runtime-api", @@ -3529,13 +3762,14 @@ dependencies = [ "pallet-offences-benchmarking", "pallet-preimage", "pallet-proxy", + "pallet-ranked-collective", "pallet-recovery", + "pallet-referenda", "pallet-scheduler", "pallet-session", "pallet-session-benchmarking", "pallet-society", "pallet-staking 4.0.0-dev", - "pallet-staking-reward-fn", "pallet-timestamp", "pallet-tips", "pallet-transaction-payment", @@ -3543,6 +3777,7 @@ dependencies = [ "pallet-treasury", "pallet-utility", "pallet-vesting", + "pallet-whitelist", "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", @@ -3557,6 +3792,7 @@ dependencies = [ "sp-api", "sp-arithmetic", "sp-authority-discovery", + "sp-beefy", "sp-block-builder", "sp-consensus-babe", "sp-core", @@ -3580,58 +3816,45 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "frame-support", "polkadot-primitives", "polkadot-runtime-common", "smallvec", + "sp-core", "sp-runtime", + "sp-weights", ] [[package]] -name = "kv-log-macro" -version = "1.0.7" +name = "kvdb" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +checksum = "e7d770dcb02bf6835887c3a979b5107a04ff4bbde97a5f0928d27404a155add9" dependencies = [ - "log", -] - -[[package]] -name = "kvdb" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a301d8ecb7989d4a6e2c57a49baca77d353bdbf879909debe3f375fe25d61f86" -dependencies = [ - "parity-util-mem", - "smallvec", + "smallvec", ] [[package]] name = "kvdb-memorydb" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece7e668abd21387aeb6628130a6f4c802787f014fa46bc83221448322250357" +checksum = "bf7a85fe66f9ff9cd74e169fdd2c94c6e1e74c412c99a73b4df3200b5d3760b2" dependencies = [ "kvdb", - "parity-util-mem", "parking_lot 0.12.1", ] [[package]] name = "kvdb-rocksdb" -version = "0.15.2" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca7fbdfd71cd663dceb0faf3367a99f8cf724514933e9867cec4995b6027cbc1" +checksum = "2182b8219fee6bd83aacaab7344e840179ae079d5216aa4e249b4d704646a844" dependencies = [ - "fs-swap", "kvdb", - "log", "num_cpus", - "owning_ref", - "parity-util-mem", "parking_lot 0.12.1", "regex", "rocksdb", @@ -3644,7 +3867,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" dependencies = [ - "spin", + "spin 0.5.2", ] [[package]] @@ -3655,29 +3878,25 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.138" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "libloading" -version = "0.5.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ - "cc", + "cfg-if", "winapi", ] [[package]] -name = "libloading" -version = "0.7.4" +name = "libm" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if 1.0.0", - "winapi", -] +checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" [[package]] name = "libm" @@ -3687,22 +3906,17 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" [[package]] name = "libp2p" -version = "0.46.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81327106887e42d004fbdab1fef93675be2e2e07c1b95fce45e2cc813485611d" +checksum = "2e0a0d2f693675f49ded13c5d510c48b78069e23cbd9108d7ccd59f6dc568819" dependencies = [ "bytes", "futures", "futures-timer", "getrandom 0.2.8", "instant", - "lazy_static", - "libp2p-autonat", "libp2p-core", - "libp2p-deflate", "libp2p-dns", - "libp2p-floodsub", - "libp2p-gossipsub", "libp2p-identify", "libp2p-kad", "libp2p-mdns", @@ -3710,49 +3924,25 @@ dependencies = [ "libp2p-mplex", "libp2p-noise", "libp2p-ping", - "libp2p-plaintext", - "libp2p-pnet", - "libp2p-relay", - "libp2p-rendezvous", + "libp2p-quic", "libp2p-request-response", "libp2p-swarm", - "libp2p-swarm-derive", "libp2p-tcp", - "libp2p-uds", "libp2p-wasm-ext", + "libp2p-webrtc", "libp2p-websocket", "libp2p-yamux", "multiaddr", "parking_lot 0.12.1", "pin-project", - "rand 0.7.3", "smallvec", ] -[[package]] -name = "libp2p-autonat" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4decc51f3573653a9f4ecacb31b1b922dd20c25a6322bb15318ec04287ec46f9" -dependencies = [ - "async-trait", - "futures", - "futures-timer", - "instant", - "libp2p-core", - "libp2p-request-response", - "libp2p-swarm", - "log", - "prost", - "prost-build", - "rand 0.8.5", -] - [[package]] name = "libp2p-core" -version = "0.34.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf9b94cefab7599b2d3dff2f93bee218c6621d68590b23ede4485813cbcece6" +checksum = "b6a8fcd392ff67af6cc3f03b1426c41f7f26b6b9aff2dc632c1c56dd649e571f" dependencies = [ "asn1_der", "bs58", @@ -3762,19 +3952,18 @@ dependencies = [ "futures", "futures-timer", "instant", - "lazy_static", - "libsecp256k1", "log", "multiaddr", "multihash", "multistream-select", + "once_cell", "parking_lot 0.12.1", "pin-project", "prost", "prost-build", "rand 0.8.5", - "ring", "rw-stream-sink", + "sec1", "sha2 0.10.6", "smallvec", "thiserror", @@ -3783,24 +3972,12 @@ dependencies = [ "zeroize", ] -[[package]] -name = "libp2p-deflate" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0183dc2a3da1fbbf85e5b6cf51217f55b14f5daea0c455a9536eef646bfec71" -dependencies = [ - "flate2", - "futures", - "libp2p-core", -] - [[package]] name = "libp2p-dns" -version = "0.34.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cbf54723250fa5d521383be789bf60efdabe6bacfb443f87da261019a49b4b5" +checksum = "8e42a271c1b49f789b92f7fc87749fa79ce5c7bdc88cbdfacb818a4bca47fec5" dependencies = [ - "async-std-resolver", "futures", "libp2p-core", "log", @@ -3809,57 +3986,11 @@ dependencies = [ "trust-dns-resolver", ] -[[package]] -name = "libp2p-floodsub" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98a4b6ffd53e355775d24b76f583fdda54b3284806f678499b57913adb94f231" -dependencies = [ - "cuckoofilter", - "fnv", - "futures", - "libp2p-core", - "libp2p-swarm", - "log", - "prost", - "prost-build", - "rand 0.7.3", - "smallvec", -] - -[[package]] -name = "libp2p-gossipsub" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b4b888cfbeb1f5551acd3aa1366e01bf88ede26cc3c4645d0d2d004d5ca7b0" -dependencies = [ - "asynchronous-codec", - "base64", - "byteorder", - "bytes", - "fnv", - "futures", - "hex_fmt", - "instant", - "libp2p-core", - "libp2p-swarm", - "log", - "prometheus-client", - "prost", - "prost-build", - "rand 0.7.3", - "regex", - "sha2 0.10.6", - "smallvec", - "unsigned-varint", - "wasm-timer", -] - [[package]] name = "libp2p-identify" -version = "0.37.0" +version = "0.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50b585518f8efd06f93ac2f976bd672e17cdac794644b3117edd078e96bda06" +checksum = "c052d0026f4817b44869bfb6810f4e1112f43aec8553f2cb38881c524b563abf" dependencies = [ "asynchronous-codec", "futures", @@ -3867,7 +3998,7 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "lru 0.7.8", + "lru", "prost", "prost-build", "prost-codec", @@ -3878,9 +4009,9 @@ dependencies = [ [[package]] name = "libp2p-kad" -version = "0.38.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740862893bb5f06ac24acc9d49bdeadc3a5e52e51818a30a25c1f3519da2c851" +checksum = "2766dcd2be8c87d5e1f35487deb22d765f49c6ae1251b3633efe3b25698bd3d2" dependencies = [ "arrayvec 0.7.2", "asynchronous-codec", @@ -3895,7 +4026,7 @@ dependencies = [ "log", "prost", "prost-build", - "rand 0.7.3", + "rand 0.8.5", "sha2 0.10.6", "smallvec", "thiserror", @@ -3906,46 +4037,43 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.38.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66e5e5919509603281033fd16306c61df7a4428ce274b67af5e14b07de5cdcb2" +checksum = "04f378264aade9872d6ccd315c0accc18be3a35d15fc1b9c36e5b6f983b62b5b" dependencies = [ - "async-io", "data-encoding", - "dns-parser", "futures", "if-watch", - "lazy_static", "libp2p-core", "libp2p-swarm", "log", "rand 0.8.5", "smallvec", "socket2", + "tokio", + "trust-dns-proto", "void", ] [[package]] name = "libp2p-metrics" -version = "0.7.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8aff4a1abef42328fbb30b17c853fff9be986dc39af17ee39f9c5f755c5e0c" +checksum = "5ad8a64f29da86005c86a4d2728b8a0719e9b192f4092b609fd8790acb9dec55" dependencies = [ "libp2p-core", - "libp2p-gossipsub", "libp2p-identify", "libp2p-kad", "libp2p-ping", - "libp2p-relay", "libp2p-swarm", "prometheus-client", ] [[package]] name = "libp2p-mplex" -version = "0.34.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61fd1b20638ec209c5075dfb2e8ce6a7ea4ec3cd3ad7b77f7a477c06d53322e2" +checksum = "03805b44107aa013e7cbbfa5627b31c36cbedfdfb00603c0311998882bc4bace" dependencies = [ "asynchronous-codec", "bytes", @@ -3954,134 +4082,76 @@ dependencies = [ "log", "nohash-hasher", "parking_lot 0.12.1", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "unsigned-varint", ] [[package]] name = "libp2p-noise" -version = "0.37.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "762408cb5d84b49a600422d7f9a42c18012d8da6ebcd570f9a4a4290ba41fb6f" +checksum = "a978cb57efe82e892ec6f348a536bfbd9fee677adbe5689d7a93ad3a9bffbf2e" dependencies = [ "bytes", "curve25519-dalek 3.2.0", "futures", - "lazy_static", "libp2p-core", "log", + "once_cell", "prost", "prost-build", "rand 0.8.5", "sha2 0.10.6", "snow", "static_assertions", - "x25519-dalek", + "thiserror", + "x25519-dalek 1.1.1", "zeroize", ] [[package]] name = "libp2p-ping" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "100a6934ae1dbf8a693a4e7dd1d730fd60b774dafc45688ed63b554497c6c925" -dependencies = [ - "futures", - "futures-timer", - "instant", - "libp2p-core", - "libp2p-swarm", - "log", - "rand 0.7.3", - "void", -] - -[[package]] -name = "libp2p-plaintext" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be27bf0820a6238a4e06365b096d428271cce85a129cf16f2fe9eb1610c4df86" -dependencies = [ - "asynchronous-codec", - "bytes", - "futures", - "libp2p-core", - "log", - "prost", - "prost-build", - "unsigned-varint", - "void", -] - -[[package]] -name = "libp2p-pnet" -version = "0.22.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de160c5631696cea22be326c19bd9d306e254c4964945263aea10f25f6e0864e" -dependencies = [ - "futures", - "log", - "pin-project", - "rand 0.8.5", - "salsa20", - "sha3", -] - -[[package]] -name = "libp2p-relay" -version = "0.10.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4931547ee0cce03971ccc1733ff05bb0c4349fd89120a39e9861e2bbe18843c3" +checksum = "929fcace45a112536e22b3dcfd4db538723ef9c3cb79f672b98be2cc8e25f37f" dependencies = [ - "asynchronous-codec", - "bytes", - "either", "futures", "futures-timer", "instant", "libp2p-core", "libp2p-swarm", "log", - "pin-project", - "prost", - "prost-build", - "prost-codec", "rand 0.8.5", - "smallvec", - "static_assertions", - "thiserror", "void", ] [[package]] -name = "libp2p-rendezvous" -version = "0.7.0" +name = "libp2p-quic" +version = "0.7.0-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9511c9672ba33284838e349623319c8cad2d18cfad243ae46c6b7e8a2982ea4e" +checksum = "01e7c867e95c8130667b24409d236d37598270e6da69b3baf54213ba31ffca59" dependencies = [ - "asynchronous-codec", - "bimap", + "bytes", "futures", "futures-timer", - "instant", + "if-watch", "libp2p-core", - "libp2p-swarm", + "libp2p-tls", "log", - "prost", - "prost-build", + "parking_lot 0.12.1", + "quinn-proto", "rand 0.8.5", - "sha2 0.10.6", + "rustls 0.20.8", "thiserror", - "unsigned-varint", - "void", + "tokio", ] [[package]] name = "libp2p-request-response" -version = "0.19.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "508a189e2795d892c8f5c1fa1e9e0b1845d32d7b0b249dbf7b05b18811361843" +checksum = "3236168796727bfcf4927f766393415361e2c644b08bedb6a6b13d957c9a4884" dependencies = [ "async-trait", "bytes", @@ -4090,16 +4160,16 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "unsigned-varint", ] [[package]] name = "libp2p-swarm" -version = "0.37.0" +version = "0.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ac5be6c2de2d1ff3f7693fda6faf8a827b1f3e808202277783fea9f527d114" +checksum = "b2a35472fe3276b3855c00f1c032ea8413615e030256429ad5349cdf67c6e1a0" dependencies = [ "either", "fnv", @@ -4107,58 +4177,66 @@ dependencies = [ "futures-timer", "instant", "libp2p-core", + "libp2p-swarm-derive", "log", "pin-project", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "thiserror", + "tokio", "void", ] [[package]] name = "libp2p-swarm-derive" -version = "0.28.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f54a64b6957249e0ce782f8abf41d97f69330d02bf229f0672d864f0650cc76" +checksum = "9d527d5827582abd44a6d80c07ff8b50b4ee238a8979e05998474179e79dc400" dependencies = [ + "heck", "quote", "syn", ] [[package]] name = "libp2p-tcp" -version = "0.34.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6771dc19aa3c65d6af9a8c65222bfc8fcd446630ddca487acd161fa6096f3b" +checksum = "b4b257baf6df8f2df39678b86c578961d48cc8b68642a12f0f763f56c8e5858d" dependencies = [ - "async-io", "futures", "futures-timer", "if-watch", - "ipnet", "libc", "libp2p-core", "log", "socket2", + "tokio", ] [[package]] -name = "libp2p-uds" -version = "0.33.0" +name = "libp2p-tls" +version = "0.1.0-alpha" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d125e3e5f0d58f3c6ac21815b20cf4b6a88b8db9dc26368ea821838f4161fd4d" +checksum = "f7905ce0d040576634e8a3229a7587cc8beab83f79db6023800f1792895defa8" dependencies = [ - "async-std", "futures", + "futures-rustls", "libp2p-core", - "log", + "rcgen 0.10.0", + "ring", + "rustls 0.20.8", + "thiserror", + "webpki 0.22.0", + "x509-parser 0.14.0", + "yasna", ] [[package]] name = "libp2p-wasm-ext" -version = "0.34.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec894790eec3c1608f8d1a8a0bdf0dbeb79ed4de2dce964222011c2896dfa05a" +checksum = "1bb1a35299860e0d4b3c02a3e74e3b293ad35ae0cee8a056363b0c862d082069" dependencies = [ "futures", "js-sys", @@ -4168,11 +4246,42 @@ dependencies = [ "wasm-bindgen-futures", ] +[[package]] +name = "libp2p-webrtc" +version = "0.4.0-alpha" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb6cd86dd68cba72308ea05de1cebf3ba0ae6e187c40548167955d4e3970f6a" +dependencies = [ + "async-trait", + "asynchronous-codec", + "bytes", + "futures", + "futures-timer", + "hex", + "if-watch", + "libp2p-core", + "libp2p-noise", + "log", + "multihash", + "prost", + "prost-build", + "prost-codec", + "rand 0.8.5", + "rcgen 0.9.3", + "serde", + "stun", + "thiserror", + "tinytemplate", + "tokio", + "tokio-util", + "webrtc", +] + [[package]] name = "libp2p-websocket" -version = "0.36.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9808e57e81be76ff841c106b4c5974fb4d41a233a7bdd2afbf1687ac6def3818" +checksum = "1d705506030d5c0aaf2882437c70dab437605f21c5f9811978f694e6917a3b54" dependencies = [ "either", "futures", @@ -4189,12 +4298,13 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.38.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6dea686217a06072033dc025631932810e2f6ad784e4fafa42e27d311c7a81c" +checksum = "4f63594a0aa818642d9d4915c791945053877253f08a3626f13416b5cd928a29" dependencies = [ "futures", "libp2p-core", + "log", "parking_lot 0.12.1", "thiserror", "yamux", @@ -4202,9 +4312,9 @@ dependencies = [ [[package]] name = "librocksdb-sys" -version = "0.6.1+6.28.2" +version = "0.8.3+7.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc587013734dadb7cf23468e531aa120788b87243648be42e2d3a072186291" +checksum = "557b255ff04123fcc176162f56ed0c9cd42d8f357cf55b3fabeb60f7413741b3" dependencies = [ "bindgen", "bzip2-sys", @@ -4222,7 +4332,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1" dependencies = [ "arrayref", - "base64", + "base64 0.13.1", "digest 0.9.0", "hmac-drbg", "libsecp256k1-core", @@ -4276,9 +4386,9 @@ dependencies = [ [[package]] name = "link-cplusplus" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" dependencies = [ "cc", ] @@ -4310,15 +4420,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.0.42" +version = "0.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5284f00d480e1c39af34e72f8ad60b94f47007e3481cd3b731c1d67190ddc7b7" +checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" [[package]] name = "linux-raw-sys" -version = "0.0.46" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "lock_api" @@ -4336,17 +4446,7 @@ version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ - "cfg-if 1.0.0", - "value-bag", -] - -[[package]] -name = "lru" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" -dependencies = [ - "hashbrown 0.12.3", + "cfg-if", ] [[package]] @@ -4355,7 +4455,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" dependencies = [ - "hashbrown 0.12.3", + "hashbrown", ] [[package]] @@ -4413,9 +4513,9 @@ dependencies = [ [[package]] name = "matches" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matrixmultiply" @@ -4426,6 +4526,15 @@ dependencies = [ "rawpointer", ] +[[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest 0.10.6", +] + [[package]] name = "memchr" version = "2.5.0" @@ -4434,11 +4543,11 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memfd" -version = "0.4.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6627dc657574b49d6ad27105ed671822be56e0d2547d413bfbf3e8d8fa92e7a" +checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb" dependencies = [ - "libc", + "rustix 0.36.8", ] [[package]] @@ -4470,29 +4579,19 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6566c70c1016f525ced45d7b7f97730a2bafb037c788211d0c186ef5b2189f0a" +checksum = "5e0c7cba9ce19ac7ffd2053ac9f49843bbd3f4318feedfd74e85c19d5fb0ba66" dependencies = [ "hash-db", - "hashbrown 0.12.3", - "parity-util-mem", + "hashbrown", ] [[package]] -name = "memory-lru" -version = "0.1.1" +name = "memory_units" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce95ae042940bad7e312857b929ee3d11b8f799a80cb7b9c7ec5125516906395" -dependencies = [ - "lru 0.8.1", -] - -[[package]] -name = "memory_units" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" +checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" [[package]] name = "merlin" @@ -4523,15 +4622,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.6.2" @@ -4543,32 +4633,88 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] -name = "more-asserts" -version = "0.2.2" +name = "mmr-gadget" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" +dependencies = [ + "futures", + "log", + "parity-scale-codec", + "sc-client-api", + "sc-offchain", + "sp-api", + "sp-beefy", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-mmr-primitives", + "sp-runtime", +] + +[[package]] +name = "mmr-rpc" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" +dependencies = [ + "anyhow", + "jsonrpsee", + "parity-scale-codec", + "serde", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-mmr-primitives", + "sp-runtime", +] + +[[package]] +name = "mockall" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50e4a1c770583dac7ab5e2f6c139153b783a53a1bbee9729613f193e59828326" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "lazy_static", + "mockall_derive", + "predicates", + "predicates-tree", +] + +[[package]] +name = "mockall_derive" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" +checksum = "832663583d5fa284ca8810bf7015e46c9fff9622d3cf34bd1eea5003fec06dd0" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn", +] [[package]] name = "multiaddr" -version = "0.14.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c580bfdd8803cce319b047d239559a22f809094aaea4ac13902a1fdcfcd4261" +checksum = "a4aebdb21e90f81d13ed01dc84123320838e53963c2ca94b60b305d3fa64f31e" dependencies = [ "arrayref", - "bs58", "byteorder", "data-encoding", + "multibase", "multihash", "percent-encoding", "serde", @@ -4627,9 +4773,9 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multistream-select" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363a84be6453a70e63513660f4894ef815daf88e3356bffcda9ca27d810ce83b" +checksum = "c8552ab875c1313b97b8d20cb857b9fd63e2d1d6a0a1b53ce9821e575405f27a" dependencies = [ "bytes", "futures", @@ -4649,7 +4795,7 @@ dependencies = [ "matrixmultiply", "nalgebra-macros", "num-complex", - "num-rational 0.4.1", + "num-rational", "num-traits", "rand 0.8.5", "rand_distr", @@ -4711,9 +4857,9 @@ dependencies = [ [[package]] name = "netlink-packet-utils" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25af9cf0dc55498b7bd94a1508af7a78706aa0ab715a73c5169273e03c84845e" +checksum = "0ede8a08c71ad5a95cdd0e4e52facd37190977039a4704eb82a283f713747d34" dependencies = [ "anyhow", "byteorder", @@ -4738,15 +4884,15 @@ dependencies = [ [[package]] name = "netlink-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92b654097027250401127914afb37cb1f311df6610a9891ff07a757e94199027" +checksum = "260e21fbb6f3d253a14df90eb0000a6066780a15dd901a7519ce02d77a94985b" dependencies = [ - "async-io", "bytes", "futures", "libc", "log", + "tokio", ] [[package]] @@ -4756,8 +4902,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ "bitflags", - "cfg-if 1.0.0", + "cfg-if", "libc", + "memoffset 0.6.5", ] [[package]] @@ -4782,7 +4929,6 @@ dependencies = [ "hex-literal", "jsonrpsee", "log", - "pallet-contracts-rpc", "pallet-transaction-payment-rpc", "parity-scale-codec", "polkadot-cli", @@ -4830,12 +4976,6 @@ dependencies = [ "xcm", ] -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - [[package]] name = "nohash-hasher" version = "0.2.0" @@ -4844,19 +4984,34 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[package]] name = "nom" -version = "7.1.1" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", ] +[[package]] +name = "nom8" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" +dependencies = [ + "memchr", +] + +[[package]] +name = "normalize-line-endings" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" + [[package]] name = "num-bigint" -version = "0.2.6" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ "autocfg", "num-integer", @@ -4865,9 +5020,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19" +checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" dependencies = [ "num-traits", ] @@ -4892,18 +5047,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-rational" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" -dependencies = [ - "autocfg", - "num-bigint", - "num-integer", - "num-traits", -] - [[package]] name = "num-rational" version = "0.4.1" @@ -4911,6 +5054,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", + "num-bigint", "num-integer", "num-traits", ] @@ -4922,45 +5066,63 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", - "libm", + "libm 0.2.6", ] [[package]] name = "num_cpus" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi", + "hermit-abi 0.2.6", "libc", ] [[package]] name = "object" -version = "0.28.4" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" +checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" dependencies = [ "crc32fast", - "hashbrown 0.11.2", + "hashbrown", "indexmap", "memchr", ] [[package]] name = "object" -version = "0.29.0" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" dependencies = [ "memchr", ] +[[package]] +name = "oid-registry" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e20717fa0541f39bd146692035c37bedfa532b3e5071b35761082407546b2a" +dependencies = [ + "asn1-rs 0.3.1", +] + +[[package]] +name = "oid-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" +dependencies = [ + "asn1-rs 0.5.1", +] + [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "opaque-debug" @@ -4982,8 +5144,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "orchestra" -version = "0.0.1" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17e7d5b6bb115db09390bed8842c94180893dd83df3dfce7354f2a2aa090a4ee" dependencies = [ "async-trait", "dyn-clonable", @@ -4998,8 +5161,9 @@ dependencies = [ [[package]] name = "orchestra-proc-macro" -version = "0.0.1" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2af4dabb2286b0be0e9711d2d24e25f6217048b71210cffd3daddc3b5c84e1f" dependencies = [ "expander 0.0.6", "itertools", @@ -5026,12 +5190,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" [[package]] -name = "owning_ref" -version = "0.4.1" +name = "p256" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce" +checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ - "stable_deref_trait", + "ecdsa", + "elliptic-curve", + "sha2 0.10.6", +] + +[[package]] +name = "p384" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" +dependencies = [ + "ecdsa", + "elliptic-curve", + "sha2 0.10.6", +] + +[[package]] +name = "packed_simd_2" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" +dependencies = [ + "cfg-if", + "libm 0.1.4", ] [[package]] @@ -5060,7 +5247,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-support", "frame-system", @@ -5076,7 +5263,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-support", "frame-system", @@ -5092,7 +5279,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-support", "frame-system", @@ -5107,7 +5294,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-support", @@ -5131,7 +5318,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5151,7 +5338,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-support", @@ -5166,15 +5353,15 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ - "beefy-primitives", "frame-support", "frame-system", "pallet-session", "parity-scale-codec", "scale-info", "serde", + "sp-beefy", "sp-runtime", "sp-std", ] @@ -5182,13 +5369,12 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ + "array-bytes 4.2.0", "beefy-merkle-tree", - "beefy-primitives", "frame-support", "frame-system", - "hex", "log", "pallet-beefy", "pallet-mmr", @@ -5196,6 +5382,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", + "sp-beefy", "sp-core", "sp-io", "sp-runtime", @@ -5205,7 +5392,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-support", @@ -5223,7 +5410,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-support", @@ -5242,7 +5429,7 @@ dependencies = [ [[package]] name = "pallet-collator-selection" version = "3.0.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.37#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5253,7 +5440,6 @@ dependencies = [ "parity-scale-codec", "rand 0.8.5", "scale-info", - "serde", "sp-runtime", "sp-staking", "sp-std", @@ -5262,7 +5448,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-support", @@ -5279,7 +5465,7 @@ dependencies = [ [[package]] name = "pallet-contracts" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "bitflags", "frame-benchmarking", @@ -5291,38 +5477,36 @@ dependencies = [ "pallet-contracts-proc-macro", "parity-scale-codec", "rand 0.8.5", - "rand_pcg 0.3.1", + "rand_pcg", "scale-info", "serde", "smallvec", + "sp-api", "sp-core", "sp-io", "sp-runtime", - "sp-sandbox", "sp-std", - "wasm-instrument", - "wasmi-validation", + "wasm-instrument 0.4.0", + "wasmi 0.20.0", + "wasmparser-nostd", ] [[package]] name = "pallet-contracts-primitives" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "bitflags", "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-rpc", "sp-runtime", "sp-std", + "sp-weights", ] [[package]] name = "pallet-contracts-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "proc-macro2", "quote", @@ -5330,31 +5514,18 @@ dependencies = [ ] [[package]] -name = "pallet-contracts-rpc" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "jsonrpsee", - "pallet-contracts-primitives", - "pallet-contracts-rpc-runtime-api", - "parity-scale-codec", - "serde", - "sp-api", - "sp-blockchain", - "sp-core", - "sp-rpc", - "sp-runtime", -] - -[[package]] -name = "pallet-contracts-rpc-runtime-api" +name = "pallet-conviction-voting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ - "pallet-contracts-primitives", + "assert_matches", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", - "sp-api", + "serde", + "sp-io", "sp-runtime", "sp-std", ] @@ -5362,14 +5533,16 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", "serde", + "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -5378,15 +5551,16 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-election-provider-support", "frame-support", "frame-system", "log", + "pallet-election-provider-support-benchmarking", "parity-scale-codec", - "rand 0.7.3", + "rand 0.8.5", "scale-info", "sp-arithmetic", "sp-core", @@ -5394,14 +5568,13 @@ dependencies = [ "sp-npos-elections", "sp-runtime", "sp-std", - "static_assertions", "strum", ] [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5414,7 +5587,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-support", @@ -5430,24 +5603,27 @@ dependencies = [ ] [[package]] -name = "pallet-gilt" +name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", + "frame-election-provider-support", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", - "sp-arithmetic", + "sp-io", "sp-runtime", + "sp-staking", "sp-std", ] [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-support", @@ -5489,7 +5665,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5505,7 +5681,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-support", @@ -5525,7 +5701,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-support", @@ -5557,7 +5733,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-support", @@ -5574,9 +5750,8 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ - "ckb-merkle-mountain-range", "frame-benchmarking", "frame-support", "frame-system", @@ -5590,31 +5765,33 @@ dependencies = [ ] [[package]] -name = "pallet-mmr-rpc" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +name = "pallet-multisig" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ - "jsonrpsee", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", "parity-scale-codec", - "serde", - "sp-api", - "sp-blockchain", - "sp-core", - "sp-mmr-primitives", + "scale-info", + "sp-io", "sp-runtime", + "sp-std", ] [[package]] -name = "pallet-multisig" +name = "pallet-nis" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "sp-io", + "sp-arithmetic", + "sp-core", "sp-runtime", "sp-std", ] @@ -5622,7 +5799,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-support", "frame-system", @@ -5639,7 +5816,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5651,6 +5828,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", + "sp-runtime-interface", "sp-staking", "sp-std", ] @@ -5658,7 +5836,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.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "parity-scale-codec", "sp-api", @@ -5668,7 +5846,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-support", "frame-system", @@ -5685,7 +5863,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5708,11 +5886,12 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", "sp-core", @@ -5724,7 +5903,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-support", @@ -5739,7 +5918,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-support", "frame-system", @@ -5750,16 +5929,53 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-ranked-collective" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-referenda" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ + "assert_matches", "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", + "serde", + "sp-arithmetic", "sp-io", "sp-runtime", "sp-std", @@ -5786,7 +6002,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-support", @@ -5797,12 +6013,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", + "sp-weights", ] [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-support", "frame-system", @@ -5823,14 +6040,14 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "pallet-session", "pallet-staking 4.0.0-dev", - "rand 0.7.3", + "rand 0.8.5", "sp-runtime", "sp-session", "sp-std", @@ -5839,7 +6056,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-support", "frame-system", @@ -5878,7 +6095,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5901,7 +6118,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -5912,57 +6129,74 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "log", "sp-arithmetic", ] [[package]] -name = "pallet-sudo" +name = "pallet-state-trie-migration" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", + "sp-core", "sp-io", "sp-runtime", "sp-std", ] [[package]] -name = "pallet-timestamp" +name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ - "frame-benchmarking", "frame-support", "frame-system", - "log", "parity-scale-codec", "scale-info", - "sp-inherents", "sp-io", "sp-runtime", "sp-std", - "sp-timestamp", ] [[package]] -name = "pallet-tips" +name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", - "pallet-treasury", "parity-scale-codec", "scale-info", - "serde", + "sp-inherents", + "sp-io", + "sp-runtime", + "sp-std", + "sp-timestamp", +] + +[[package]] +name = "pallet-tips" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-treasury", + "parity-scale-codec", + "scale-info", + "serde", "sp-core", "sp-io", "sp-runtime", @@ -5972,7 +6206,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-support", "frame-system", @@ -5988,7 +6222,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -5998,23 +6232,25 @@ dependencies = [ "sp-core", "sp-rpc", "sp-runtime", + "sp-weights", ] [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", "sp-api", "sp-runtime", + "sp-weights", ] [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-support", @@ -6031,7 +6267,7 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-support", @@ -6046,7 +6282,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-support", @@ -6062,7 +6298,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-benchmarking", "frame-support", @@ -6074,10 +6310,25 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-whitelist" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-xcm" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "frame-support", "frame-system", @@ -6094,8 +6345,8 @@ dependencies = [ [[package]] name = "pallet-xcm-benchmarks" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "frame-benchmarking", "frame-support", @@ -6112,23 +6363,22 @@ dependencies = [ [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.29#2fa95572487cfcf8dbe6941bf93545c39d47f784" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.37#09418fc04c2608b123f36ca80f16df3d2096753b" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "serde", ] [[package]] name = "parity-db" -version = "0.3.17" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8fdb726a43661fa54b43e7114e6b88b2289cae388eb3ad766d9d1754d83fce" +checksum = "dd684a725651d9588ef21f140a328b6b4f64e646b2e931f3e6f14f75eedf9980" dependencies = [ - "blake2-rfc", + "blake2", "crc32fast", "fs2", "hex", @@ -6143,9 +6393,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.2.1" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "366e44391a8af4cfd6002ef6ba072bae071a96aafca98d7d448a34c5dca38b6a" +checksum = "637935964ff85a605d114591d4d2c13c5d1ba2806dae97cea6bf180238a749ac" dependencies = [ "arrayvec 0.7.2", "bitvec", @@ -6158,9 +6408,9 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.1.3" +version = "3.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9299338969a3d2f491d65f140b00ddec470858402f888af98e8642fb5e8965cd" +checksum = "86b26a931f824dd4eca30b3e43bb4f31cd5f0d3a403c5f5ff27106b805bfde7b" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -6174,47 +6424,11 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" -[[package]] -name = "parity-util-mem" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f" -dependencies = [ - "cfg-if 1.0.0", - "hashbrown 0.12.3", - "impl-trait-for-tuples", - "parity-util-mem-derive", - "parking_lot 0.12.1", - "primitive-types", - "smallvec", - "winapi", -] - -[[package]] -name = "parity-util-mem-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" -dependencies = [ - "proc-macro2", - "syn", - "synstructure", -] - -[[package]] -name = "parity-wasm" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16ad52817c4d343339b3bc2e26861bd21478eda0b7509acf83505727000512ac" -dependencies = [ - "byteorder", -] - [[package]] name = "parity-wasm" -version = "0.42.2" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92" +checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304" [[package]] name = "parking" @@ -6240,7 +6454,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.5", + "parking_lot_core 0.9.7", ] [[package]] @@ -6249,7 +6463,7 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "instant", "libc", "redox_syscall", @@ -6259,39 +6473,39 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.5" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "paste" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1c2c742266c2f1041c914ba65355a83ae8747b05f208319784083583494b4b" +checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" [[package]] name = "pbkdf2" -version = "0.4.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" +checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" dependencies = [ - "crypto-mac 0.8.0", + "crypto-mac 0.11.1", ] [[package]] name = "pbkdf2" -version = "0.8.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "crypto-mac 0.11.1", + "digest 0.10.6", ] [[package]] @@ -6300,6 +6514,24 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" +[[package]] +name = "pem" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +dependencies = [ + "base64 0.13.1", +] + +[[package]] +name = "pem-rfc7468" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" +dependencies = [ + "base64ct", +] + [[package]] name = "percent-encoding" version = "2.2.0" @@ -6308,9 +6540,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.5.1" +version = "2.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc8bed3549e0f9b0a2a78bf7c0018237a2cdf085eecbbc048e52612438e4e9d0" +checksum = "028accff104c4e513bad663bbcd2ad7cfd5304144404c31ed0a77ac103d00660" dependencies = [ "thiserror", "ucd-trie", @@ -6318,9 +6550,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.1" +version = "2.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdc078600d06ff90d4ed238f0119d84ab5d43dbaad278b0e33a8820293b32344" +checksum = "2ac3922aac69a40733080f53c1ce7f91dcf57e1a5f6c52f421fadec7fbdc4b69" dependencies = [ "pest", "pest_generator", @@ -6328,9 +6560,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.1" +version = "2.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a1af60b1c4148bb269006a750cff8e2ea36aff34d2d96cf7be0b14d1bed23c" +checksum = "d06646e185566b5961b4058dd107e0a7f56e77c3f484549fb119867773c0f202" dependencies = [ "pest", "pest_meta", @@ -6341,20 +6573,20 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.5.1" +version = "2.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec8605d59fc2ae0c6c1aefc0c7c7a9769732017c0ce07f7a9cfffa7b4404f20" +checksum = "e6f60b2ba541577e2a0c307c8f39d1439108120eb7903adeb6497fa880c59616" dependencies = [ "once_cell", "pest", - "sha1", + "sha2 0.10.6", ] [[package]] name = "petgraph" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" dependencies = [ "fixedbitset", "indexmap", @@ -6398,6 +6630,16 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs8" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +dependencies = [ + "der", + "spki", +] + [[package]] name = "pkg-config" version = "0.3.26" @@ -6410,16 +6652,22 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" +[[package]] +name = "platforms" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" + [[package]] name = "polkadot-approval-distribution" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "futures", + "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", - "polkadot-node-subsystem-util", "polkadot-primitives", "rand 0.8.5", "tracing-gum", @@ -6427,8 +6675,8 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "futures", "polkadot-node-network-protocol", @@ -6441,13 +6689,13 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "derive_more", "fatality", "futures", - "lru 0.7.8", + "lru", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -6464,12 +6712,12 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "fatality", "futures", - "lru 0.7.8", + "lru", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -6485,8 +6733,8 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "clap", "frame-benchmarking-cli", @@ -6498,12 +6746,13 @@ dependencies = [ "polkadot-performance-test", "polkadot-service", "sc-cli", + "sc-executor", "sc-service", "sc-sysinfo", "sc-tracing", "sp-core", + "sp-io", "sp-keyring", - "sp-trie", "substrate-build-script-utils", "thiserror", "try-runtime-cli", @@ -6511,14 +6760,15 @@ dependencies = [ [[package]] name = "polkadot-client" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "beefy-primitives", + "async-trait", "frame-benchmarking", "frame-benchmarking-cli", "frame-system", "frame-system-rpc-runtime-api", + "futures", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "polkadot-core-primitives", @@ -6532,6 +6782,7 @@ dependencies = [ "sc-service", "sp-api", "sp-authority-discovery", + "sp-beefy", "sp-block-builder", "sp-blockchain", "sp-consensus", @@ -6551,10 +6802,11 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "always-assert", + "bitvec", "fatality", "futures", "futures-timer", @@ -6572,11 +6824,10 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "parity-scale-codec", - "parity-util-mem", "scale-info", "sp-core", "sp-runtime", @@ -6585,13 +6836,15 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "derive_more", "fatality", "futures", - "lru 0.7.8", + "futures-timer", + "indexmap", + "lru", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -6608,8 +6861,8 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -6622,8 +6875,8 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "futures", "futures-timer", @@ -6642,8 +6895,8 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "always-assert", "async-trait", @@ -6652,9 +6905,9 @@ dependencies = [ "futures", "parity-scale-codec", "parking_lot 0.12.1", + "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-subsystem", - "polkadot-node-subsystem-util", "polkadot-overseer", "polkadot-primitives", "sc-network", @@ -6666,8 +6919,8 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "futures", "parity-scale-codec", @@ -6684,15 +6937,15 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "bitvec", "derive_more", "futures", "futures-timer", "kvdb", - "lru 0.7.8", + "lru", "merlin", "parity-scale-codec", "polkadot-node-jaeger", @@ -6713,8 +6966,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "bitvec", "futures", @@ -6733,8 +6986,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "bitvec", "fatality", @@ -6752,8 +7005,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "futures", "polkadot-node-subsystem", @@ -6767,16 +7020,17 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "async-trait", "futures", + "futures-timer", "parity-scale-codec", "polkadot-node-core-pvf", + "polkadot-node-metrics", "polkadot-node-primitives", "polkadot-node-subsystem", - "polkadot-node-subsystem-util", "polkadot-parachain", "polkadot-primitives", "sp-maybe-compressed-blob", @@ -6785,12 +7039,12 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "futures", + "polkadot-node-metrics", "polkadot-node-subsystem", - "polkadot-node-subsystem-util", "polkadot-primitives", "sc-client-api", "sc-consensus-babe", @@ -6800,8 +7054,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "futures", "futures-timer", @@ -6817,13 +7071,13 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "fatality", "futures", "kvdb", - "lru 0.7.8", + "lru", "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -6836,25 +7090,25 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "async-trait", "futures", "futures-timer", "polkadot-node-subsystem", + "polkadot-overseer", "polkadot-primitives", "sp-blockchain", "sp-inherents", - "sp-runtime", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-provisioner" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "bitvec", "fatality", @@ -6871,19 +7125,18 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "always-assert", "assert_matches", - "async-process", - "async-std", + "cpu-time", "futures", "futures-timer", "parity-scale-codec", "pin-project", "polkadot-core-primitives", - "polkadot-node-subsystem-util", + "polkadot-node-metrics", "polkadot-parachain", "rand 0.8.5", "rayon", @@ -6898,13 +7151,14 @@ dependencies = [ "sp-tracing", "sp-wasm-interface", "tempfile", + "tokio", "tracing-gum", ] [[package]] name = "polkadot-node-core-pvf-checker" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "futures", "polkadot-node-primitives", @@ -6919,15 +7173,14 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "futures", - "memory-lru", - "parity-util-mem", + "lru", + "polkadot-node-metrics", "polkadot-node-subsystem", "polkadot-node-subsystem-types", - "polkadot-node-subsystem-util", "polkadot-primitives", "sp-consensus-babe", "tracing-gum", @@ -6935,10 +7188,9 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "async-std", "lazy_static", "log", "mick-jaeger", @@ -6949,12 +7201,13 @@ dependencies = [ "sc-network", "sp-core", "thiserror", + "tokio", ] [[package]] name = "polkadot-node-metrics" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "bs58", "futures", @@ -6972,8 +7225,8 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "async-trait", "derive_more", @@ -6987,6 +7240,7 @@ dependencies = [ "rand 0.8.5", "sc-authority-discovery", "sc-network", + "sc-network-common", "strum", "thiserror", "tracing-gum", @@ -6994,8 +7248,8 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "bounded-vec", "futures", @@ -7016,8 +7270,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -7026,8 +7280,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "async-trait", "derive_more", @@ -7049,19 +7303,19 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "async-trait", "derive_more", "fatality", "futures", + "futures-channel", "itertools", "kvdb", - "lru 0.7.8", + "lru", "parity-db", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.11.2", "pin-project", "polkadot-node-jaeger", @@ -7082,15 +7336,14 @@ dependencies = [ [[package]] name = "polkadot-overseer" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "async-trait", "futures", "futures-timer", - "lru 0.7.8", + "lru", "orchestra", - "parity-util-mem", "parking_lot 0.12.1", "polkadot-node-metrics", "polkadot-node-network-protocol", @@ -7100,18 +7353,18 @@ dependencies = [ "sc-client-api", "sp-api", "sp-core", + "tikv-jemalloc-ctl", "tracing-gum", ] [[package]] name = "polkadot-parachain" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "derive_more", "frame-support", "parity-scale-codec", - "parity-util-mem", "polkadot-core-primitives", "scale-info", "serde", @@ -7122,10 +7375,10 @@ dependencies = [ [[package]] name = "polkadot-performance-test" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "env_logger", + "env_logger 0.9.3", "kusama-runtime", "log", "polkadot-erasure-coding", @@ -7137,14 +7390,12 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "bitvec", - "frame-system", "hex-literal", "parity-scale-codec", - "parity-util-mem", "polkadot-core-primitives", "polkadot-parachain", "scale-info", @@ -7161,19 +7412,17 @@ dependencies = [ "sp-runtime", "sp-staking", "sp-std", - "sp-trie", - "sp-version", ] [[package]] name = "polkadot-rpc" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", "jsonrpsee", - "pallet-mmr-rpc", + "mmr-rpc", "pallet-transaction-payment-rpc", "polkadot-primitives", "sc-chain-spec", @@ -7199,10 +7448,9 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "beefy-primitives", "bitvec", "frame-benchmarking", "frame-election-provider-support", @@ -7226,6 +7474,7 @@ dependencies = [ "pallet-election-provider-multi-phase", "pallet-election-provider-support-benchmarking", "pallet-elections-phragmen", + "pallet-fast-unstake", "pallet-grandpa", "pallet-identity", "pallet-im-online", @@ -7264,6 +7513,7 @@ dependencies = [ "smallvec", "sp-api", "sp-authority-discovery", + "sp-beefy", "sp-block-builder", "sp-consensus-babe", "sp-core", @@ -7287,10 +7537,9 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "beefy-primitives", "bitvec", "frame-benchmarking", "frame-election-provider-support", @@ -7307,6 +7556,7 @@ dependencies = [ "pallet-election-provider-multi-phase", "pallet-session", "pallet-staking 4.0.0-dev", + "pallet-staking-reward-fn", "pallet-timestamp", "pallet-transaction-payment", "pallet-treasury", @@ -7320,6 +7570,7 @@ dependencies = [ "serde_derive", "slot-range-helper", "sp-api", + "sp-beefy", "sp-core", "sp-inherents", "sp-io", @@ -7334,20 +7585,22 @@ dependencies = [ [[package]] name = "polkadot-runtime-constants" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "frame-support", "polkadot-primitives", "polkadot-runtime-common", "smallvec", + "sp-core", "sp-runtime", + "sp-weights", ] [[package]] name = "polkadot-runtime-metrics" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "bs58", "parity-scale-codec", @@ -7358,8 +7611,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "bitflags", "bitvec", @@ -7401,12 +7654,11 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "async-trait", "beefy-gadget", - "beefy-primitives", "frame-support", "frame-system-rpc-runtime-api", "futures", @@ -7414,7 +7666,8 @@ dependencies = [ "kusama-runtime", "kvdb", "kvdb-rocksdb", - "lru 0.7.8", + "lru", + "mmr-gadget", "pallet-babe", "pallet-im-online", "pallet-staking 4.0.0-dev", @@ -7480,6 +7733,7 @@ dependencies = [ "serde_json", "sp-api", "sp-authority-discovery", + "sp-beefy", "sp-block-builder", "sp-blockchain", "sp-consensus", @@ -7489,6 +7743,7 @@ dependencies = [ "sp-inherents", "sp-io", "sp-keystore", + "sp-mmr-primitives", "sp-offchain", "sp-runtime", "sp-session", @@ -7505,8 +7760,8 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "arrayvec 0.5.2", "fatality", @@ -7526,8 +7781,8 @@ dependencies = [ [[package]] name = "polkadot-statement-table" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -7541,7 +7796,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "libc", "log", "wepoll-ffi", @@ -7559,13 +7814,24 @@ dependencies = [ "universal-hash", ] +[[package]] +name = "polyval" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" +dependencies = [ + "cpuid-bool", + "opaque-debug 0.3.0", + "universal-hash", +] + [[package]] name = "polyval" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "opaque-debug 0.3.0", "universal-hash", @@ -7577,11 +7843,51 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "predicates" +version = "2.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" +dependencies = [ + "difflib", + "float-cmp", + "itertools", + "normalize-line-endings", + "predicates-core", + "regex", +] + +[[package]] +name = "predicates-core" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72f883590242d3c6fc5bf50299011695fa6590c2c70eac95ee1bdb9a733ad1a2" + +[[package]] +name = "predicates-tree" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d" +dependencies = [ + "predicates-core", + "termtree", +] + +[[package]] +name = "prettyplease" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78" +dependencies = [ + "proc-macro2", + "syn", +] + [[package]] name = "primitive-types" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a" +checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66" dependencies = [ "fixed-hash", "impl-codec", @@ -7612,7 +7918,8 @@ dependencies = [ [[package]] name = "prioritized-metered-channel" version = "0.2.0" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "382698e48a268c832d0b181ed438374a6bb708a82a8ca273bb0f61c74cf209c4" dependencies = [ "coarsetime", "crossbeam-queue", @@ -7626,13 +7933,12 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34" dependencies = [ "once_cell", - "thiserror", - "toml", + "toml_edit", ] [[package]] @@ -7661,9 +7967,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" dependencies = [ "unicode-ident", ] @@ -7674,7 +7980,7 @@ version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fnv", "lazy_static", "memchr", @@ -7684,21 +7990,21 @@ dependencies = [ [[package]] name = "prometheus-client" -version = "0.16.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1abe0255c04d15f571427a2d1e00099016506cf3297b53853acd2b7eb87825" +checksum = "83cd1b99916654a69008fd66b4f9397fbe08e6e51dfe23d4417acf5d3b8cb87c" dependencies = [ "dtoa", "itoa", - "owning_ref", + "parking_lot 0.12.1", "prometheus-client-derive-text-encode", ] [[package]] name = "prometheus-client-derive-text-encode" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e12d01b9d66ad9eb4529c57666b6263fc1993cb30261d83ead658fdd932652" +checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd" dependencies = [ "proc-macro2", "quote", @@ -7707,9 +8013,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.10.4" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" +checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698" dependencies = [ "bytes", "prost-derive", @@ -7717,31 +8023,31 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.10.4" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab" +checksum = "a3f8ad728fb08fe212df3c05169e940fbb6d9d16a877ddde14644a983ba2012e" dependencies = [ "bytes", - "cfg-if 1.0.0", - "cmake", "heck", "itertools", "lazy_static", "log", "multimap", "petgraph", + "prettyplease", "prost", "prost-types", "regex", + "syn", "tempfile", "which", ] [[package]] name = "prost-codec" -version = "0.1.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00af1e92c33b4813cc79fda3f2dbf56af5169709be0202df730e9ebc3e4cd007" +checksum = "0dc34979ff898b6e141106178981ce2596c387ea6e62533facfc61a37fc879c0" dependencies = [ "asynchronous-codec", "bytes", @@ -7752,9 +8058,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.10.1" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" +checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d" dependencies = [ "anyhow", "itertools", @@ -7765,9 +8071,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.10.1" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68" +checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788" dependencies = [ "bytes", "prost", @@ -7799,11 +8105,29 @@ dependencies = [ "pin-project-lite 0.1.12", ] +[[package]] +name = "quinn-proto" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4ced82a24bb281af338b9e8f94429b6eca01b4e66d899f40031f074e74c9" +dependencies = [ + "bytes", + "rand 0.8.5", + "ring", + "rustc-hash", + "rustls 0.20.8", + "slab", + "thiserror", + "tinyvec", + "tracing", + "webpki 0.22.0", +] + [[package]] name = "quote" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] @@ -7825,7 +8149,6 @@ dependencies = [ "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc", - "rand_pcg 0.2.1", ] [[package]] @@ -7896,15 +8219,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - [[package]] name = "rand_pcg" version = "0.3.1" @@ -7932,9 +8246,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.10.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" +checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -7942,6 +8256,31 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "rcgen" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" +dependencies = [ + "pem", + "ring", + "time 0.3.18", + "x509-parser 0.13.2", + "yasna", +] + +[[package]] +name = "rcgen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" +dependencies = [ + "pem", + "ring", + "time 0.3.18", + "yasna", +] + [[package]] name = "redox_syscall" version = "0.2.16" @@ -7971,24 +8310,24 @@ dependencies = [ "derive_more", "fs-err", "itertools", - "static_init", + "static_init 0.5.2", "thiserror", ] [[package]] name = "ref-cast" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b15debb4f9d60d767cd8ca9ef7abb2452922f3214671ff052defc7f3502c44" +checksum = "8c78fb8c9293bcd48ef6fce7b4ca950ceaf21210de6e105a883ee280c0f7b9ed" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abfa8511e9e94fd3de6585a3d3cd00e01ed556dc9814829280af0e8dc72a8f36" +checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f" dependencies = [ "proc-macro2", "quote", @@ -7997,9 +8336,9 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.2.3" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a8d23b35d7177df3b9d31ed8a9ab4bf625c668be77a319d4f5efd4a5257701c" +checksum = "d43a209257d978ef079f3d446331d0f1794f5e0fc19b306a199983857833a779" dependencies = [ "fxhash", "log", @@ -8009,9 +8348,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "aho-corasick", "memchr", @@ -8033,35 +8372,6 @@ version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" -[[package]] -name = "region" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877e54ea2adcd70d80e9179344c97f93ef0dffd6b03e1f4529e6e83ab2fa9ae0" -dependencies = [ - "bitflags", - "libc", - "mach", - "winapi", -] - -[[package]] -name = "remote-externalities" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "env_logger", - "jsonrpsee", - "log", - "parity-scale-codec", - "serde", - "serde_json", - "sp-core", - "sp-io", - "sp-runtime", - "sp-version", -] - [[package]] name = "remove_dir_all" version = "0.5.3" @@ -8083,12 +8393,12 @@ dependencies = [ [[package]] name = "rfc6979" -version = "0.1.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525" +checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" dependencies = [ "crypto-bigint", - "hmac 0.11.0", + "hmac 0.12.1", "zeroize", ] @@ -8101,7 +8411,7 @@ dependencies = [ "cc", "libc", "once_cell", - "spin", + "spin 0.5.2", "untrusted", "web-sys", "winapi", @@ -8109,9 +8419,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "620f4129485ff1a7128d184bc687470c21c7951b64779ebc9cfdad3dcd920290" +checksum = "7e9562ea1d70c0cc63a34a22d977753b50cca91cc6b6527750463bd5dd8697bc" dependencies = [ "libc", "librocksdb-sys", @@ -8119,17 +8429,17 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "beefy-merkle-tree", - "beefy-primitives", "frame-benchmarking", "frame-executive", "frame-support", "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", + "frame-try-runtime", "hex-literal", "log", "pallet-authority-discovery", @@ -8138,23 +8448,38 @@ dependencies = [ "pallet-balances", "pallet-beefy", "pallet-beefy-mmr", + "pallet-bounties", + "pallet-child-bounties", "pallet-collective", - "pallet-grandpa", + "pallet-democracy", + "pallet-elections-phragmen", + "pallet-grandpa", + "pallet-identity", "pallet-im-online", "pallet-indices", "pallet-membership", "pallet-mmr", "pallet-multisig", + "pallet-nis", "pallet-offences", + "pallet-preimage", "pallet-proxy", + "pallet-recovery", + "pallet-scheduler", "pallet-session", + "pallet-society", "pallet-staking 4.0.0-dev", + "pallet-state-trie-migration", "pallet-sudo", "pallet-timestamp", + "pallet-tips", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", + "pallet-treasury", "pallet-utility", + "pallet-vesting", "pallet-xcm", + "pallet-xcm-benchmarks", "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", @@ -8167,6 +8492,7 @@ dependencies = [ "smallvec", "sp-api", "sp-authority-discovery", + "sp-beefy", "sp-block-builder", "sp-consensus-babe", "sp-core", @@ -8180,6 +8506,7 @@ dependencies = [ "sp-std", "sp-transaction-pool", "sp-version", + "static_assertions", "substrate-wasm-builder", "xcm", "xcm-builder", @@ -8188,14 +8515,16 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "frame-support", "polkadot-primitives", "polkadot-runtime-common", "smallvec", + "sp-core", "sp-runtime", + "sp-weights", ] [[package]] @@ -8209,19 +8538,30 @@ dependencies = [ "winapi", ] +[[package]] +name = "rtcp" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1919efd6d4a6a85d13388f9487549bb8e359f17198cc03ffd72f79b553873691" +dependencies = [ + "bytes", + "thiserror", + "webrtc-util", +] + [[package]] name = "rtnetlink" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0" dependencies = [ - "async-global-executor", "futures", "log", "netlink-packet-route", "netlink-proto", "nix", "thiserror", + "tokio", ] [[package]] @@ -8234,6 +8574,20 @@ dependencies = [ "winapi", ] +[[package]] +name = "rtp" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a095411ff00eed7b12e4c6a118ba984d113e1079582570d56a5ee723f11f80" +dependencies = [ + "async-trait", + "bytes", + "rand 0.8.5", + "serde", + "thiserror", + "webrtc-util", +] + [[package]] name = "runtime-eden" version = "2.0.25" @@ -8266,7 +8620,6 @@ dependencies = [ "pallet-collective", "pallet-contracts", "pallet-contracts-primitives", - "pallet-contracts-rpc-runtime-api", "pallet-grants", "pallet-im-online", "pallet-mandate", @@ -8287,6 +8640,7 @@ dependencies = [ "parachain-info", "parity-scale-codec", "polkadot-parachain", + "polkadot-primitives", "polkadot-runtime-common", "primitives", "safe-mix", @@ -8349,21 +8703,16 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.14", + "semver 1.0.16", ] [[package]] -name = "rustix" -version = "0.33.7" +name = "rusticata-macros" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938a344304321a9da4973b9ff4f9f8db9caf4597dfd9dda6a60b523340a0fff0" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" dependencies = [ - "bitflags", - "errno", - "io-lifetimes 0.5.3", - "libc", - "linux-raw-sys 0.0.42", - "winapi", + "nom", ] [[package]] @@ -8380,16 +8729,43 @@ dependencies = [ "windows-sys 0.42.0", ] +[[package]] +name = "rustix" +version = "0.36.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes 1.0.5", + "libc", + "linux-raw-sys 0.1.4", + "windows-sys 0.45.0", +] + +[[package]] +name = "rustls" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +dependencies = [ + "base64 0.13.1", + "log", + "ring", + "sct 0.6.1", + "webpki 0.21.4", +] + [[package]] name = "rustls" -version = "0.20.7" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log", "ring", - "sct", - "webpki", + "sct 0.7.0", + "webpki 0.22.0", ] [[package]] @@ -8406,18 +8782,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64", + "base64 0.21.0", ] [[package]] name = "rustversion" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" +checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" [[package]] name = "rw-stream-sink" @@ -8432,9 +8808,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" [[package]] name = "safe-mix" @@ -8445,15 +8821,6 @@ dependencies = [ "rustc_version 0.2.3", ] -[[package]] -name = "salsa20" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" -dependencies = [ - "cipher 0.4.3", -] - [[package]] name = "same-file" version = "1.0.6" @@ -8466,7 +8833,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "log", "sp-core", @@ -8477,7 +8844,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "async-trait", "futures", @@ -8488,7 +8855,7 @@ dependencies = [ "parity-scale-codec", "prost", "prost-build", - "rand 0.7.3", + "rand 0.8.5", "sc-client-api", "sc-network-common", "sp-api", @@ -8504,7 +8871,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "futures", "futures-timer", @@ -8527,7 +8894,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8543,11 +8910,9 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ - "impl-trait-for-tuples", "memmap2", - "parity-scale-codec", "sc-chain-spec-derive", "sc-network-common", "sc-telemetry", @@ -8560,7 +8925,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8571,24 +8936,25 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ + "array-bytes 4.2.0", "chrono", "clap", "fdlimit", "futures", - "hex", "libp2p", "log", "names", "parity-scale-codec", - "rand 0.7.3", + "rand 0.8.5", "regex", "rpassword", "sc-client-api", "sc-client-db", "sc-keystore", "sc-network", + "sc-network-common", "sc-service", "sc-telemetry", "sc-tracing", @@ -8610,11 +8976,10 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "fnv", "futures", - "hash-db", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -8631,14 +8996,13 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-storage", - "sp-trie", "substrate-prometheus-endpoint", ] [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "hash-db", "kvdb", @@ -8663,13 +9027,14 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "async-trait", "futures", "futures-timer", "libp2p", "log", + "mockall", "parking_lot 0.12.1", "sc-client-api", "sc-utils", @@ -8687,7 +9052,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "async-trait", "futures", @@ -8716,7 +9081,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "async-trait", "fork-tree", @@ -8724,11 +9089,10 @@ dependencies = [ "log", "merlin", "num-bigint", - "num-rational 0.2.4", + "num-rational", "num-traits", "parity-scale-codec", "parking_lot 0.12.1", - "rand 0.7.3", "sc-client-api", "sc-consensus", "sc-consensus-epochs", @@ -8736,7 +9100,6 @@ dependencies = [ "sc-keystore", "sc-telemetry", "schnorrkel", - "serde", "sp-api", "sp-application-crypto", "sp-block-builder", @@ -8747,10 +9110,8 @@ dependencies = [ "sp-consensus-vrf", "sp-core", "sp-inherents", - "sp-io", "sp-keystore", "sp-runtime", - "sp-version", "substrate-prometheus-endpoint", "thiserror", ] @@ -8758,7 +9119,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "futures", "jsonrpsee", @@ -8780,7 +9141,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8793,7 +9154,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "async-trait", "futures", @@ -8811,17 +9172,14 @@ dependencies = [ "sp-inherents", "sp-runtime", "sp-state-machine", - "sp-timestamp", - "thiserror", ] [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ - "lazy_static", - "lru 0.7.8", + "lru", "parity-scale-codec", "parking_lot 0.12.1", "sc-executor-common", @@ -8829,67 +9187,56 @@ dependencies = [ "sc-executor-wasmtime", "sp-api", "sp-core", - "sp-core-hashing-proc-macro", "sp-externalities", "sp-io", "sp-panic-handler", "sp-runtime-interface", - "sp-tasks", "sp-trie", "sp-version", "sp-wasm-interface", "tracing", - "wasmi", + "wasmi 0.13.2", ] [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ - "environmental", - "parity-scale-codec", "sc-allocator", "sp-maybe-compressed-blob", - "sp-sandbox", "sp-wasm-interface", "thiserror", - "wasm-instrument", - "wasmi", + "wasm-instrument 0.3.0", + "wasmi 0.13.2", ] [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "log", - "parity-scale-codec", "sc-allocator", "sc-executor-common", "sp-runtime-interface", - "sp-sandbox", "sp-wasm-interface", - "wasmi", + "wasmi 0.13.2", ] [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "log", "once_cell", - "parity-scale-codec", - "parity-wasm 0.42.2", - "rustix 0.33.7", "rustix 0.35.13", "sc-allocator", "sc-executor-common", "sp-runtime-interface", - "sp-sandbox", "sp-wasm-interface", "wasmtime", ] @@ -8897,16 +9244,16 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "ahash", + "array-bytes 4.2.0", "async-trait", "dyn-clone", "finality-grandpa", "fork-tree", "futures", "futures-timer", - "hex", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -8915,7 +9262,6 @@ dependencies = [ "sc-chain-spec", "sc-client-api", "sc-consensus", - "sc-keystore", "sc-network", "sc-network-common", "sc-network-gossip", @@ -8938,7 +9284,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "finality-grandpa", "futures", @@ -8949,7 +9295,6 @@ dependencies = [ "sc-finality-grandpa", "sc-rpc", "serde", - "serde_json", "sp-blockchain", "sp-core", "sp-runtime", @@ -8959,16 +9304,14 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "ansi_term", "futures", "futures-timer", "log", - "parity-util-mem", "sc-client-api", "sc-network-common", - "sc-transaction-pool-api", "sp-blockchain", "sp-runtime", ] @@ -8976,10 +9319,10 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ + "array-bytes 4.2.0", "async-trait", - "hex", "parking_lot 0.12.1", "serde_json", "sp-application-crypto", @@ -8991,31 +9334,25 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ + "array-bytes 4.2.0", "async-trait", "asynchronous-codec", - "bitflags", + "backtrace", "bytes", - "cid", "either", "fnv", - "fork-tree", "futures", "futures-timer", - "hex", "ip_network", "libp2p", - "linked-hash-map", - "linked_hash_set", "log", - "lru 0.7.8", + "lru", "parity-scale-codec", "parking_lot 0.12.1", "pin-project", - "prost", - "prost-build", - "rand 0.7.3", + "rand 0.8.5", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -9033,20 +9370,40 @@ dependencies = [ "substrate-prometheus-endpoint", "thiserror", "unsigned-varint", - "void", "zeroize", ] +[[package]] +name = "sc-network-bitswap" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" +dependencies = [ + "cid", + "futures", + "libp2p", + "log", + "prost", + "prost-build", + "sc-client-api", + "sc-network-common", + "sp-blockchain", + "sp-runtime", + "thiserror", + "unsigned-varint", +] + [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "async-trait", "bitflags", "bytes", "futures", + "futures-timer", "libp2p", + "linked_hash_set", "parity-scale-codec", "prost-build", "sc-consensus", @@ -9057,20 +9414,21 @@ dependencies = [ "sp-consensus", "sp-finality-grandpa", "sp-runtime", + "substrate-prometheus-endpoint", "thiserror", ] [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "ahash", "futures", "futures-timer", "libp2p", "log", - "lru 0.7.8", + "lru", "sc-network-common", "sc-peerset", "sp-runtime", @@ -9081,10 +9439,10 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ + "array-bytes 4.2.0", "futures", - "hex", "libp2p", "log", "parity-scale-codec", @@ -9102,14 +9460,16 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ + "array-bytes 4.2.0", + "async-trait", "fork-tree", "futures", - "hex", "libp2p", "log", - "lru 0.7.8", + "lru", + "mockall", "parity-scale-codec", "prost", "prost-build", @@ -9117,6 +9477,7 @@ dependencies = [ "sc-consensus", "sc-network-common", "sc-peerset", + "sc-utils", "smallvec", "sp-arithmetic", "sp-blockchain", @@ -9124,19 +9485,39 @@ dependencies = [ "sp-core", "sp-finality-grandpa", "sp-runtime", + "substrate-prometheus-endpoint", "thiserror", ] +[[package]] +name = "sc-network-transactions" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" +dependencies = [ + "array-bytes 4.2.0", + "futures", + "libp2p", + "log", + "parity-scale-codec", + "pin-project", + "sc-network-common", + "sc-peerset", + "sc-utils", + "sp-consensus", + "sp-runtime", + "substrate-prometheus-endpoint", +] + [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ + "array-bytes 4.2.0", "bytes", "fnv", "futures", "futures-timer", - "hex", "hyper", "hyper-rustls", "libp2p", @@ -9144,7 +9525,7 @@ dependencies = [ "once_cell", "parity-scale-codec", "parking_lot 0.12.1", - "rand 0.7.3", + "rand 0.8.5", "sc-client-api", "sc-network-common", "sc-peerset", @@ -9160,7 +9541,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "futures", "libp2p", @@ -9173,7 +9554,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9182,10 +9563,9 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "futures", - "hash-db", "jsonrpsee", "log", "parity-scale-codec", @@ -9212,13 +9592,10 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ - "futures", "jsonrpsee", - "log", "parity-scale-codec", - "parking_lot 0.12.1", "sc-chain-spec", "sc-transaction-pool-api", "scale-info", @@ -9227,7 +9604,6 @@ dependencies = [ "sp-core", "sp-rpc", "sp-runtime", - "sp-tracing", "sp-version", "thiserror", ] @@ -9235,34 +9611,60 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ - "futures", + "http", "jsonrpsee", "log", "serde_json", "substrate-prometheus-endpoint", "tokio", + "tower", + "tower-http", +] + +[[package]] +name = "sc-rpc-spec-v2" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" +dependencies = [ + "array-bytes 4.2.0", + "futures", + "futures-util", + "hex", + "jsonrpsee", + "log", + "parity-scale-codec", + "parking_lot 0.12.1", + "sc-chain-spec", + "sc-client-api", + "sc-transaction-pool-api", + "serde", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-runtime", + "sp-version", + "thiserror", + "tokio-stream", ] [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "async-trait", "directories", "exit-future", "futures", "futures-timer", - "hash-db", "jsonrpsee", "log", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.12.1", "pin-project", - "rand 0.7.3", + "rand 0.8.5", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -9272,12 +9674,15 @@ dependencies = [ "sc-informant", "sc-keystore", "sc-network", + "sc-network-bitswap", "sc-network-common", "sc-network-light", "sc-network-sync", + "sc-network-transactions", "sc-offchain", "sc-rpc", "sc-rpc-server", + "sc-rpc-spec-v2", "sc-sysinfo", "sc-telemetry", "sc-tracing", @@ -9287,23 +9692,20 @@ dependencies = [ "serde", "serde_json", "sp-api", - "sp-application-crypto", - "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-core", "sp-externalities", - "sp-inherents", "sp-keystore", "sp-runtime", "sp-session", "sp-state-machine", "sp-storage", - "sp-tracing", "sp-transaction-pool", "sp-transaction-storage-proof", "sp-trie", "sp-version", + "static_init 1.0.3", "substrate-prometheus-endpoint", "tempfile", "thiserror", @@ -9315,21 +9717,18 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "log", "parity-scale-codec", - "parity-util-mem", - "parity-util-mem-derive", "parking_lot 0.12.1", - "sc-client-api", "sp-core", ] [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -9348,13 +9747,13 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "futures", "libc", "log", - "rand 0.7.3", - "rand_pcg 0.2.1", + "rand 0.8.5", + "rand_pcg", "regex", "sc-telemetry", "serde", @@ -9367,7 +9766,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "chrono", "futures", @@ -9375,7 +9774,8 @@ dependencies = [ "log", "parking_lot 0.12.1", "pin-project", - "rand 0.7.3", + "rand 0.8.5", + "sc-utils", "serde", "serde_json", "thiserror", @@ -9385,7 +9785,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "ansi_term", "atty", @@ -9416,7 +9816,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9427,14 +9827,14 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ + "async-trait", "futures", "futures-timer", "linked-hash-map", "log", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.12.1", "sc-client-api", "sc-transaction-pool-api", @@ -9453,8 +9853,9 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ + "async-trait", "futures", "log", "serde", @@ -9466,8 +9867,9 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ + "backtrace", "futures", "futures-timer", "lazy_static", @@ -9483,7 +9885,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "001cf62ece89779fd16105b5f515ad0e5cedcd5440d3dd806bb067978e7c3608" dependencies = [ "bitvec", - "cfg-if 1.0.0", + "cfg-if", "derive_more", "parity-scale-codec", "scale-info-derive", @@ -9504,12 +9906,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "lazy_static", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] @@ -9538,9 +9939,19 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.2" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" + +[[package]] +name = "sct" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +dependencies = [ + "ring", + "untrusted", +] [[package]] name = "sct" @@ -9552,23 +9963,37 @@ dependencies = [ "untrusted", ] +[[package]] +name = "sdp" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d22a5ef407871893fd72b4562ee15e4742269b173959db4b8df6f538c414e13" +dependencies = [ + "rand 0.8.5", + "substring", + "thiserror", + "url", +] + [[package]] name = "sec1" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" +checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ + "base16ct", "der", "generic-array 0.14.6", + "pkcs8", "subtle", "zeroize", ] [[package]] name = "secp256k1" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9512ffd81e3a3503ed401f79c33168b9148c75038956039166cd750eaa037c3" +checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" dependencies = [ "secp256k1-sys", ] @@ -9593,9 +10018,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.7.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ "bitflags", "core-foundation", @@ -9606,9 +10031,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.6.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" dependencies = [ "core-foundation-sys", "libc", @@ -9634,9 +10059,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" dependencies = [ "serde", ] @@ -9649,18 +10074,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.150" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.150" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", @@ -9669,24 +10094,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.89" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" +checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" dependencies = [ "itoa", "ryu", "serde", ] -[[package]] -name = "serde_nanos" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e44969a61f5d316be20a42ff97816efb3b407a924d06824c3d8a49fa8450de0e" -dependencies = [ - "serde", -] - [[package]] name = "sha-1" version = "0.9.8" @@ -9694,23 +10110,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ "block-buffer 0.9.0", - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", ] -[[package]] -name = "sha1" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.10.6", -] - [[package]] name = "sha2" version = "0.8.2" @@ -9730,7 +10135,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", @@ -9742,7 +10147,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.10.6", ] @@ -9772,32 +10177,22 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" -[[package]] -name = "signal-hook" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" -dependencies = [ - "libc", - "signal-hook-registry", -] - [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] [[package]] name = "signature" -version = "1.4.0" +version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ - "digest 0.9.0", + "digest 0.10.6", "rand_core 0.6.4", ] @@ -9830,8 +10225,8 @@ checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" [[package]] name = "slot-range-helper" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "enumn", "parity-scale-codec", @@ -9863,14 +10258,14 @@ checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" [[package]] name = "snow" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d" +checksum = "12ba5f4d4ff12bdb6a169ed51b7c48c0e0ac4b0b4b31012b2571e97d78d3201d" dependencies = [ - "aes-gcm", + "aes-gcm 0.9.4", "blake2", "chacha20poly1305", - "curve25519-dalek 4.0.0-pre.1", + "curve25519-dalek 4.0.0-rc.0", "rand_core 0.6.4", "ring", "rustc_version 0.4.0", @@ -9894,10 +10289,11 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "flate2", "futures", + "http", "httparse", "log", "rand 0.8.5", @@ -9907,7 +10303,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "hash-db", "log", @@ -9925,7 +10321,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "blake2", "proc-macro-crate", @@ -9936,8 +10332,8 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "parity-scale-codec", "scale-info", @@ -9949,15 +10345,14 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-debug-derive", "sp-std", "static_assertions", ] @@ -9965,7 +10360,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "parity-scale-codec", "scale-info", @@ -9978,7 +10373,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "async-trait", "parity-scale-codec", @@ -9987,10 +10382,27 @@ dependencies = [ "sp-std", ] +[[package]] +name = "sp-beefy" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-io", + "sp-mmr-primitives", + "sp-runtime", + "sp-std", +] + [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "parity-scale-codec", "sp-api", @@ -10002,11 +10414,11 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "futures", "log", - "lru 0.7.8", + "lru", "parity-scale-codec", "parking_lot 0.12.1", "sp-api", @@ -10020,11 +10432,10 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "async-trait", "futures", - "futures-timer", "log", "parity-scale-codec", "sp-core", @@ -10039,7 +10450,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "async-trait", "parity-scale-codec", @@ -10057,7 +10468,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "async-trait", "merlin", @@ -10080,13 +10491,11 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-runtime", "sp-std", "sp-timestamp", ] @@ -10094,7 +10503,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "parity-scale-codec", "scale-info", @@ -10106,30 +10515,27 @@ dependencies = [ [[package]] name = "sp-core" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ + "array-bytes 4.2.0", "base58", "bitflags", - "blake2-rfc", - "byteorder", + "blake2", "dyn-clonable", "ed25519-zebra", "futures", "hash-db", "hash256-std-hasher", - "hex", "impl-serde", "lazy_static", "libsecp256k1", "log", "merlin", - "num-traits", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.12.1", "primitive-types", - "rand 0.7.3", + "rand 0.8.5", "regex", "scale-info", "schnorrkel", @@ -10146,14 +10552,13 @@ dependencies = [ "substrate-bip39", "thiserror", "tiny-bip39", - "wasmi", "zeroize", ] [[package]] name = "sp-core-hashing" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "blake2", "byteorder", @@ -10167,7 +10572,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "proc-macro2", "quote", @@ -10178,7 +10583,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -10186,8 +10591,8 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "proc-macro2", "quote", @@ -10196,8 +10601,8 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "0.13.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "environmental", "parity-scale-codec", @@ -10208,7 +10613,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "finality-grandpa", "log", @@ -10226,7 +10631,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10239,16 +10644,16 @@ dependencies = [ [[package]] name = "sp-io" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "bytes", + "ed25519", + "ed25519-dalek", "futures", - "hash-db", "libsecp256k1", "log", "parity-scale-codec", - "parking_lot 0.12.1", "secp256k1", "sp-core", "sp-externalities", @@ -10258,15 +10663,14 @@ dependencies = [ "sp-std", "sp-tracing", "sp-trie", - "sp-wasm-interface", "tracing", "tracing-core", ] [[package]] name = "sp-keyring" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "lazy_static", "sp-core", @@ -10276,8 +10680,8 @@ dependencies = [ [[package]] name = "sp-keystore" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "0.13.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "async-trait", "futures", @@ -10294,7 +10698,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "thiserror", "zstd", @@ -10303,22 +10707,25 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ + "ckb-merkle-mountain-range", "log", "parity-scale-codec", + "scale-info", "serde", "sp-api", "sp-core", "sp-debug-derive", "sp-runtime", "sp-std", + "thiserror", ] [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "parity-scale-codec", "scale-info", @@ -10332,7 +10739,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "sp-api", "sp-core", @@ -10341,8 +10748,8 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "backtrace", "lazy_static", @@ -10352,7 +10759,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "rustc-hash", "serde", @@ -10361,17 +10768,16 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "either", "hash256-std-hasher", "impl-trait-for-tuples", "log", "parity-scale-codec", - "parity-util-mem", "paste", - "rand 0.7.3", + "rand 0.8.5", "scale-info", "serde", "sp-application-crypto", @@ -10379,12 +10785,13 @@ dependencies = [ "sp-core", "sp-io", "sp-std", + "sp-weights", ] [[package]] name = "sp-runtime-interface" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -10401,8 +10808,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "Inflector", "proc-macro-crate", @@ -10411,24 +10818,10 @@ dependencies = [ "syn", ] -[[package]] -name = "sp-sandbox" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "log", - "parity-scale-codec", - "sp-core", - "sp-io", - "sp-std", - "sp-wasm-interface", - "wasmi", -] - [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "parity-scale-codec", "scale-info", @@ -10442,25 +10835,25 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "parity-scale-codec", "scale-info", + "sp-core", "sp-runtime", "sp-std", ] [[package]] name = "sp-state-machine" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "0.13.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "hash-db", "log", - "num-traits", "parity-scale-codec", "parking_lot 0.12.1", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "sp-core", "sp-externalities", @@ -10469,18 +10862,17 @@ dependencies = [ "sp-trie", "thiserror", "tracing", - "trie-root", ] [[package]] name = "sp-std" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" [[package]] name = "sp-storage" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10490,29 +10882,15 @@ dependencies = [ "sp-std", ] -[[package]] -name = "sp-tasks" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "log", - "sp-core", - "sp-externalities", - "sp-io", - "sp-runtime-interface", - "sp-std", -] - [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "async-trait", "futures-timer", "log", "parity-scale-codec", - "sp-api", "sp-inherents", "sp-runtime", "sp-std", @@ -10521,8 +10899,8 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "parity-scale-codec", "sp-std", @@ -10534,7 +10912,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "sp-api", "sp-runtime", @@ -10543,7 +10921,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "async-trait", "log", @@ -10558,14 +10936,14 @@ dependencies = [ [[package]] name = "sp-trie" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "ahash", "hash-db", - "hashbrown 0.12.3", + "hashbrown", "lazy_static", - "lru 0.7.8", + "lru", "memory-db", "nohash-hasher", "parity-scale-codec", @@ -10582,11 +10960,11 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "impl-serde", "parity-scale-codec", - "parity-wasm 0.42.2", + "parity-wasm", "scale-info", "serde", "sp-core-hashing-proc-macro", @@ -10599,7 +10977,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -10609,28 +10987,59 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", "sp-std", - "wasmi", + "wasmi 0.13.2", "wasmtime", ] +[[package]] +name = "sp-weights" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "smallvec", + "sp-arithmetic", + "sp-core", + "sp-debug-derive", + "sp-std", +] + [[package]] name = "spin" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spin" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dccf47db1b41fa1573ed27ccf5e08e3ca771cb994f776668c5ebda893b248fc" + +[[package]] +name = "spki" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +dependencies = [ + "base64ct", + "der", +] + [[package]] name = "ss58-registry" -version = "1.36.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d92659e7d18d82b803824a9ba5a6022cff101c3491d027c1c1d8d30e749284" +checksum = "e40c020d72bc0a9c5660bb71e4a6fdef081493583062c474740a7d59f55f0e7b" dependencies = [ "Inflector", "num-format", @@ -10662,7 +11071,22 @@ dependencies = [ "cfg_aliases", "libc", "parking_lot 0.11.2", - "static_init_macro", + "static_init_macro 0.5.0", +] + +[[package]] +name = "static_init" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a2a1c578e98c1c16fc3b8ec1328f7659a500737d7a0c6d625e73e830ff9c1f6" +dependencies = [ + "bitflags", + "cfg_aliases", + "libc", + "parking_lot 0.11.2", + "parking_lot_core 0.8.6", + "static_init_macro 1.0.2", + "winapi", ] [[package]] @@ -10678,6 +11102,19 @@ dependencies = [ "syn", ] +[[package]] +name = "static_init_macro" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70a2595fc3aa78f2d0e45dd425b22282dd863273761cc77780914b2cf3003acf" +dependencies = [ + "cfg_aliases", + "memchr", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "statrs" version = "0.15.0" @@ -10719,6 +11156,25 @@ dependencies = [ "syn", ] +[[package]] +name = "stun" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7e94b1ec00bad60e6410e058b52f1c66de3dc5fe4d62d09b3e52bb7d3b73e25" +dependencies = [ + "base64 0.13.1", + "crc", + "lazy_static", + "md-5", + "rand 0.8.5", + "ring", + "subtle", + "thiserror", + "tokio", + "url", + "webrtc-util", +] + [[package]] name = "substrate-bip39" version = "0.4.4" @@ -10735,25 +11191,23 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ - "platforms", + "platforms 2.0.0", ] [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "frame-system-rpc-runtime-api", "futures", "jsonrpsee", "log", "parity-scale-codec", - "sc-client-api", "sc-rpc-api", "sc-transaction-pool-api", - "serde_json", "sp-api", "sp-block-builder", "sp-blockchain", @@ -10764,9 +11218,8 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ - "futures-util", "hyper", "log", "prometheus", @@ -10774,10 +11227,23 @@ dependencies = [ "tokio", ] +[[package]] +name = "substrate-rpc-client" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" +dependencies = [ + "async-trait", + "jsonrpsee", + "log", + "sc-rpc-api", + "serde", + "sp-runtime", +] + [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "jsonrpsee", "log", @@ -10787,10 +11253,8 @@ dependencies = [ "scale-info", "serde", "sp-core", - "sp-io", "sp-runtime", "sp-state-machine", - "sp-std", "sp-trie", "trie-db", ] @@ -10798,7 +11262,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "futures", "substrate-test-utils-derive", @@ -10808,7 +11272,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -10819,7 +11283,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "ansi_term", "build-helper", @@ -10830,7 +11294,16 @@ dependencies = [ "tempfile", "toml", "walkdir", - "wasm-gc-api", + "wasm-opt", +] + +[[package]] +name = "substring" +version = "1.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ee6433ecef213b2e72f587ef64a2f5943e7cd16fbd82dbe8bc07486c534c86" +dependencies = [ + "autocfg", ] [[package]] @@ -10845,9 +11318,9 @@ version = "2.0.25" [[package]] name = "syn" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", @@ -10895,9 +11368,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d" +checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5" [[package]] name = "tempfile" @@ -10905,7 +11378,7 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fastrand", "libc", "redox_syscall", @@ -10915,33 +11388,33 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] [[package]] -name = "textwrap" -version = "0.16.0" +name = "termtree" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", @@ -10956,10 +11429,11 @@ checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ + "cfg-if", "once_cell", ] @@ -10985,14 +11459,24 @@ dependencies = [ "threadpool", ] +[[package]] +name = "tikv-jemalloc-ctl" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e37706572f4b151dff7a0146e040804e9c26fe3a3118591112f05cf12a4216c1" +dependencies = [ + "libc", + "paste", + "tikv-jemalloc-sys", +] + [[package]] name = "tikv-jemalloc-sys" -version = "0.4.3+5.2.1-patched.2" +version = "0.5.3+5.3.0-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1792ccb507d955b46af42c123ea8863668fae24d03721e40cad6a41773dbb49" +checksum = "a678df20055b43e57ef8cddde41cdfda9a3c1a060b67f4c5836dfb1d78543ba8" dependencies = [ "cc", - "fs_extra", "libc", ] @@ -11007,25 +11491,62 @@ dependencies = [ "winapi", ] +[[package]] +name = "time" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af0097eaf301d576d0b2aead7a59facab6d53cc636340f0291fab8446a2e8613" +dependencies = [ + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "time-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +dependencies = [ + "time-core", +] + [[package]] name = "tiny-bip39" -version = "0.8.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d" +checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861" dependencies = [ "anyhow", - "hmac 0.8.1", + "hmac 0.12.1", "once_cell", - "pbkdf2 0.4.0", - "rand 0.7.3", + "pbkdf2 0.11.0", + "rand 0.8.5", "rustc-hash", - "sha2 0.9.9", + "sha2 0.10.6", "thiserror", "unicode-normalization", "wasm-bindgen", "zeroize", ] +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -11037,15 +11558,15 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.23.0" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46" +checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" dependencies = [ "autocfg", "bytes", @@ -11078,9 +11599,9 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls", + "rustls 0.20.8", "tokio", - "webpki", + "webpki 0.22.0", ] [[package]] @@ -11092,13 +11613,14 @@ dependencies = [ "futures-core", "pin-project-lite 0.2.9", "tokio", + "tokio-util", ] [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" dependencies = [ "bytes", "futures-core", @@ -11111,55 +11633,108 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] [[package]] -name = "tower-service" -version = "0.3.2" +name = "toml_datetime" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" [[package]] -name = "tracing" -version = "0.1.37" +name = "toml_edit" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" dependencies = [ - "cfg-if 1.0.0", - "pin-project-lite 0.2.9", - "tracing-attributes", - "tracing-core", + "indexmap", + "nom8", + "toml_datetime", ] [[package]] -name = "tracing-attributes" -version = "0.1.23" +name = "tower" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ - "proc-macro2", - "quote", - "syn", + "tower-layer", + "tower-service", + "tracing", ] [[package]] -name = "tracing-core" -version = "0.1.30" +name = "tower-http" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-futures" -version = "0.2.5" + "bitflags", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite 0.2.9", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "log", + "pin-project-lite 0.2.9", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-futures" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ @@ -11169,8 +11744,8 @@ dependencies = [ [[package]] name = "tracing-gum" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "polkadot-node-jaeger", "polkadot-primitives", @@ -11180,8 +11755,8 @@ dependencies = [ [[package]] name = "tracing-gum-proc-macro" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "expander 0.0.6", "proc-macro-crate", @@ -11241,7 +11816,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "004e1e8f92535694b4cb1444dc5a8073ecf0815e3357f729638b9f8fc4062908" dependencies = [ "hash-db", - "hashbrown 0.12.3", + "hashbrown", "log", "rustc-hex", "smallvec", @@ -11258,12 +11833,12 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" +checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" dependencies = [ "async-trait", - "cfg-if 1.0.0", + "cfg-if", "data-encoding", "enum-as-inner", "futures-channel", @@ -11272,70 +11847,97 @@ dependencies = [ "idna 0.2.3", "ipnet", "lazy_static", - "log", "rand 0.8.5", "smallvec", + "socket2", "thiserror", "tinyvec", + "tokio", + "tracing", "url", ] [[package]] name = "trust-dns-resolver" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558" +checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "futures-util", "ipconfig", "lazy_static", - "log", "lru-cache", "parking_lot 0.12.1", "resolv-conf", "smallvec", "thiserror", + "tokio", + "tracing", "trust-dns-proto", ] [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.37#f38bd6671d460293c93062cc1e4fe9e9e490cb29" dependencies = [ "clap", + "frame-remote-externalities", "frame-try-runtime", - "jsonrpsee", + "hex", "log", "parity-scale-codec", - "remote-externalities", - "sc-chain-spec", "sc-cli", "sc-executor", "sc-service", "serde", + "serde_json", + "sp-api", "sp-core", + "sp-debug-derive", "sp-externalities", "sp-io", "sp-keystore", + "sp-rpc", "sp-runtime", "sp-state-machine", "sp-version", + "sp-weights", + "substrate-rpc-client", "zstd", ] [[package]] name = "tt-call" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e66dcbec4290c69dd03c57e76c2469ea5c7ce109c6dd4351c13055cf71ea055" +checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df" + +[[package]] +name = "turn" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4712ee30d123ec7ae26d1e1b218395a16c87cdbaf4b3925d170d684af62ea5e8" +dependencies = [ + "async-trait", + "base64 0.13.1", + "futures", + "log", + "md-5", + "rand 0.8.5", + "ring", + "stun", + "thiserror", + "tokio", + "webrtc-util", +] [[package]] name = "twox-hash" @@ -11343,7 +11945,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "digest 0.10.6", "rand 0.8.5", "static_assertions", @@ -11373,26 +11975,17 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "unicode-normalization" @@ -11455,20 +12048,19 @@ dependencies = [ ] [[package]] -name = "valuable" -version = "0.1.0" +name = "uuid" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +dependencies = [ + "getrandom 0.2.8", +] [[package]] -name = "value-bag" -version = "1.0.0-alpha.9" +name = "valuable" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" -dependencies = [ - "ctor", - "version_check", -] +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "vcpkg" @@ -11488,6 +12080,15 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +[[package]] +name = "waitgroup" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1f50000a783467e6c0200f9d10642f4bc424e39efc1b770203e88b488f79292" +dependencies = [ + "atomic-waker", +] + [[package]] name = "waker-fn" version = "1.1.0" @@ -11535,19 +12136,19 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", @@ -11560,11 +12161,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -11572,9 +12173,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -11582,9 +12183,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", @@ -11595,28 +12196,67 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] -name = "wasm-gc-api" -version = "0.1.11" +name = "wasm-instrument" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c32691b6c7e6c14e7f8fd55361a9088b507aa49620fcd06c09b3a1082186b9" +checksum = "aa1dafb3e60065305741e83db35c6c2584bb3725b692b5b66148a38d72ace6cd" dependencies = [ - "log", - "parity-wasm 0.32.0", - "rustc-demangle", + "parity-wasm", ] [[package]] name = "wasm-instrument" -version = "0.1.1" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a47ecb37b9734d1085eaa5ae1a81e60801fd8c28d4cabdd8aedb982021918bc" +dependencies = [ + "parity-wasm", +] + +[[package]] +name = "wasm-opt" +version = "0.110.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b68e8037b4daf711393f4be2056246d12d975651b14d581520ad5d1f19219cec" +dependencies = [ + "anyhow", + "libc", + "strum", + "strum_macros", + "tempfile", + "thiserror", + "wasm-opt-cxx-sys", + "wasm-opt-sys", +] + +[[package]] +name = "wasm-opt-cxx-sys" +version = "0.110.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "962e5b0401bbb6c887f54e69b8c496ea36f704df65db73e81fd5ff8dc3e63a9f" +checksum = "91adbad477e97bba3fbd21dd7bfb594e7ad5ceb9169ab1c93ab9cb0ada636b6f" dependencies = [ - "parity-wasm 0.42.2", + "anyhow", + "cxx", + "cxx-build", + "wasm-opt-sys", +] + +[[package]] +name = "wasm-opt-sys" +version = "0.110.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec4fa5a322a4e6ac22fd141f498d56afbdbf9df5debeac32380d2dcaa3e06941" +dependencies = [ + "anyhow", + "cc", + "cxx", + "cxx-build", + "regex", ] [[package]] @@ -11636,58 +12276,101 @@ dependencies = [ [[package]] name = "wasmi" -version = "0.9.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca00c5147c319a8ec91ec1a0edbec31e566ce2c9cc93b3f9bb86a9efd0eb795d" +checksum = "06c326c93fbf86419608361a2c925a31754cf109da1b8b55737070b4d6669422" +dependencies = [ + "parity-wasm", + "wasmi-validation", + "wasmi_core 0.2.1", +] + +[[package]] +name = "wasmi" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01bf50edb2ea9d922aa75a7bf3c15e26a6c9e2d18c56e862b49737a582901729" +dependencies = [ + "spin 0.9.5", + "wasmi_arena", + "wasmi_core 0.5.0", + "wasmparser-nostd", +] + +[[package]] +name = "wasmi-validation" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b" +dependencies = [ + "parity-wasm", +] + +[[package]] +name = "wasmi_arena" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ea379cbb0b41f3a9f0bf7b47036d036aae7f43383d8cc487d4deccf40dee0a" + +[[package]] +name = "wasmi_core" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7" dependencies = [ "downcast-rs", - "libc", - "libm", + "libm 0.2.6", "memory_units", - "num-rational 0.2.4", + "num-rational", "num-traits", - "parity-wasm 0.42.2", - "wasmi-validation", ] [[package]] -name = "wasmi-validation" -version = "0.4.1" +name = "wasmi_core" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "165343ecd6c018fc09ebcae280752702c9a2ef3e6f8d02f1cfcbdb53ef6d7937" +checksum = "c5bf998ab792be85e20e771fe14182b4295571ad1d4f89d3da521c1bef5f597a" dependencies = [ - "parity-wasm 0.42.2", + "downcast-rs", + "libm 0.2.6", + "num-traits", ] [[package]] name = "wasmparser" -version = "0.85.0" +version = "0.89.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "570460c58b21e9150d2df0eaaedbb7816c34bcec009ae0dcc976e40ba81463e7" +checksum = "ab5d3e08b13876f96dd55608d03cd4883a0545884932d5adf11925876c96daef" dependencies = [ "indexmap", ] +[[package]] +name = "wasmparser-nostd" +version = "0.91.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c37f310b5a62bfd5ae7c0f1d8e6f98af16a5d6d84ba764e9c36439ec14e318b" +dependencies = [ + "indexmap-nostd", +] + [[package]] name = "wasmtime" -version = "0.38.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f50eadf868ab6a04b7b511460233377d0bfbb92e417b2f6a98b98fef2e098f5" +checksum = "4ad5af6ba38311282f2a21670d96e78266e8c8e2f38cbcd52c254df6ccbc7731" dependencies = [ "anyhow", - "backtrace", "bincode", - "cfg-if 1.0.0", + "cfg-if", "indexmap", - "lazy_static", "libc", "log", - "object 0.28.4", + "object 0.29.0", "once_cell", "paste", "psm", "rayon", - "region", "serde", "target-lexicon", "wasmparser", @@ -11696,34 +12379,43 @@ dependencies = [ "wasmtime-environ", "wasmtime-jit", "wasmtime-runtime", - "winapi", + "windows-sys 0.36.1", +] + +[[package]] +name = "wasmtime-asm-macros" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45de63ddfc8b9223d1adc8f7b2ee5f35d1f6d112833934ad7ea66e4f4339e597" +dependencies = [ + "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "0.38.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1df23c642e1376892f3b72f311596976979cbf8b85469680cdd3a8a063d12a2" +checksum = "bcd849399d17d2270141cfe47fa0d91ee52d5f8ea9b98cf7ddde0d53e5f79882" dependencies = [ "anyhow", - "base64", + "base64 0.13.1", "bincode", "directories-next", "file-per-thread-logger", "log", - "rustix 0.33.7", + "rustix 0.35.13", "serde", "sha2 0.9.9", "toml", - "winapi", + "windows-sys 0.36.1", "zstd", ] [[package]] name = "wasmtime-cranelift" -version = "0.38.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f264ff6b4df247d15584f2f53d009fbc90032cfdc2605b52b961bffc71b6eccd" +checksum = "4bd91339b742ff20bfed4532a27b73c86b5bcbfedd6bea2dcdf2d64471e1b5c6" dependencies = [ "anyhow", "cranelift-codegen", @@ -11731,10 +12423,9 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli", + "gimli 0.26.2", "log", - "more-asserts", - "object 0.28.4", + "object 0.29.0", "target-lexicon", "thiserror", "wasmparser", @@ -11743,17 +12434,16 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "0.38.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "839d2820e4b830f4b9e7aa08d4c0acabf4a5036105d639f6dfa1c6891c73bdc6" +checksum = "ebb881c61f4f627b5d45c54e629724974f8a8890d455bcbe634330cc27309644" dependencies = [ "anyhow", "cranelift-entity", - "gimli", + "gimli 0.26.2", "indexmap", "log", - "more-asserts", - "object 0.28.4", + "object 0.29.0", "serde", "target-lexicon", "thiserror", @@ -11763,72 +12453,70 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "0.38.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef0a0bcbfa18b946d890078ba0e1bc76bcc53eccfb40806c0020ec29dcd1bd49" +checksum = "1985c628011fe26adf5e23a5301bdc79b245e0e338f14bb58b39e4e25e4d8681" dependencies = [ - "addr2line", + "addr2line 0.17.0", "anyhow", "bincode", - "cfg-if 1.0.0", + "cfg-if", "cpp_demangle", - "gimli", + "gimli 0.26.2", "log", - "object 0.28.4", - "region", + "object 0.29.0", "rustc-demangle", - "rustix 0.33.7", + "rustix 0.35.13", "serde", "target-lexicon", "thiserror", "wasmtime-environ", "wasmtime-jit-debug", "wasmtime-runtime", - "winapi", + "windows-sys 0.36.1", ] [[package]] name = "wasmtime-jit-debug" -version = "0.38.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4779d976206c458edd643d1ac622b6c37e4a0800a8b1d25dfbf245ac2f2cac" +checksum = "f671b588486f5ccec8c5a3dba6b4c07eac2e66ab8c60e6f4e53717c77f709731" dependencies = [ - "lazy_static", - "object 0.28.4", - "rustix 0.33.7", + "object 0.29.0", + "once_cell", + "rustix 0.35.13", ] [[package]] name = "wasmtime-runtime" -version = "0.38.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7eb6ffa169eb5dcd18ac9473c817358cd57bc62c244622210566d473397954a" +checksum = "ee8f92ad4b61736339c29361da85769ebc200f184361959d1792832e592a1afd" dependencies = [ "anyhow", - "backtrace", "cc", - "cfg-if 1.0.0", + "cfg-if", "indexmap", "libc", "log", "mach", "memfd", "memoffset 0.6.5", - "more-asserts", + "paste", "rand 0.8.5", - "region", - "rustix 0.33.7", + "rustix 0.35.13", "thiserror", + "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-jit-debug", - "winapi", + "windows-sys 0.36.1", ] [[package]] name = "wasmtime-types" -version = "0.38.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d932b0ac5336f7308d869703dd225610a6a3aeaa8e968c52b43eed96cefb1c2" +checksum = "d23d61cb4c46e837b431196dd06abb11731541021916d03476a178b54dc07aeb" dependencies = [ "cranelift-entity", "serde", @@ -11838,14 +12526,24 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", ] +[[package]] +name = "webpki" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "webpki" version = "0.22.0" @@ -11862,7 +12560,219 @@ version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ - "webpki", + "webpki 0.22.0", +] + +[[package]] +name = "webrtc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3bc9049bdb2cea52f5fd4f6f728184225bdb867ed0dc2410eab6df5bdd67bb" +dependencies = [ + "arc-swap", + "async-trait", + "bytes", + "hex", + "interceptor", + "lazy_static", + "log", + "rand 0.8.5", + "rcgen 0.9.3", + "regex", + "ring", + "rtcp", + "rtp", + "rustls 0.19.1", + "sdp", + "serde", + "serde_json", + "sha2 0.10.6", + "stun", + "thiserror", + "time 0.3.18", + "tokio", + "turn", + "url", + "waitgroup", + "webrtc-data", + "webrtc-dtls", + "webrtc-ice", + "webrtc-mdns", + "webrtc-media", + "webrtc-sctp", + "webrtc-srtp", + "webrtc-util", +] + +[[package]] +name = "webrtc-data" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ef36a4d12baa6e842582fe9ec16a57184ba35e1a09308307b67d43ec8883100" +dependencies = [ + "bytes", + "derive_builder", + "log", + "thiserror", + "tokio", + "webrtc-sctp", + "webrtc-util", +] + +[[package]] +name = "webrtc-dtls" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7021987ae0a2ed6c8cd33f68e98e49bb6e74ffe9543310267b48a1bbe3900e5f" +dependencies = [ + "aes 0.6.0", + "aes-gcm 0.8.0", + "async-trait", + "bincode", + "block-modes", + "byteorder", + "ccm", + "curve25519-dalek 3.2.0", + "der-parser 8.1.0", + "elliptic-curve", + "hkdf", + "hmac 0.10.1", + "log", + "oid-registry 0.6.1", + "p256", + "p384", + "rand 0.8.5", + "rand_core 0.6.4", + "rcgen 0.9.3", + "ring", + "rustls 0.19.1", + "sec1", + "serde", + "sha-1", + "sha2 0.9.9", + "signature", + "subtle", + "thiserror", + "tokio", + "webpki 0.21.4", + "webrtc-util", + "x25519-dalek 2.0.0-pre.1", + "x509-parser 0.13.2", +] + +[[package]] +name = "webrtc-ice" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "465a03cc11e9a7d7b4f9f99870558fe37a102b65b93f8045392fef7c67b39e80" +dependencies = [ + "arc-swap", + "async-trait", + "crc", + "log", + "rand 0.8.5", + "serde", + "serde_json", + "stun", + "thiserror", + "tokio", + "turn", + "url", + "uuid", + "waitgroup", + "webrtc-mdns", + "webrtc-util", +] + +[[package]] +name = "webrtc-mdns" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f08dfd7a6e3987e255c4dbe710dde5d94d0f0574f8a21afa95d171376c143106" +dependencies = [ + "log", + "socket2", + "thiserror", + "tokio", + "webrtc-util", +] + +[[package]] +name = "webrtc-media" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee2a3c157a040324e5049bcbd644ffc9079e6738fa2cfab2bcff64e5cc4c00d7" +dependencies = [ + "byteorder", + "bytes", + "derive_builder", + "displaydoc", + "rand 0.8.5", + "rtp", + "thiserror", + "webrtc-util", +] + +[[package]] +name = "webrtc-sctp" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d47adcd9427eb3ede33d5a7f3424038f63c965491beafcc20bc650a2f6679c0" +dependencies = [ + "arc-swap", + "async-trait", + "bytes", + "crc", + "log", + "rand 0.8.5", + "thiserror", + "tokio", + "webrtc-util", +] + +[[package]] +name = "webrtc-srtp" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6183edc4c1c6c0175f8812eefdce84dfa0aea9c3ece71c2bf6ddd3c964de3da5" +dependencies = [ + "aead 0.4.3", + "aes 0.7.5", + "aes-gcm 0.9.4", + "async-trait", + "byteorder", + "bytes", + "ctr 0.8.0", + "hmac 0.11.0", + "log", + "rtcp", + "rtp", + "sha-1", + "subtle", + "thiserror", + "tokio", + "webrtc-util", +] + +[[package]] +name = "webrtc-util" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f1db1727772c05cf7a2cfece52c3aca8045ca1e176cd517d323489aa3c6d87" +dependencies = [ + "async-trait", + "bitflags", + "bytes", + "cc", + "ipnet", + "lazy_static", + "libc", + "log", + "nix", + "rand 0.8.5", + "thiserror", + "tokio", + "winapi", ] [[package]] @@ -11876,10 +12786,9 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ - "beefy-primitives", "bitvec", "frame-benchmarking", "frame-election-provider-support", @@ -11901,6 +12810,7 @@ dependencies = [ "pallet-election-provider-multi-phase", "pallet-election-provider-support-benchmarking", "pallet-elections-phragmen", + "pallet-fast-unstake", "pallet-grandpa", "pallet-identity", "pallet-im-online", @@ -11942,6 +12852,7 @@ dependencies = [ "smallvec", "sp-api", "sp-authority-discovery", + "sp-beefy", "sp-block-builder", "sp-consensus-babe", "sp-core", @@ -11965,21 +12876,23 @@ dependencies = [ [[package]] name = "westend-runtime-constants" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "frame-support", "polkadot-primitives", "polkadot-runtime-common", "smallvec", + "sp-core", "sp-runtime", + "sp-weights", ] [[package]] name = "which" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", "libc", @@ -12056,19 +12969,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.1", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_x86_64_msvc 0.42.1", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] name = "windows_aarch64_msvc" @@ -12084,9 +13021,9 @@ checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] name = "windows_i686_gnu" @@ -12102,9 +13039,9 @@ checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] name = "windows_i686_msvc" @@ -12120,9 +13057,9 @@ checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] name = "windows_x86_64_gnu" @@ -12138,15 +13075,15 @@ checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] name = "windows_x86_64_msvc" @@ -12162,9 +13099,9 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] name = "winreg" @@ -12195,10 +13132,58 @@ dependencies = [ "zeroize", ] +[[package]] +name = "x25519-dalek" +version = "2.0.0-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df" +dependencies = [ + "curve25519-dalek 3.2.0", + "rand_core 0.6.4", + "zeroize", +] + +[[package]] +name = "x509-parser" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb9bace5b5589ffead1afb76e43e34cff39cd0f3ce7e170ae0c29e53b88eb1c" +dependencies = [ + "asn1-rs 0.3.1", + "base64 0.13.1", + "data-encoding", + "der-parser 7.0.0", + "lazy_static", + "nom", + "oid-registry 0.4.0", + "ring", + "rusticata-macros", + "thiserror", + "time 0.3.18", +] + +[[package]] +name = "x509-parser" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" +dependencies = [ + "asn1-rs 0.5.1", + "base64 0.13.1", + "data-encoding", + "der-parser 8.1.0", + "lazy_static", + "nom", + "oid-registry 0.6.1", + "rusticata-macros", + "thiserror", + "time 0.3.18", +] + [[package]] name = "xcm" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "derivative", "impl-trait-for-tuples", @@ -12211,8 +13196,8 @@ dependencies = [ [[package]] name = "xcm-builder" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "frame-support", "frame-system", @@ -12231,8 +13216,8 @@ dependencies = [ [[package]] name = "xcm-executor" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "frame-benchmarking", "frame-support", @@ -12249,8 +13234,8 @@ dependencies = [ [[package]] name = "xcm-procedural" -version = "0.9.29" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.29#94078b44fb6c9767bf60ffcaaa3be40681be5a76" +version = "0.9.37" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.37#645723987cf9662244be8faf4e9b63e8b9a1b3a3" dependencies = [ "Inflector", "proc-macro2", @@ -12272,6 +13257,15 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "yasna" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" +dependencies = [ + "time 0.3.18", +] + [[package]] name = "zeroize" version = "1.5.7" @@ -12314,10 +13308,11 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.4+zstd.1.5.2" +version = "2.0.7+zstd.1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fa202f2ef00074143e219d15b62ffc317d17cc33909feac471c044087cad7b0" +checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5" dependencies = [ "cc", "libc", + "pkg-config", ] diff --git a/Dockerfile b/Dockerfile index 1ca1eee9314..5b3cf266789 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ COPY . /nodle-chain RUN apt-get update && \ apt-get upgrade -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y cmake pkg-config libssl-dev git clang build-essential curl + DEBIAN_FRONTEND=noninteractive apt-get install -y cmake pkg-config libssl-dev git clang build-essential curl protobuf-compiler RUN curl https://sh.rustup.rs -sSf | sh -s -- -y && \ export PATH=$PATH:$HOME/.cargo/bin && \ scripts/init.sh && \ diff --git a/node/Cargo.toml b/node/Cargo.toml index 35b48a699a7..b0bed6cfe25 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -9,7 +9,7 @@ version = "2.0.25" targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } [[bin]] name = "nodle-parachain" @@ -20,85 +20,87 @@ runtime-benchmarks = [ "runtime-eden/runtime-benchmarks", "polkadot-cli/runtime-benchmarks", ] -try-runtime = ["runtime-eden/try-runtime"] +try-runtime = [ + "runtime-eden/try-runtime", + "try-runtime-cli/try-runtime" +] [dependencies] -clap = { version = "3.2.20", features = ["derive"] } +clap = { version = "4.0.32", features = ["derive"] } derive_more = "0.99.2" log = "0.4.17" codec = { package = "parity-scale-codec", version = "3.0.0" } -serde = { version = "1.0.144", features = ["derive"] } +serde = { version = "1.0.152", features = ["derive"] } hex-literal = "0.3.4" # RPC related Dependencies -jsonrpsee = { version = "0.15.1", features = ["server"] } +jsonrpsee = { version = "0.16.2", features = ["server"] } # Local Dependencies runtime-eden = { path = "../runtimes/eden" } primitives = { version = "2.0.17", path = "../primitives" } # Substrate Dependencies -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -pallet-contracts-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } +frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } ## Substrate Client Dependencies -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sc-service = { git = "https://github.com/paritytech/substrate", features = ["wasmtime"], branch = "polkadot-v0.9.29" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } ## Substrate Primitive Dependencies -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } # Cumulus dependencies -cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.29" } -cumulus-client-collator = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.29" } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.29" } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.29" } -cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.29" } -cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.29" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.29" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.29" } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.29" } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.29" } -cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.29" } +cumulus-client-cli = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-client-collator = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37" } # Polkadot dependencies -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.29" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.29" } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.29" } -polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.29" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.29" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.37" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } diff --git a/node/src/cli.rs b/node/src/cli.rs index bd736136706..5d133b5d01c 100644 --- a/node/src/cli.rs +++ b/node/src/cli.rs @@ -24,7 +24,7 @@ use std::path::PathBuf; #[derive(Debug, clap::Subcommand)] pub enum Subcommand { /// Key management CLI utilities - #[clap(subcommand)] + #[command(subcommand)] Key(sc_cli::KeySubcommand), /// Build a chain specification. @@ -56,24 +56,28 @@ pub enum Subcommand { /// Sub-commands concerned with benchmarking. /// The pallet benchmarking moved to the `pallet` sub-command. - #[clap(subcommand)] + #[command(subcommand)] Benchmark(frame_benchmarking_cli::BenchmarkCmd), /// Try some testing command against a specified runtime state. + #[cfg(feature = "try-runtime")] TryRuntime(try_runtime_cli::TryRuntimeCmd), + /// Errors since the binary was not build with `--features try-runtime`. + #[cfg(not(feature = "try-runtime"))] + TryRuntime, } #[derive(Debug, clap::Parser)] -#[clap( +#[command( propagate_version = true, args_conflicts_with_subcommands = true, subcommand_negates_reqs = true )] pub struct Cli { - #[clap(subcommand)] + #[command(subcommand)] pub subcommand: Option, - #[clap(flatten)] + #[command(flatten)] pub run: cumulus_client_cli::RunCmd, /// Disable automatic hardware benchmarks. @@ -83,11 +87,11 @@ pub struct Cli { /// /// The results are then printed out in the logs, and also sent as part of /// telemetry, if telemetry is enabled. - #[clap(long)] + #[arg(long)] pub no_hardware_benchmarks: bool, /// Relay chain arguments - #[clap(raw = true, conflicts_with = "relay-chain-rpc-url")] + #[arg(raw = true)] pub relaychain_args: Vec, } diff --git a/node/src/command.rs b/node/src/command.rs index 6b85bbceb04..c6cab24eccb 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -25,10 +25,7 @@ use sc_cli::{ ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli, }; -use sc_service::{ - config::{BasePath, PrometheusConfig}, - TaskManager, -}; +use sc_service::config::{BasePath, PrometheusConfig}; use sp_core::hexdisplay::HexDisplay; use sp_runtime::traits::{AccountIdConversion, Block as BlockT}; use std::net::SocketAddr; @@ -39,8 +36,8 @@ use crate::{ service::{new_partial, parachain_build_import_queue, TemplateRuntimeExecutor}, }; -// default to the Statemint/Statemine/Westmint id -const DEFAULT_PARA_ID: u32 = 1000; +// default to Nodle parachain id +const DEFAULT_PARA_ID: u32 = 2026; fn load_spec(id: &str) -> std::result::Result, String> { Ok(match id { @@ -134,7 +131,6 @@ macro_rules! construct_async_run { runner.async_run(|$config| { let $components = new_partial::< RuntimeApi, - TemplateRuntimeExecutor, _ >( &$config, @@ -225,13 +221,21 @@ pub fn run() -> Result<()> { } } BenchmarkCmd::Block(cmd) => runner.sync_run(|config| { - let partials = - new_partial::(&config, parachain_build_import_queue)?; + let partials = new_partial::(&config, parachain_build_import_queue)?; cmd.run(partials.client) }), + #[cfg(not(feature = "runtime-benchmarks"))] + BenchmarkCmd::Storage(_) => { + return Err(sc_cli::Error::Input( + "Compile with --features=runtime-benchmarks \ + to enable storage benchmarks." + .into(), + ) + .into()) + } + #[cfg(feature = "runtime-benchmarks")] BenchmarkCmd::Storage(cmd) => runner.sync_run(|config| { - let partials = - new_partial::(&config, parachain_build_import_queue)?; + let partials = new_partial::(&config, parachain_build_import_queue)?; let db = partials.backend.expose_db(); let storage = partials.backend.expose_storage(); @@ -246,20 +250,29 @@ pub fn run() -> Result<()> { _ => Err("Benchmarking sub-command unsupported".into()), } } + #[cfg(feature = "try-runtime")] Some(Subcommand::TryRuntime(cmd)) => { - if cfg!(feature = "try-runtime") { - let runner = cli.create_runner(cmd)?; - - // grab the task manager. - let registry = &runner.config().prometheus_config.as_ref().map(|cfg| &cfg.registry); - let task_manager = TaskManager::new(runner.config().tokio_handle.clone(), *registry) - .map_err(|e| format!("Error: {:?}", e))?; - - runner.async_run(|config| Ok((cmd.run::(config), task_manager))) - } else { - Err("Try-runtime must be enabled by `--features try-runtime`.".into()) - } + let runner = cli.create_runner(cmd)?; + let registry = &runner.config().prometheus_config.as_ref().map(|cfg| &cfg.registry); + let task_manager = sc_service::TaskManager::new(runner.config().tokio_handle.clone(), *registry) + .map_err(|e| format!("Error: {:?}", e))?; + use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch}; + type HostFunctionsOf = ExtendedHostFunctions< + sp_io::SubstrateHostFunctions, + ::ExtendHostFunctions, + >; + + runner.async_run(|_| { + Ok(( + cmd.run::>(), + task_manager, + )) + }) } + #[cfg(not(feature = "try-runtime"))] + Some(Subcommand::TryRuntime) => Err("Try-runtime was not enabled when building the node. \ + You can enable it with `--features try-runtime`." + .into()), Some(Subcommand::Key(cmd)) => Ok(cmd.run(&cli)?), None => { let runner = cli.create_runner(&cli.run.normalize())?; diff --git a/node/src/rpc.rs b/node/src/rpc.rs index 891ba1f9151..41418fbcaf2 100644 --- a/node/src/rpc.rs +++ b/node/src/rpc.rs @@ -20,7 +20,7 @@ use std::sync::Arc; -use primitives::{AccountId, Balance, Block, BlockNumber, Hash, Index as Nonce}; +use primitives::{AccountId, Balance, Block, Index as Nonce}; use sc_client_api::AuxStore; pub use sc_rpc::{DenyUnsafe, SubscriptionTaskExecutor}; @@ -53,13 +53,12 @@ where + Sync + 'static, C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi, - C::Api: pallet_contracts_rpc::ContractsRuntimeApi, - C::Api: substrate_frame_rpc_system::AccountNonceApi, + C::Api: frame_rpc_system::AccountNonceApi, C::Api: BlockBuilder, P: TransactionPool + Sync + Send + 'static, { + use frame_rpc_system::{System, SystemApiServer}; use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer}; - use substrate_frame_rpc_system::{System, SystemApiServer}; let mut module = RpcExtension::new(()); let FullDeps { diff --git a/node/src/service.rs b/node/src/service.rs index b5d5ef44335..7199b1d663b 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -23,27 +23,25 @@ use std::{sync::Arc, time::Duration}; // rpc use jsonrpsee::RpcModule; -use polkadot_service::CollatorPair; pub use primitives::{AccountId, Balance, Block, BlockNumber, Hash, Header, Index as Nonce}; // Cumulus Imports use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion}; -use cumulus_client_consensus_common::ParachainConsensus; +use cumulus_client_consensus_common::{ParachainBlockImport as TParachainBlockImport, ParachainConsensus}; use cumulus_client_network::BlockAnnounceValidator; use cumulus_client_service::{ - prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams, + build_relay_chain_interface, prepare_node_config, start_collator, start_full_node, StartCollatorParams, + StartFullNodeParams, }; use cumulus_primitives_core::ParaId; use cumulus_client_cli::CollatorOptions; -use cumulus_relay_chain_inprocess_interface::build_inprocess_relay_chain; -use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface, RelayChainResult}; -use cumulus_relay_chain_rpc_interface::{create_client_and_start_worker, RelayChainRpcInterface}; +use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface}; // Substrate Imports -use sc_client_api::ExecutorProvider; -use sc_executor::NativeElseWasmExecutor; +use sc_consensus::ImportQueue; +use sc_executor::WasmExecutor; use sc_network::NetworkService; use sc_network_common::service::NetworkBlock; use sc_service::{Configuration, PartialComponents, TFullBackend, TFullClient, TaskManager}; @@ -53,6 +51,22 @@ use sp_keystore::SyncCryptoStorePtr; use sp_runtime::traits::BlakeTwo256; use substrate_prometheus_endpoint::Registry; +#[cfg(not(feature = "runtime-benchmarks"))] +type HostFunctions = sp_io::SubstrateHostFunctions; + +#[cfg(feature = "runtime-benchmarks")] +type HostFunctions = ( + sp_io::SubstrateHostFunctions, + frame_benchmarking::benchmarking::HostFunctions, +); + +type ParachainClient = TFullClient>; + +type ParachainBackend = TFullBackend; + +type ParachainBlockImport = + TParachainBlockImport>, ParachainBackend>; + pub struct TemplateRuntimeExecutor; impl sc_executor::NativeExecutionDispatch for TemplateRuntimeExecutor { type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; @@ -70,43 +84,40 @@ impl sc_executor::NativeExecutionDispatch for TemplateRuntimeExecutor { /// /// Use this macro if you don't actually need the full service, but just the builder in order to /// be able to perform chain operations. -#[allow(clippy::type_complexity)] -pub fn new_partial( +pub fn new_partial( config: &Configuration, build_import_queue: BIQ, ) -> Result< PartialComponents< - TFullClient>, - TFullBackend, + ParachainClient, + ParachainBackend, (), - sc_consensus::DefaultImportQueue>>, - sc_transaction_pool::FullPool>>, - (Option, Option), + sc_consensus::DefaultImportQueue>, + sc_transaction_pool::FullPool>, + ( + ParachainBlockImport, + Option, + Option, + ), >, sc_service::Error, > where - RuntimeApi: ConstructRuntimeApi>> - + Send - + Sync - + 'static, + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue + sp_api::Metadata + sp_session::SessionKeys - + sp_api::ApiExt, Block>> + + sp_api::ApiExt> + sp_offchain::OffchainWorkerApi + sp_block_builder::BlockBuilder, - sc_client_api::StateBackendFor, Block>: sp_api::StateBackend, - Executor: sc_executor::NativeExecutionDispatch + 'static, + sc_client_api::StateBackendFor: sp_api::StateBackend, BIQ: FnOnce( - Arc>>, + Arc>, + ParachainBlockImport, &Configuration, Option, &TaskManager, - ) -> Result< - sc_consensus::DefaultImportQueue>>, - sc_service::Error, - >, + ) -> Result>, sc_service::Error>, { let telemetry = config .telemetry_endpoints @@ -119,10 +130,11 @@ where }) .transpose()?; - let executor = sc_executor::NativeElseWasmExecutor::::new( + let executor = sc_executor::WasmExecutor::::new( config.wasm_method, config.default_heap_pages, config.max_runtime_instances, + None, config.runtime_cache_size, ); @@ -148,8 +160,11 @@ where client.clone(), ); + let block_import = ParachainBlockImport::new(client.clone(), backend.clone()); + let import_queue = build_import_queue( client.clone(), + block_import.clone(), config, telemetry.as_ref().map(|telemetry| telemetry.handle()), &task_manager, @@ -163,87 +178,52 @@ where task_manager, transaction_pool, select_chain: (), - other: (telemetry, telemetry_worker_handle), + other: (block_import, telemetry, telemetry_worker_handle), }; Ok(params) } -async fn build_relay_chain_interface( - polkadot_config: Configuration, - parachain_config: &Configuration, - telemetry_worker_handle: Option, - task_manager: &mut TaskManager, - collator_options: CollatorOptions, - hwbench: Option, -) -> RelayChainResult<(Arc<(dyn RelayChainInterface + 'static)>, Option)> { - match collator_options.relay_chain_rpc_url { - Some(relay_chain_url) => { - let client = create_client_and_start_worker(relay_chain_url, task_manager).await?; - Ok((Arc::new(RelayChainRpcInterface::new(client)) as Arc<_>, None)) - } - None => build_inprocess_relay_chain( - polkadot_config, - parachain_config, - telemetry_worker_handle, - task_manager, - hwbench, - ), - } -} - -/// Start a node with the given parachain `Configuration` and relay chain `Configuration`. -/// -/// This is the actual implementation that is abstract over the executor and the runtime api. #[allow(clippy::too_many_arguments)] #[sc_tracing::logging::prefix_logs_with("Parachain")] -async fn start_node_impl( +async fn start_node_impl( parachain_config: Configuration, polkadot_config: Configuration, collator_options: CollatorOptions, - id: ParaId, + para_id: ParaId, _rpc_ext_builder: RB, build_import_queue: BIQ, build_consensus: BIC, hwbench: Option, -) -> sc_service::error::Result<( - TaskManager, - Arc>>, -)> +) -> sc_service::error::Result<(TaskManager, Arc>)> where - RuntimeApi: ConstructRuntimeApi>> - + Send - + Sync - + 'static, + RuntimeApi: ConstructRuntimeApi> + Send + Sync + 'static, RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue + sp_api::Metadata + sp_session::SessionKeys - + sp_api::ApiExt, Block>> + + sp_api::ApiExt> + sp_offchain::OffchainWorkerApi + sp_block_builder::BlockBuilder + cumulus_primitives_core::CollectCollationInfo + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi - + pallet_contracts_rpc::ContractsRuntimeApi - + substrate_frame_rpc_system::AccountNonceApi, - sc_client_api::StateBackendFor, Block>: sp_api::StateBackend, - Executor: sc_executor::NativeExecutionDispatch + 'static, - RB: Fn(Arc>) -> Result, sc_service::Error> + Send + 'static, + + frame_rpc_system::AccountNonceApi, + sc_client_api::StateBackendFor: sp_api::StateBackend, + RB: Fn(Arc>) -> Result, sc_service::Error>, BIQ: FnOnce( - Arc>>, - &Configuration, - Option, - &TaskManager, - ) -> Result< - sc_consensus::DefaultImportQueue>>, - sc_service::Error, - > + 'static, + Arc>, + ParachainBlockImport, + &Configuration, + Option, + &TaskManager, + ) -> Result>, sc_service::Error>, BIC: FnOnce( - Arc>>, + Arc>, + ParachainBlockImport, Option<&Registry>, Option, &TaskManager, Arc, - Arc>>>, + Arc>>, Arc>, SyncCryptoStorePtr, bool, @@ -251,8 +231,8 @@ where { let parachain_config = prepare_node_config(parachain_config); - let params = new_partial::(¶chain_config, build_import_queue)?; - let (mut telemetry, telemetry_worker_handle) = params.other; + let params = new_partial::(¶chain_config, build_import_queue)?; + let (block_import, mut telemetry, telemetry_worker_handle) = params.other; let client = params.client.clone(); let backend = params.backend.clone(); @@ -272,22 +252,24 @@ where s => s.to_string().into(), })?; - let block_announce_validator = BlockAnnounceValidator::new(relay_chain_interface.clone(), id); + let block_announce_validator = BlockAnnounceValidator::new(relay_chain_interface.clone(), para_id); let force_authoring = parachain_config.force_authoring; let validator = parachain_config.role.is_authority(); let prometheus_registry = parachain_config.prometheus_registry().cloned(); let transaction_pool = params.transaction_pool.clone(); - let import_queue = cumulus_client_service::SharedImportQueue::new(params.import_queue); - let (network, system_rpc_tx, start_network) = sc_service::build_network(sc_service::BuildNetworkParams { - config: ¶chain_config, - client: client.clone(), - transaction_pool: transaction_pool.clone(), - spawn_handle: task_manager.spawn_handle(), - import_queue: import_queue.clone(), - block_announce_validator_builder: Some(Box::new(|_| Box::new(block_announce_validator))), - warp_sync: None, - })?; + let import_queue_service = params.import_queue.service(); + + let (network, system_rpc_tx, tx_handler_controller, start_network) = + sc_service::build_network(sc_service::BuildNetworkParams { + config: ¶chain_config, + client: client.clone(), + transaction_pool: transaction_pool.clone(), + spawn_handle: task_manager.spawn_handle(), + import_queue: params.import_queue, + block_announce_validator_builder: Some(Box::new(|_| Box::new(block_announce_validator))), + warp_sync: None, + })?; let rpc_builder = { let client = client.clone(); @@ -314,6 +296,7 @@ where backend: backend.clone(), network: network.clone(), system_rpc_tx, + tx_handler_controller, telemetry: telemetry.as_mut(), })?; @@ -340,6 +323,7 @@ where if validator { let parachain_consensus = build_consensus( client.clone(), + block_import, prometheus_registry.as_ref(), telemetry.as_ref().map(|t| t.handle()), &task_manager, @@ -353,7 +337,7 @@ where let spawner = task_manager.spawn_handle(); let params = StartCollatorParams { - para_id: id, + para_id, block_status: client.clone(), announce_block, client: client.clone(), @@ -361,7 +345,7 @@ where relay_chain_interface, spawner, parachain_consensus, - import_queue, + import_queue: import_queue_service, collator_key: collator_key.expect("Command line arguments do not allow this. qed"), relay_chain_slot_duration, }; @@ -372,11 +356,10 @@ where client: client.clone(), announce_block, task_manager: &mut task_manager, - para_id: id, + para_id, relay_chain_interface, relay_chain_slot_duration, - import_queue, - collator_options, + import_queue: import_queue_service, }; start_full_node(params)?; @@ -390,23 +373,18 @@ where /// Build the import queue for the parachain runtime. #[allow(clippy::type_complexity)] pub fn parachain_build_import_queue( - client: Arc>>, + client: Arc>, + block_import: ParachainBlockImport, config: &Configuration, telemetry: Option, task_manager: &TaskManager, -) -> Result< - sc_consensus::DefaultImportQueue< - Block, - TFullClient>, - >, - sc_service::Error, -> { +) -> Result>, sc_service::Error> { let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?; - cumulus_client_consensus_aura::import_queue::( + cumulus_client_consensus_aura::import_queue::( cumulus_client_consensus_aura::ImportQueueParams { - block_import: client.clone(), - client: client.clone(), + block_import, + client, create_inherent_data_providers: move |_, _| async move { let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); @@ -415,10 +393,9 @@ pub fn parachain_build_import_queue( slot_duration, ); - Ok((timestamp, slot)) + Ok((slot, timestamp)) }, registry: config.prometheus_registry(), - can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()), spawner: &task_manager.spawn_essential_handle(), telemetry, }, @@ -426,25 +403,23 @@ pub fn parachain_build_import_queue( .map_err(Into::into) } -/// Start a rococo parachain node. +/// Start a parachain node. pub async fn start_parachain_node( parachain_config: Configuration, polkadot_config: Configuration, collator_options: CollatorOptions, - id: ParaId, + para_id: ParaId, hwbench: Option, -) -> sc_service::error::Result<( - TaskManager, - Arc>>, -)> { - start_node_impl::( +) -> sc_service::error::Result<(TaskManager, Arc>)> { + start_node_impl::( parachain_config, polkadot_config, collator_options, - id, + para_id, |_| Ok(RpcModule::new(())), parachain_build_import_queue, |client, + block_import, prometheus_registry, telemetry, task_manager, @@ -475,14 +450,13 @@ pub async fn start_parachain_node( proposer_factory, create_inherent_data_providers: move |_, (relay_parent, validation_data)| { let relay_chain_interface = relay_chain_interface.clone(); - async move { let parachain_inherent = cumulus_primitives_parachain_inherent::ParachainInherentData::create_at( relay_parent, &relay_chain_interface, &validation_data, - id, + para_id, ) .await; @@ -497,10 +471,10 @@ pub async fn start_parachain_node( Box::::from("Failed to create parachain inherent") })?; - Ok((timestamp, slot, parachain_inherent)) + Ok((slot, timestamp, parachain_inherent)) } }, - block_import: client.clone(), + block_import, para_client: client, backoff_authoring_blocks: Option::<()>::None, sync_oracle, diff --git a/pallets/allocations/Cargo.toml b/pallets/allocations/Cargo.toml index cd76d584075..10551d64ba2 100644 --- a/pallets/allocations/Cargo.toml +++ b/pallets/allocations/Cargo.toml @@ -28,20 +28,20 @@ try-runtime = ["frame-support/try-runtime"] [dependencies] log = { version = "0.4.17", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.144", optional = true, features = ["derive"] } +serde = { version = "1.0.152", optional = true, features = ["derive"] } scale-info = { version = "2.0.1", default-features = false, features = [ "derive",] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.29" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.37" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } support = { path = "../../support" } [dev-dependencies] -sp-tracing = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -pallet-membership = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } +sp-tracing = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-membership = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } lazy_static = {version = "1.4.0", default-features = false, features = ["spin_no_std"] } diff --git a/pallets/allocations/src/benchmarking.rs b/pallets/allocations/src/benchmarking.rs index 18752bf4a66..16b9da0e0db 100644 --- a/pallets/allocations/src/benchmarking.rs +++ b/pallets/allocations/src/benchmarking.rs @@ -43,10 +43,10 @@ fn make_batch(b: u32) -> BoundedVec<(T::AccountId, BalanceOf), T:: ret } -fn assert_last_event(generic_event: ::Event) { +fn assert_last_event(generic_event: ::RuntimeEvent) { let events = frame_system::Pallet::::events(); assert!(!events.is_empty()); - let system_event: ::Event = generic_event.into(); + let system_event: ::RuntimeEvent = generic_event.into(); let frame_system::EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); } diff --git a/pallets/allocations/src/lib.rs b/pallets/allocations/src/lib.rs index 1f673f9b806..dae9f6e2e37 100644 --- a/pallets/allocations/src/lib.rs +++ b/pallets/allocations/src/lib.rs @@ -170,7 +170,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type Currency: Currency; @@ -212,6 +212,7 @@ pub mod pallet { /// Optimized allocation call, which will batch allocations of various amounts /// and destinations and together. This allow us to be much more efficient and thus /// increase our chain's capacity in handling these transactions. + #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::allocate(batch.len().try_into().unwrap_or_else(|_| T::MaxAllocs::get())).saturating_add(T::WeightInfo::checked_update_session_quota()))] pub fn batch( origin: OriginFor, @@ -227,7 +228,7 @@ pub mod pallet { )); Ok(dispatch_info) } - + #[pallet::call_index(1)] #[pallet::weight(T::WeightInfo::set_curve_starting_block())] pub fn set_curve_starting_block( origin: OriginFor, @@ -311,7 +312,7 @@ impl Pallet { return T::OracleMembers::contains(&who); } - fn ensure_oracle(origin: T::Origin) -> DispatchResult { + fn ensure_oracle(origin: T::RuntimeOrigin) -> DispatchResult { let sender = ensure_signed(origin)?; ensure!(Self::is_oracle(sender), Error::::OracleAccessDenied); Ok(()) diff --git a/pallets/allocations/src/tests.rs b/pallets/allocations/src/tests.rs index 8de06aed167..3377bd294e7 100644 --- a/pallets/allocations/src/tests.rs +++ b/pallets/allocations/src/tests.rs @@ -21,9 +21,10 @@ use super::*; use crate::{self as pallet_allocations}; use frame_support::{ - assert_noop, assert_ok, bounded_vec, ord_parameter_types, parameter_types, + assert_noop, assert_ok, bounded_vec, + dispatch::Pays, + ord_parameter_types, parameter_types, traits::{ConstU32, GenesisBuild}, - weights::Pays, PalletId, }; use frame_system::EnsureSignedBy; @@ -57,8 +58,8 @@ parameter_types! { pub const BlockHashCount: u64 = 250; } impl frame_system::Config for Test { - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type BlockWeights = (); type BlockLength = (); type SS58Prefix = (); @@ -69,7 +70,7 @@ impl frame_system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -88,7 +89,7 @@ parameter_types! { } impl pallet_balances::Config for Test { type Balance = u64; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type MaxLocks = MaxLocks; @@ -131,7 +132,7 @@ impl WithAccountId for Receiver { } impl pallet_membership::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AddOrigin = EnsureSignedBy; type RemoveOrigin = EnsureSignedBy; type SwapOrigin = EnsureSignedBy; @@ -144,7 +145,7 @@ impl pallet_membership::Config for Test { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = pallet_balances::Pallet; type PalletId = AllocPalletId; type ProtocolFee = Fee; @@ -365,8 +366,8 @@ fn both_session_events_are_emitted_on_the_very_first_on_initialize_after_upgrade assert_eq!( events, vec![ - Event::Allocations(crate::Event::SessionQuotaCalculated(session_quota)), - Event::Allocations(crate::Event::SessionQuotaRenewed) + RuntimeEvent::Allocations(crate::Event::SessionQuotaCalculated(session_quota)), + RuntimeEvent::Allocations(crate::Event::SessionQuotaRenewed) ] ); }) @@ -396,7 +397,10 @@ fn emit_session_quota_renewed_at_the_beginning_of_a_session() { .into_iter() .map(|event_record| event_record.event) .collect(); - assert_eq!(events, vec![Event::Allocations(crate::Event::SessionQuotaRenewed)]); + assert_eq!( + events, + vec![RuntimeEvent::Allocations(crate::Event::SessionQuotaRenewed)] + ); }) } @@ -421,7 +425,9 @@ fn emit_session_quota_calculated_at_the_beginning_of_a_fiscal_period() { .collect(); assert_eq!( events, - vec![Event::Allocations(crate::Event::SessionQuotaCalculated(session_quota))] + vec![RuntimeEvent::Allocations(crate::Event::SessionQuotaCalculated( + session_quota + ))] ); }) } @@ -527,7 +533,7 @@ fn non_oracle_is_rejected() { let total_issuance = 100000u64; let _issuance = Balances::issue(total_issuance); assert_noop!( - Allocations::batch(Origin::signed(Hacker::get()), bounded_vec![(Grantee::get(), 50)]), + Allocations::batch(RuntimeOrigin::signed(Hacker::get()), bounded_vec![(Grantee::get(), 50)]), Errors::OracleAccessDenied ); }) @@ -538,7 +544,7 @@ fn oracle_does_not_pay_fees() { new_test_ext().execute_with(|| { let total_issuance = 100000u64; let _issuance = Balances::issue(total_issuance); - let result = Allocations::batch(Origin::signed(Oracle::get()), bounded_vec![(Grantee::get(), 50)]) + let result = Allocations::batch(RuntimeOrigin::signed(Oracle::get()), bounded_vec![(Grantee::get(), 50)]) .expect("batch call failed"); assert_eq!(result.pays_fee, Pays::No); }) @@ -549,12 +555,12 @@ fn only_root_can_set_curve_starting_block() { new_test_ext().execute_with(|| { assert_eq!(>::get(), None); assert_eq!( - Allocations::set_curve_starting_block(Origin::root(), 13), + Allocations::set_curve_starting_block(RuntimeOrigin::root(), 13), Ok(Pays::No.into()) ); assert_eq!(>::get(), Some(13)); assert_noop!( - Allocations::set_curve_starting_block(Origin::signed(Oracle::get()), 17), + Allocations::set_curve_starting_block(RuntimeOrigin::signed(Oracle::get()), 17), BadOrigin ); }) @@ -567,7 +573,7 @@ fn very_first_batch_call_sets_curve_starting_block() { System::set_block_number(5); let _issuance = Balances::issue(100000u64); assert_ok!(Allocations::batch( - Origin::signed(Oracle::get()), + RuntimeOrigin::signed(Oracle::get()), bounded_vec![(Grantee::get(), 50)] )); assert_eq!(>::get(), Some(5)); @@ -575,7 +581,7 @@ fn very_first_batch_call_sets_curve_starting_block() { assert_eq!(>::get(), 8); System::set_block_number(6); assert_ok!(Allocations::batch( - Origin::signed(Oracle::get()), + RuntimeOrigin::signed(Oracle::get()), bounded_vec![(Grantee::get(), 50)] )); assert_eq!(>::get(), Some(5)); @@ -590,7 +596,7 @@ fn simple_allocation_works() { let total_issuance = 100000u64; let _issuance = Balances::issue(total_issuance); assert_ok!(Allocations::batch( - Origin::signed(Oracle::get()), + RuntimeOrigin::signed(Oracle::get()), bounded_vec![(Grantee::get(), 50)] )); assert_eq!(Balances::free_balance(Grantee::get()), 45); @@ -607,7 +613,7 @@ fn batched_allocation_works() { let total_issuance = 100000u64; let _issuance = Balances::issue(total_issuance); assert_ok!(Allocations::batch( - Origin::signed(Oracle::get()), + RuntimeOrigin::signed(Oracle::get()), bounded_vec![(Grantee::get(), 50), (OtherGrantee::get(), 50)] )); assert_eq!(Allocations::session_quota(), 200); @@ -626,11 +632,11 @@ fn use_session_quota_in_multiple_calls() { let total_issuance = 50000u64; let _issuance = Balances::issue(total_issuance); assert_ok!(Allocations::batch( - Origin::signed(Oracle::get()), + RuntimeOrigin::signed(Oracle::get()), bounded_vec![(Grantee::get(), 30), (OtherGrantee::get(), 50)] )); assert_ok!(Allocations::batch( - Origin::signed(Oracle::get()), + RuntimeOrigin::signed(Oracle::get()), bounded_vec![(Grantee::get(), 70)] )); assert_eq!(Allocations::session_quota(), 0); @@ -646,7 +652,7 @@ fn exceeding_session_quota_fails() { >::put(79); assert_noop!( Allocations::batch( - Origin::signed(Oracle::get()), + RuntimeOrigin::signed(Oracle::get()), bounded_vec![(Grantee::get(), 30), (OtherGrantee::get(), 50)] ), Errors::AllocationExceedsSessionQuota @@ -667,7 +673,7 @@ fn ensure_issuance_checks() { ]; for input in inputs.iter().cloned() { assert_noop!( - Allocations::batch(Origin::signed(Oracle::get()), input), + Allocations::batch(RuntimeOrigin::signed(Oracle::get()), input), Errors::AllocationExceedsSessionQuota ); } @@ -678,7 +684,7 @@ fn ensure_issuance_checks() { fn ensure_existential_deposit_checks() { new_test_ext().execute_with(|| { assert_noop!( - Allocations::batch(Origin::signed(Oracle::get()), bounded_vec![(Grantee::get(), 1)]), + Allocations::batch(RuntimeOrigin::signed(Oracle::get()), bounded_vec![(Grantee::get(), 1)]), Errors::DoesNotSatisfyExistentialDeposit ); }) @@ -688,7 +694,7 @@ fn ensure_existential_deposit_checks() { fn no_issuance() { new_test_ext().execute_with(|| { assert_noop!( - Allocations::batch(Origin::signed(Oracle::get()), bounded_vec![]), + Allocations::batch(RuntimeOrigin::signed(Oracle::get()), bounded_vec![]), Errors::BatchEmpty ); }) diff --git a/pallets/allocations/src/weights.rs b/pallets/allocations/src/weights.rs index 06e1c199e34..cfaed970666 100644 --- a/pallets/allocations/src/weights.rs +++ b/pallets/allocations/src/weights.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for pallet_allocations //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-11-11, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! HOSTNAME: `chain-bench-012bd056`, CPU: `AMD EPYC 7B13` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 @@ -65,10 +65,10 @@ impl WeightInfo for SubstrateWeight { // Storage: System Events (r:1 w:1) /// The range of component `b` is `[1, 500]`. fn allocate(b: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(56_453_000_u64) - // Standard Error: 12_000 - .saturating_add(Weight::from_ref_time(26_035_000_u64).saturating_mul(b as u64)) + // Minimum execution time: 91_910 nanoseconds. + Weight::from_ref_time(43_980_848_u64) + // Standard Error: 9_014 + .saturating_add(Weight::from_ref_time(27_585_705_u64).saturating_mul(b as u64)) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(b as u64))) .saturating_add(T::DbWeight::get().writes(6_u64)) @@ -83,8 +83,8 @@ impl WeightInfo for SubstrateWeight { // Storage: System Events (r:1 w:1) // Storage: Allocations NextSessionQuota (r:0 w:1) fn calc_quota() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(23_100_000_u64) + // Minimum execution time: 23_030 nanoseconds. + Weight::from_ref_time(23_700_000_u64) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -97,8 +97,8 @@ impl WeightInfo for SubstrateWeight { // Storage: System Events (r:1 w:1) // Storage: Allocations SessionQuota (r:0 w:1) fn renew_quota() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(18_760_000_u64) + // Minimum execution time: 19_270 nanoseconds. + Weight::from_ref_time(19_810_000_u64) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -114,8 +114,8 @@ impl WeightInfo for SubstrateWeight { // Storage: Allocations SessionQuota (r:0 w:1) // Storage: Allocations NextSessionQuota (r:0 w:1) fn checked_update_session_quota() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(35_109_000_u64) + // Minimum execution time: 34_590 nanoseconds. + Weight::from_ref_time(35_420_000_u64) .saturating_add(T::DbWeight::get().reads(9_u64)) .saturating_add(T::DbWeight::get().writes(7_u64)) } @@ -124,8 +124,8 @@ impl WeightInfo for SubstrateWeight { // Storage: Allocations SessionQuotaCalculationSchedule (r:0 w:1) // Storage: Allocations SessionQuotaRenewSchedule (r:0 w:1) fn set_curve_starting_block() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(11_100_000_u64) + // Minimum execution time: 11_190 nanoseconds. + Weight::from_ref_time(11_680_000_u64) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -141,10 +141,10 @@ impl WeightInfo for () { // Storage: System Events (r:1 w:1) /// The range of component `b` is `[1, 500]`. fn allocate(b: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(56_453_000_u64) - // Standard Error: 12_000 - .saturating_add(Weight::from_ref_time(26_035_000_u64).saturating_mul(b as u64)) + // Minimum execution time: 91_910 nanoseconds. + Weight::from_ref_time(43_980_848_u64) + // Standard Error: 9_014 + .saturating_add(Weight::from_ref_time(27_585_705_u64).saturating_mul(b as u64)) .saturating_add(RocksDbWeight::get().reads(8_u64)) .saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(b as u64))) .saturating_add(RocksDbWeight::get().writes(6_u64)) @@ -159,8 +159,8 @@ impl WeightInfo for () { // Storage: System Events (r:1 w:1) // Storage: Allocations NextSessionQuota (r:0 w:1) fn calc_quota() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(23_100_000_u64) + // Minimum execution time: 23_030 nanoseconds. + Weight::from_ref_time(23_700_000_u64) .saturating_add(RocksDbWeight::get().reads(7_u64)) .saturating_add(RocksDbWeight::get().writes(5_u64)) } @@ -173,8 +173,8 @@ impl WeightInfo for () { // Storage: System Events (r:1 w:1) // Storage: Allocations SessionQuota (r:0 w:1) fn renew_quota() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(18_760_000_u64) + // Minimum execution time: 19_270 nanoseconds. + Weight::from_ref_time(19_810_000_u64) .saturating_add(RocksDbWeight::get().reads(7_u64)) .saturating_add(RocksDbWeight::get().writes(5_u64)) } @@ -190,8 +190,8 @@ impl WeightInfo for () { // Storage: Allocations SessionQuota (r:0 w:1) // Storage: Allocations NextSessionQuota (r:0 w:1) fn checked_update_session_quota() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(35_109_000_u64) + // Minimum execution time: 34_590 nanoseconds. + Weight::from_ref_time(35_420_000_u64) .saturating_add(RocksDbWeight::get().reads(9_u64)) .saturating_add(RocksDbWeight::get().writes(7_u64)) } @@ -200,8 +200,8 @@ impl WeightInfo for () { // Storage: Allocations SessionQuotaCalculationSchedule (r:0 w:1) // Storage: Allocations SessionQuotaRenewSchedule (r:0 w:1) fn set_curve_starting_block() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(11_100_000_u64) + // Minimum execution time: 11_190 nanoseconds. + Weight::from_ref_time(11_680_000_u64) .saturating_add(RocksDbWeight::get().reads(1_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) } diff --git a/pallets/grants/Cargo.toml b/pallets/grants/Cargo.toml index 299516f71ff..90dce3b44f4 100644 --- a/pallets/grants/Cargo.toml +++ b/pallets/grants/Cargo.toml @@ -32,16 +32,17 @@ try-runtime = ["frame-support/try-runtime"] [dependencies] log = { version = "0.4.17", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.144", optional = true } +serde = { version = "1.0.152", optional = true } scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.29" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch ="polkadot-v0.9.37" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } -sp-tracing = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-tracing = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } + diff --git a/pallets/grants/src/lib.rs b/pallets/grants/src/lib.rs index 5eaef38fc3a..ba1f15c2319 100644 --- a/pallets/grants/src/lib.rs +++ b/pallets/grants/src/lib.rs @@ -125,9 +125,9 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type Currency: LockableCurrency; - type CancelOrigin: EnsureOrigin; + type CancelOrigin: EnsureOrigin; /// The maximum number of vesting schedule. #[pallet::constant] type MaxSchedule: Get; @@ -144,6 +144,7 @@ pub mod pallet { #[pallet::call] impl Pallet { /// Claim funds that have been vested so far + #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::claim())] pub fn claim(origin: OriginFor) -> DispatchResultWithPostInfo { let who = ensure_signed(origin)?; @@ -159,6 +160,7 @@ pub mod pallet { } /// Wire funds to be vested by the receiver + #[pallet::call_index(1)] #[pallet::weight(T::WeightInfo::add_vesting_schedule())] pub fn add_vesting_schedule( origin: OriginFor, @@ -177,6 +179,7 @@ pub mod pallet { /// claimed they will be auto claimed for the given user. If `limit_to_free_balance` /// is set to true we will not error if the free balance of `who` has less coins /// than what was granted and is being revoked (useful if the state was corrupted). + #[pallet::call_index(2)] #[pallet::weight(T::WeightInfo::cancel_all_vesting_schedules())] pub fn cancel_all_vesting_schedules( origin: OriginFor, @@ -211,6 +214,7 @@ pub mod pallet { /// Allows the `CancelOrigin` to renounce to its privileges of being able to cancel /// `who`'s vesting schedules. + #[pallet::call_index(3)] #[pallet::weight(T::WeightInfo::renounce())] pub fn renounce(origin: OriginFor, who: ::Source) -> DispatchResultWithPostInfo { T::CancelOrigin::try_origin(origin).map(|_| ()).or_else(ensure_root)?; diff --git a/pallets/grants/src/mock.rs b/pallets/grants/src/mock.rs index d9d44fb4f96..36b9e3f6b4b 100644 --- a/pallets/grants/src/mock.rs +++ b/pallets/grants/src/mock.rs @@ -49,8 +49,8 @@ parameter_types! { pub type AccountId = u128; impl frame_system::Config for Test { - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type BlockWeights = (); type BlockLength = (); type SS58Prefix = (); @@ -61,7 +61,7 @@ impl frame_system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -85,7 +85,7 @@ parameter_types! { impl pallet_balances::Config for Test { type Balance = Balance; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type MaxLocks = MaxLocks; type AccountStore = frame_system::Pallet; @@ -105,7 +105,7 @@ parameter_types! { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = PalletBalances; type CancelOrigin = EnsureSignedBy; type MaxSchedule = MaxSchedule; @@ -124,7 +124,7 @@ pub(crate) fn context_events() -> Vec> { System::events() .into_iter() .filter_map(|r| { - if let Event::Vesting(inner) = r.event { + if let RuntimeEvent::Vesting(inner) = r.event { Some(inner) } else { None diff --git a/pallets/grants/src/tests.rs b/pallets/grants/src/tests.rs index 23612562bb5..4148f5d86d3 100644 --- a/pallets/grants/src/tests.rs +++ b/pallets/grants/src/tests.rs @@ -23,8 +23,8 @@ use super::*; use frame_support::{assert_err, assert_noop, assert_ok, traits::WithdrawReasons}; use mock::{ - context_events, CancelOrigin, Event as TestEvent, ExtBuilder, Origin, PalletBalances, System, Test as Runtime, - Vesting, ALICE, BOB, + context_events, CancelOrigin, ExtBuilder, PalletBalances, RuntimeEvent as TestEvent, RuntimeOrigin, System, + Test as Runtime, Vesting, ALICE, BOB, }; use pallet_balances::{BalanceLock, Reasons}; use sp_runtime::DispatchError::BadOrigin; @@ -49,7 +49,7 @@ fn add_vesting_schedule_works() { per_period: 100u64, }; assert_ok!(Vesting::add_vesting_schedule( - Origin::signed(ALICE::get()), + RuntimeOrigin::signed(ALICE::get()), BOB::get(), schedule.clone() )); @@ -70,7 +70,7 @@ fn add_new_vesting_schedule_merges_with_current_locked_balance_and_until() { per_period: 10u64, }; assert_ok!(Vesting::add_vesting_schedule( - Origin::signed(ALICE::get()), + RuntimeOrigin::signed(ALICE::get()), BOB::get(), schedule )); @@ -84,7 +84,7 @@ fn add_new_vesting_schedule_merges_with_current_locked_balance_and_until() { per_period: 7u64, }; assert_ok!(Vesting::add_vesting_schedule( - Origin::signed(ALICE::get()), + RuntimeOrigin::signed(ALICE::get()), BOB::get(), another_schedule )); @@ -110,7 +110,7 @@ fn cannot_use_fund_if_not_claimed() { per_period: 50u64, }; assert_ok!(Vesting::add_vesting_schedule( - Origin::signed(ALICE::get()), + RuntimeOrigin::signed(ALICE::get()), BOB::get(), schedule )); @@ -128,7 +128,7 @@ fn add_vesting_schedule_fails_if_zero_period_or_count() { per_period: 100u64, }; assert_err!( - Vesting::add_vesting_schedule(Origin::signed(ALICE::get()), BOB::get(), schedule), + Vesting::add_vesting_schedule(RuntimeOrigin::signed(ALICE::get()), BOB::get(), schedule), Error::::ZeroVestingPeriod ); @@ -139,7 +139,7 @@ fn add_vesting_schedule_fails_if_zero_period_or_count() { per_period: 100u64, }; assert_err!( - Vesting::add_vesting_schedule(Origin::signed(ALICE::get()), BOB::get(), schedule), + Vesting::add_vesting_schedule(RuntimeOrigin::signed(ALICE::get()), BOB::get(), schedule), Error::::ZeroVestingPeriodCount ); }); @@ -155,7 +155,7 @@ fn add_vesting_schedule_fails_if_transfer_err() { per_period: 100u64, }; assert_err!( - Vesting::add_vesting_schedule(Origin::signed(BOB::get()), ALICE::get(), schedule), + Vesting::add_vesting_schedule(RuntimeOrigin::signed(BOB::get()), ALICE::get(), schedule), pallet_balances::Error::::InsufficientBalance, ); }); @@ -171,7 +171,7 @@ fn add_vesting_schedule_fails_if_overflow() { per_period: u64::max_value(), }; assert_err!( - Vesting::add_vesting_schedule(Origin::signed(ALICE::get()), BOB::get(), schedule), + Vesting::add_vesting_schedule(RuntimeOrigin::signed(ALICE::get()), BOB::get(), schedule), Error::::NumOverflow ); @@ -182,7 +182,7 @@ fn add_vesting_schedule_fails_if_overflow() { per_period: 1u64, }; assert_err!( - Vesting::add_vesting_schedule(Origin::signed(ALICE::get()), BOB::get(), another_schedule), + Vesting::add_vesting_schedule(RuntimeOrigin::signed(ALICE::get()), BOB::get(), another_schedule), Error::::NumOverflow ); }); @@ -198,26 +198,34 @@ fn claim_works() { per_period: 10u64, }; assert_ok!(Vesting::add_vesting_schedule( - Origin::signed(ALICE::get()), + RuntimeOrigin::signed(ALICE::get()), BOB::get(), schedule )); System::set_block_number(11); // remain locked if not claimed - assert!(PalletBalances::transfer(Origin::signed(BOB::get()), ALICE::get(), 10).is_err()); + assert!(PalletBalances::transfer(RuntimeOrigin::signed(BOB::get()), ALICE::get(), 10).is_err()); // unlocked after claiming - assert_ok!(Vesting::claim(Origin::signed(BOB::get()))); - assert_ok!(PalletBalances::transfer(Origin::signed(BOB::get()), ALICE::get(), 10)); + assert_ok!(Vesting::claim(RuntimeOrigin::signed(BOB::get()))); + assert_ok!(PalletBalances::transfer( + RuntimeOrigin::signed(BOB::get()), + ALICE::get(), + 10 + )); // more are still locked - assert!(PalletBalances::transfer(Origin::signed(BOB::get()), ALICE::get(), 1).is_err()); + assert!(PalletBalances::transfer(RuntimeOrigin::signed(BOB::get()), ALICE::get(), 1).is_err()); // does not clear storage assert!(>::contains_key(BOB::get())); System::set_block_number(21); // claim more - assert_ok!(Vesting::claim(Origin::signed(BOB::get()))); - assert_ok!(PalletBalances::transfer(Origin::signed(BOB::get()), ALICE::get(), 10)); + assert_ok!(Vesting::claim(RuntimeOrigin::signed(BOB::get()))); + assert_ok!(PalletBalances::transfer( + RuntimeOrigin::signed(BOB::get()), + ALICE::get(), + 10 + )); // all used up assert_eq!(PalletBalances::free_balance(BOB::get()), 0); // clears the storage @@ -231,7 +239,7 @@ fn claim_works() { fn cancel_restricted_origin() { ExtBuilder::default().build().execute_with(|| { assert_noop!( - Vesting::cancel_all_vesting_schedules(Origin::signed(ALICE::get()), BOB::get(), CancelOrigin::get()), + Vesting::cancel_all_vesting_schedules(RuntimeOrigin::signed(ALICE::get()), BOB::get(), CancelOrigin::get()), BadOrigin ); }) @@ -247,7 +255,7 @@ fn cancel_auto_claim_recipient_funds_and_wire_the_rest() { per_period: 10u64, }; assert_ok!(Vesting::add_vesting_schedule( - Origin::signed(ALICE::get()), + RuntimeOrigin::signed(ALICE::get()), BOB::get(), schedule )); @@ -255,17 +263,21 @@ fn cancel_auto_claim_recipient_funds_and_wire_the_rest() { System::set_block_number(11); assert_ok!(Vesting::cancel_all_vesting_schedules( - Origin::signed(CancelOrigin::get()), + RuntimeOrigin::signed(CancelOrigin::get()), BOB::get(), CancelOrigin::get() )); // Auto claim - assert_ok!(PalletBalances::transfer(Origin::signed(BOB::get()), ALICE::get(), 10)); + assert_ok!(PalletBalances::transfer( + RuntimeOrigin::signed(BOB::get()), + ALICE::get(), + 10 + )); // Wire the rest assert_ok!(PalletBalances::transfer( - Origin::signed(CancelOrigin::get()), + RuntimeOrigin::signed(CancelOrigin::get()), ALICE::get(), 10 )); @@ -282,7 +294,7 @@ fn cancel_clears_storage() { per_period: 10u64, }; assert_ok!(Vesting::add_vesting_schedule( - Origin::signed(ALICE::get()), + RuntimeOrigin::signed(ALICE::get()), BOB::get(), schedule )); @@ -290,7 +302,7 @@ fn cancel_clears_storage() { System::set_block_number(11); assert_ok!(Vesting::cancel_all_vesting_schedules( - Origin::signed(CancelOrigin::get()), + RuntimeOrigin::signed(CancelOrigin::get()), BOB::get(), CancelOrigin::get() )); @@ -322,7 +334,7 @@ fn cancel_tolerates_corrupted_state() { assert!(!>::contains_key(BOB::get())); let ans = Vesting::add_vesting_schedule( - Origin::signed(ALICE::get()), + RuntimeOrigin::signed(ALICE::get()), BOB::get(), allice_vesting_to_bob_schedule.clone(), ); @@ -360,9 +372,10 @@ fn cancel_tolerates_corrupted_state() { per_period: 1_000u64, // definitely too much money }; - let ans = >::try_mutate(BOB::get(), |s| -> Result<(), ()> { + let ans = >::try_mutate(BOB::get(), |s| -> Result<(), VestingSchedule> { s.try_push(bob_modified_vesting_schedule.clone()) }); + assert_ok!(ans); assert!(>::contains_key(BOB::get())); @@ -379,8 +392,11 @@ fn cancel_tolerates_corrupted_state() { System::set_block_number(11); assert!(>::contains_key(BOB::get())); - let res_cancel_all_vesting_schedules = - Vesting::cancel_all_vesting_schedules(Origin::signed(CancelOrigin::get()), BOB::get(), CancelOrigin::get()); + let res_cancel_all_vesting_schedules = Vesting::cancel_all_vesting_schedules( + RuntimeOrigin::signed(CancelOrigin::get()), + BOB::get(), + CancelOrigin::get(), + ); assert_ok!(res_cancel_all_vesting_schedules); assert!(!>::contains_key(BOB::get())); @@ -406,7 +422,7 @@ fn cannot_vest_to_self() { ExtBuilder::default().one_hundred_for_alice().build().execute_with(|| { assert_noop!( Vesting::add_vesting_schedule( - Origin::signed(ALICE::get()), + RuntimeOrigin::signed(ALICE::get()), ALICE::get(), VestingSchedule { start: 0u64, @@ -450,7 +466,7 @@ fn add_vesting_schedule_overflow_check() { ]; assert_ok!(Vesting::add_vesting_schedule( - Origin::signed(ALICE::get()), + RuntimeOrigin::signed(ALICE::get()), BOB::get(), schedules[0].clone(), )); @@ -461,7 +477,7 @@ fn add_vesting_schedule_overflow_check() { assert_eq!(context_events(), expected); assert_ok!(Vesting::add_vesting_schedule( - Origin::signed(ALICE::get()), + RuntimeOrigin::signed(ALICE::get()), BOB::get(), schedules[1].clone(), )); @@ -475,7 +491,7 @@ fn add_vesting_schedule_overflow_check() { assert_eq!(context_events(), expected); assert_err!( - Vesting::add_vesting_schedule(Origin::signed(ALICE::get()), BOB::get(), schedules[2].clone(),), + Vesting::add_vesting_schedule(RuntimeOrigin::signed(ALICE::get()), BOB::get(), schedules[2].clone(),), >::MaxScheduleOverflow, ); @@ -503,7 +519,7 @@ fn add_vesting_schedule_overflow_cfg_min_check() { assert_eq!(Vesting::vesting_schedules(&BOB::get()).to_vec().len(), 0); assert_err!( - Vesting::add_vesting_schedule(Origin::signed(ALICE::get()), BOB::get(), schedules[0].clone(),), + Vesting::add_vesting_schedule(RuntimeOrigin::signed(ALICE::get()), BOB::get(), schedules[0].clone(),), >::MaxScheduleOverflow, ); @@ -515,7 +531,7 @@ fn add_vesting_schedule_overflow_cfg_min_check() { mock::MAX_SCHEDULE.with(|v| *v.borrow_mut() = 1); assert_ok!(Vesting::add_vesting_schedule( - Origin::signed(ALICE::get()), + RuntimeOrigin::signed(ALICE::get()), BOB::get(), schedules[0].clone(), )); @@ -548,7 +564,7 @@ fn add_vesting_schedule_overflow_cfg_max_check() { (0..schedule_max).into_iter().for_each(|iter_index| { assert_ok!(Vesting::add_vesting_schedule( - Origin::signed(ALICE::get()), + RuntimeOrigin::signed(ALICE::get()), BOB::get(), schedules[0].clone(), )); @@ -560,7 +576,7 @@ fn add_vesting_schedule_overflow_cfg_max_check() { }); assert_err!( - Vesting::add_vesting_schedule(Origin::signed(ALICE::get()), BOB::get(), schedules[0].clone(),), + Vesting::add_vesting_schedule(RuntimeOrigin::signed(ALICE::get()), BOB::get(), schedules[0].clone(),), >::MaxScheduleOverflow, ); @@ -575,7 +591,10 @@ fn add_vesting_schedule_overflow_cfg_max_check() { #[test] fn renounce_only_works_for_cancel_origin() { ExtBuilder::default().build().execute_with(|| { - assert_noop!(Vesting::renounce(Origin::signed(ALICE::get()), BOB::get()), BadOrigin); + assert_noop!( + Vesting::renounce(RuntimeOrigin::signed(ALICE::get()), BOB::get()), + BadOrigin + ); }) } @@ -589,16 +608,23 @@ fn renounce_privileges() { per_period: 10u64, }; assert_ok!(Vesting::add_vesting_schedule( - Origin::signed(ALICE::get()), + RuntimeOrigin::signed(ALICE::get()), BOB::get(), schedule )); assert!(!Vesting::renounced(BOB::get())); - assert_ok!(Vesting::renounce(Origin::signed(CancelOrigin::get()), BOB::get())); + assert_ok!(Vesting::renounce( + RuntimeOrigin::signed(CancelOrigin::get()), + BOB::get() + )); assert!(Vesting::renounced(BOB::get())); assert_noop!( - Vesting::cancel_all_vesting_schedules(Origin::signed(CancelOrigin::get()), BOB::get(), CancelOrigin::get()), + Vesting::cancel_all_vesting_schedules( + RuntimeOrigin::signed(CancelOrigin::get()), + BOB::get(), + CancelOrigin::get() + ), Error::::Renounced ); }); diff --git a/pallets/grants/src/weights.rs b/pallets/grants/src/weights.rs index 1888cbf57ed..793beb657ab 100644 --- a/pallets/grants/src/weights.rs +++ b/pallets/grants/src/weights.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for pallet_grants //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-11-11, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! HOSTNAME: `chain-bench-012bd056`, CPU: `AMD EPYC 7B13` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 @@ -64,8 +64,8 @@ impl WeightInfo for SubstrateWeight { // Storage: System Events (r:1 w:1) // Storage: Balances Locks (r:1 w:1) fn add_vesting_schedule() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(81_929_000_u64) + // Minimum execution time: 81_210 nanoseconds. + Weight::from_ref_time(83_410_000_u64) .saturating_add(T::DbWeight::get().reads(9_u64)) .saturating_add(T::DbWeight::get().writes(6_u64)) } @@ -78,8 +78,8 @@ impl WeightInfo for SubstrateWeight { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn claim() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(55_190_000_u64) + // Minimum execution time: 54_280 nanoseconds. + Weight::from_ref_time(55_780_000_u64) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -94,8 +94,8 @@ impl WeightInfo for SubstrateWeight { // Storage: System Events (r:1 w:1) // Storage: Vesting CounterForVestingSchedules (r:1 w:1) fn cancel_all_vesting_schedules() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(110_630_000_u64) + // Minimum execution time: 108_160 nanoseconds. + Weight::from_ref_time(110_900_000_u64) .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(7_u64)) } @@ -105,8 +105,8 @@ impl WeightInfo for SubstrateWeight { // Storage: System Events (r:1 w:1) // Storage: Vesting Renounced (r:0 w:1) fn renounce() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(19_910_000_u64) + // Minimum execution time: 20_149 nanoseconds. + Weight::from_ref_time(21_069_000_u64) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -122,8 +122,8 @@ impl WeightInfo for () { // Storage: System Events (r:1 w:1) // Storage: Balances Locks (r:1 w:1) fn add_vesting_schedule() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(81_929_000_u64) + // Minimum execution time: 81_210 nanoseconds. + Weight::from_ref_time(83_410_000_u64) .saturating_add(RocksDbWeight::get().reads(9_u64)) .saturating_add(RocksDbWeight::get().writes(6_u64)) } @@ -136,8 +136,8 @@ impl WeightInfo for () { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn claim() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(55_190_000_u64) + // Minimum execution time: 54_280 nanoseconds. + Weight::from_ref_time(55_780_000_u64) .saturating_add(RocksDbWeight::get().reads(8_u64)) .saturating_add(RocksDbWeight::get().writes(4_u64)) } @@ -152,8 +152,8 @@ impl WeightInfo for () { // Storage: System Events (r:1 w:1) // Storage: Vesting CounterForVestingSchedules (r:1 w:1) fn cancel_all_vesting_schedules() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(110_630_000_u64) + // Minimum execution time: 108_160 nanoseconds. + Weight::from_ref_time(110_900_000_u64) .saturating_add(RocksDbWeight::get().reads(11_u64)) .saturating_add(RocksDbWeight::get().writes(7_u64)) } @@ -163,8 +163,8 @@ impl WeightInfo for () { // Storage: System Events (r:1 w:1) // Storage: Vesting Renounced (r:0 w:1) fn renounce() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(19_910_000_u64) + // Minimum execution time: 20_149 nanoseconds. + Weight::from_ref_time(21_069_000_u64) .saturating_add(RocksDbWeight::get().reads(4_u64)) .saturating_add(RocksDbWeight::get().writes(3_u64)) } diff --git a/pallets/mandate/Cargo.toml b/pallets/mandate/Cargo.toml index 77b88cff746..47a6a50b28c 100644 --- a/pallets/mandate/Cargo.toml +++ b/pallets/mandate/Cargo.toml @@ -20,13 +20,13 @@ try-runtime = ["frame-support/try-runtime"] [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.144", optional = true, features = ["derive"] } +serde = { version = "1.0.152", optional = true, features = ["derive"] } scale-info = { version = "2.0.1", default-features = false, features = [ "derive", ] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.29" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.37" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } diff --git a/pallets/mandate/src/lib.rs b/pallets/mandate/src/lib.rs index 156e2dfe8e1..f9f1d1f8123 100644 --- a/pallets/mandate/src/lib.rs +++ b/pallets/mandate/src/lib.rs @@ -26,9 +26,9 @@ pub use pallet::*; #[frame_support::pallet] pub mod pallet { use frame_support::{ + dispatch::GetDispatchInfo, pallet_prelude::*, traits::{EnsureOrigin, UnfilteredDispatchable}, - weights::GetDispatchInfo, Parameter, }; use frame_system::pallet_prelude::*; @@ -37,12 +37,12 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; - type Call: Parameter + UnfilteredDispatchable + GetDispatchInfo; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; + type RuntimeCall: Parameter + UnfilteredDispatchable + GetDispatchInfo; /// Origin that can call this module and execute sudo actions. Typically /// the `collective` module. - type ExternalOrigin: EnsureOrigin; + type ExternalOrigin: EnsureOrigin; } #[pallet::pallet] @@ -56,8 +56,15 @@ pub mod pallet { #[pallet::call] impl Pallet { /// Let the configured origin dispatch a call as root - #[pallet::weight(call.get_dispatch_info().weight.saturating_add(Weight::from_ref_time(10_000)))] - pub fn apply(origin: OriginFor, call: Box<::Call>) -> DispatchResultWithPostInfo { + #[pallet::call_index(0)] + #[pallet::weight({ + let dispatch_info = call.get_dispatch_info(); + ( + dispatch_info.weight.saturating_add(Weight::from_ref_time(10_000)), + dispatch_info.class, + ) + })] + pub fn apply(origin: OriginFor, call: Box<::RuntimeCall>) -> DispatchResultWithPostInfo { T::ExternalOrigin::ensure_origin(origin)?; // Shamelessly stollen from the `sudo` module diff --git a/pallets/reserve/Cargo.toml b/pallets/reserve/Cargo.toml index 3ca0bf7868b..3e8d37ac490 100644 --- a/pallets/reserve/Cargo.toml +++ b/pallets/reserve/Cargo.toml @@ -25,16 +25,16 @@ try-runtime = ["frame-support/try-runtime"] [dependencies] codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.144", optional = true, features = ["derive"] } +serde = { version = "1.0.152", optional = true, features = ["derive"] } scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.29" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.37" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.37" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.37" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.37" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.37" } support = { path = "../../support" } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.37" } diff --git a/pallets/reserve/src/lib.rs b/pallets/reserve/src/lib.rs index 8c378a22c7c..3b1e39d964e 100644 --- a/pallets/reserve/src/lib.rs +++ b/pallets/reserve/src/lib.rs @@ -26,8 +26,8 @@ mod benchmarking; mod tests; use frame_support::{ + dispatch::GetDispatchInfo, traits::{Currency, ExistenceRequirement, Get, Imbalance, OnUnbalanced}, - weights::GetDispatchInfo, PalletId, }; use sp_runtime::traits::{AccountIdConversion, Dispatchable}; @@ -54,10 +54,10 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; - type ExternalOrigin: EnsureOrigin; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; + type ExternalOrigin: EnsureOrigin; type Currency: Currency; - type Call: Parameter + Dispatchable + GetDispatchInfo; + type RuntimeCall: Parameter + Dispatchable + GetDispatchInfo; type PalletId: Get; /// Weight information for extrinsics in this pallet. type WeightInfo: WeightInfo; @@ -73,6 +73,7 @@ pub mod pallet { #[pallet::call] impl, I: 'static> Pallet { /// Spend `amount` funds from the reserve account to `to`. + #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::spend())] pub fn spend(origin: OriginFor, to: T::AccountId, amount: BalanceOf) -> DispatchResultWithPostInfo { T::ExternalOrigin::try_origin(origin).map(|_| ()).or_else(ensure_root)?; @@ -85,6 +86,7 @@ pub mod pallet { } /// Deposit `amount` tokens in the treasure account + #[pallet::call_index(1)] #[pallet::weight(T::WeightInfo::tip())] pub fn tip(origin: OriginFor, amount: BalanceOf) -> DispatchResultWithPostInfo { let tipper = ensure_signed(origin)?; @@ -98,6 +100,7 @@ pub mod pallet { #[allow(clippy::boxed_local)] /// Dispatch a call as coming from the reserve account + #[pallet::call_index(2)] #[pallet::weight({ let dispatch_info = call.get_dispatch_info(); ( @@ -105,7 +108,7 @@ pub mod pallet { dispatch_info.class, ) })] - pub fn apply_as(origin: OriginFor, call: Box<>::Call>) -> DispatchResultWithPostInfo { + pub fn apply_as(origin: OriginFor, call: Box<>::RuntimeCall>) -> DispatchResultWithPostInfo { T::ExternalOrigin::try_origin(origin).map(|_| ()).or_else(ensure_root)?; let res = call.dispatch(frame_system::RawOrigin::Signed(Self::account_id()).into()); diff --git a/pallets/reserve/src/tests.rs b/pallets/reserve/src/tests.rs index 115e3e9c808..471a1b4187a 100644 --- a/pallets/reserve/src/tests.rs +++ b/pallets/reserve/src/tests.rs @@ -49,8 +49,8 @@ parameter_types! { pub const BlockHashCount: u64 = 250; } impl frame_system::Config for Test { - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type BlockWeights = (); type BlockLength = (); type SS58Prefix = (); @@ -61,7 +61,7 @@ impl frame_system::Config for Test { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = (); + type RuntimeEvent = (); type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -79,7 +79,7 @@ parameter_types! { } impl pallet_balances::Config for Test { type Balance = u64; - type Event = (); + type RuntimeEvent = (); type DustRemoval = (); type MaxLocks = MaxLocks; type ExistentialDeposit = (); @@ -96,10 +96,10 @@ parameter_types! { pub const ReserveModuleId: PalletId = PalletId(*b"py/resrv"); } impl Config for Test { - type Event = (); + type RuntimeEvent = (); type Currency = pallet_balances::Pallet; type ExternalOrigin = EnsureSignedBy; - type Call = Call; + type RuntimeCall = RuntimeCall; type PalletId = ReserveModuleId; type WeightInfo = (); } @@ -117,7 +117,7 @@ pub fn new_test_ext() -> sp_io::TestExternalities { #[test] fn spend_error_if_bad_origin() { new_test_ext().execute_with(|| { - assert_noop!(TestModule::spend(Origin::signed(0), 1, 1), BadOrigin); + assert_noop!(TestModule::spend(RuntimeOrigin::signed(0), 1, 1), BadOrigin); }) } @@ -128,7 +128,7 @@ fn spend_funds_to_target() { assert_eq!(Balances::free_balance(TestModule::account_id()), 100); assert_eq!(Balances::free_balance(3), 0); - assert_ok!(TestModule::spend(Origin::signed(Admin::get()), 3, 100)); + assert_ok!(TestModule::spend(RuntimeOrigin::signed(Admin::get()), 3, 100)); assert_eq!(Balances::free_balance(3), 100); assert_eq!(Balances::free_balance(TestModule::account_id()), 0); }) @@ -139,27 +139,29 @@ fn tip() { new_test_ext().execute_with(|| { TestCurrency::make_free_balance_be(&999, 100); - assert_ok!(TestModule::tip(Origin::signed(999), 50)); + assert_ok!(TestModule::tip(RuntimeOrigin::signed(999), 50)); assert_eq!(Balances::free_balance(999), 50); assert_eq!(Balances::free_balance(TestModule::account_id()), 50); }) } -fn make_call(value: u8) -> Box { - Box::new(Call::System(frame_system::Call::::remark { remark: vec![value] })) +fn make_call(value: u8) -> Box { + Box::new(RuntimeCall::System(frame_system::Call::::remark { + remark: vec![value], + })) } #[test] fn apply_as_error_if_bad_origin() { new_test_ext().execute_with(|| { - assert_noop!(TestModule::apply_as(Origin::signed(0), make_call(1)), BadOrigin); + assert_noop!(TestModule::apply_as(RuntimeOrigin::signed(0), make_call(1)), BadOrigin); }) } #[test] fn apply_as_works() { new_test_ext().execute_with(|| { - assert_ok!(TestModule::apply_as(Origin::signed(Admin::get()), make_call(1))); + assert_ok!(TestModule::apply_as(RuntimeOrigin::signed(Admin::get()), make_call(1))); }) } diff --git a/pallets/reserve/src/weights.rs b/pallets/reserve/src/weights.rs index 2ff61a41471..e6559669180 100644 --- a/pallets/reserve/src/weights.rs +++ b/pallets/reserve/src/weights.rs @@ -19,7 +19,7 @@ //! Autogenerated weights for pallet_reserve //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-11-11, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! HOSTNAME: `chain-bench-012bd056`, CPU: `AMD EPYC 7B13` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 @@ -59,8 +59,8 @@ impl WeightInfo for SubstrateWeight { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn tip() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(26_320_000_u64) + // Minimum execution time: 27_300 nanoseconds. + Weight::from_ref_time(27_930_000_u64) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -70,8 +70,8 @@ impl WeightInfo for SubstrateWeight { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn spend() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(25_310_000_u64) + // Minimum execution time: 27_400 nanoseconds. + Weight::from_ref_time(28_290_000_u64) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -84,8 +84,8 @@ impl WeightInfo for () { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn tip() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(26_320_000_u64) + // Minimum execution time: 27_300 nanoseconds. + Weight::from_ref_time(27_930_000_u64) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } @@ -95,8 +95,8 @@ impl WeightInfo for () { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn spend() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(25_310_000_u64) + // Minimum execution time: 27_400 nanoseconds. + Weight::from_ref_time(28_290_000_u64) .saturating_add(RocksDbWeight::get().reads(6_u64)) .saturating_add(RocksDbWeight::get().writes(2_u64)) } diff --git a/pallets/staking/Cargo.toml b/pallets/staking/Cargo.toml index 3110d94cb16..8243756b73a 100644 --- a/pallets/staking/Cargo.toml +++ b/pallets/staking/Cargo.toml @@ -38,22 +38,22 @@ try-runtime = ["frame-support/try-runtime"] [dependencies] log = { version = "0.4.17", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } -serde = { version = "1.0.144", optional = true } +serde = { version = "1.0.152", optional = true } scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.29" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } -pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false , features = ["historical"], branch = "polkadot-v0.9.29" } -pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } -sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true , branch = "polkadot-v0.9.37" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.37" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.37" } +pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false , features = ["historical"], branch = "polkadot-v0.9.37" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.37" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.37" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.37" } +sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.37" } [dev-dependencies] -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } -sp-tracing = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } -substrate-test-utils = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } -pallet-membership = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.29" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.37" } +sp-tracing = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.37" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.37" } +substrate-test-utils = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.37" } +pallet-membership = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "polkadot-v0.9.37" } diff --git a/pallets/staking/src/benchmarking.rs b/pallets/staking/src/benchmarking.rs index 6cbde1e543c..ef11f064efc 100644 --- a/pallets/staking/src/benchmarking.rs +++ b/pallets/staking/src/benchmarking.rs @@ -40,9 +40,9 @@ const MAX_VALIDATORS: u32 = 1000; const MAX_SLASHES: u32 = 1000; const MAX_SESSION: u32 = 1000; -fn assert_last_event(generic_event: ::Event) { +fn assert_last_event(generic_event: ::RuntimeEvent) { let events = frame_system::Pallet::::events(); - let system_event: ::Event = generic_event.into(); + let system_event: ::RuntimeEvent = generic_event.into(); // compare to the last event record let EventRecord { event, .. } = &events[events.len() - 1]; assert_eq!(event, &system_event); diff --git a/pallets/staking/src/lib.rs b/pallets/staking/src/lib.rs index 3c0b60ce143..950bdeb4214 100644 --- a/pallets/staking/src/lib.rs +++ b/pallets/staking/src/lib.rs @@ -38,7 +38,6 @@ use scale_info::TypeInfo; use sp_runtime::RuntimeDebug; pub(crate) mod hooks; -pub(crate) mod migrations; pub(crate) mod slashing; pub(crate) mod types; @@ -100,7 +99,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; /// The staking balance. type Currency: LockableCurrency; /// Handler for the unbalanced reduction when slashing a staker. @@ -146,7 +145,7 @@ pub mod pallet { /// Max number of unbond request supported by queue type MaxChunkUnlock: Get; /// The origin which can cancel a deferred slash. Root can always do this. - type CancelOrigin: EnsureOrigin; + type CancelOrigin: EnsureOrigin; /// Weight information for extrinsics in this pallet. type WeightInfo: WeightInfo; } @@ -156,28 +155,12 @@ pub mod pallet { #[pallet::without_storage_info] pub struct Pallet(PhantomData); - #[pallet::hooks] - impl Hooks> for Pallet { - #[cfg(feature = "try-runtime")] - fn pre_upgrade() -> Result<(), &'static str> { - migrations::v1::pre_upgrade::() - } - - fn on_runtime_upgrade() -> frame_support::weights::Weight { - migrations::v1::on_runtime_upgrade::() - } - - #[cfg(feature = "try-runtime")] - fn post_upgrade() -> Result<(), &'static str> { - migrations::v1::post_upgrade::() - } - } - #[pallet::call] impl Pallet { /// Set the validators who cannot be slashed (if any). /// /// The dispatch origin must be Root. + #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::set_invulnerables(invulnerables.len() as u32))] pub fn set_invulnerables(origin: OriginFor, invulnerables: Vec) -> DispatchResultWithPostInfo { T::CancelOrigin::try_origin(origin).map(|_| ()).or_else(ensure_root)?; @@ -187,6 +170,7 @@ pub mod pallet { } /// Set the total number of validator selected per round /// - changes are not applied until the start of the next round + #[pallet::call_index(1)] #[pallet::weight(T::WeightInfo::set_total_validator_per_round(*new))] pub fn set_total_validator_per_round(origin: OriginFor, new: u32) -> DispatchResultWithPostInfo { T::CancelOrigin::try_origin(origin).map(|_| ()).or_else(ensure_root)?; @@ -196,6 +180,7 @@ pub mod pallet { Self::deposit_event(Event::TotalSelectedSet(old, new)); Ok(().into()) } + #[pallet::call_index(2)] #[pallet::weight(T::WeightInfo::set_staking_limits())] pub fn set_staking_limits( origin: OriginFor, @@ -249,6 +234,7 @@ pub mod pallet { Ok(().into()) } /// Join the set of validators pool + #[pallet::call_index(3)] #[pallet::weight(T::WeightInfo::validator_join_pool())] pub fn validator_join_pool(origin: OriginFor, bond: BalanceOf) -> DispatchResultWithPostInfo { log::debug!("validator_join_pool:[{:#?}] - Entry!!!", line!(),); @@ -311,6 +297,7 @@ pub mod pallet { /// the account is immediately removed from the validator pool /// to prevent selection as a validator, but unbonding /// is executed with a delay of `BondedDuration` rounds. + #[pallet::call_index(4)] #[pallet::weight(T::WeightInfo::validator_exit_pool())] pub fn validator_exit_pool(origin: OriginFor) -> DispatchResultWithPostInfo { let validator = ensure_signed(origin)?; @@ -347,6 +334,7 @@ pub mod pallet { Ok(().into()) } /// Bond more for validator + #[pallet::call_index(5)] #[pallet::weight(T::WeightInfo::validator_bond_more())] pub fn validator_bond_more(origin: OriginFor, more: BalanceOf) -> DispatchResultWithPostInfo { let validator = ensure_signed(origin)?; @@ -391,6 +379,7 @@ pub mod pallet { Ok(().into()) } /// Bond less for validator + #[pallet::call_index(6)] #[pallet::weight(T::WeightInfo::validator_bond_less())] pub fn validator_bond_less(origin: OriginFor, less: BalanceOf) -> DispatchResultWithPostInfo { let validator = ensure_signed(origin)?; @@ -435,6 +424,7 @@ pub mod pallet { } /// If caller is not a nominator, then join the set of nominators /// If caller is a nominator, then makes nomination to change their nomination state + #[pallet::call_index(7)] #[pallet::weight(T::WeightInfo::nominator_nominate())] pub fn nominator_nominate( origin: OriginFor, @@ -540,6 +530,7 @@ pub mod pallet { Ok(().into()) } /// Revoke an existing nomination + #[pallet::call_index(8)] #[pallet::weight(T::WeightInfo::nominator_denominate())] pub fn nominator_denominate(origin: OriginFor, validator: T::AccountId) -> DispatchResultWithPostInfo { let acc = ensure_signed(origin)?; @@ -552,6 +543,7 @@ pub mod pallet { } /// Quit the set of nominators and, by implication, revoke all ongoing nominations + #[pallet::call_index(9)] #[pallet::weight(T::WeightInfo::nominator_denominate_all())] pub fn nominator_denominate_all(origin: OriginFor) -> DispatchResultWithPostInfo { let acc = ensure_signed(origin)?; @@ -565,6 +557,7 @@ pub mod pallet { Ok(().into()) } /// Bond more for nominators with respect to a specific validator + #[pallet::call_index(10)] #[pallet::weight(T::WeightInfo::nominator_bond_more())] pub fn nominator_bond_more( origin: OriginFor, @@ -623,6 +616,7 @@ pub mod pallet { Ok(().into()) } /// Bond less for nominators with respect to a specific nominated validator + #[pallet::call_index(11)] #[pallet::weight(T::WeightInfo::nominator_bond_less())] pub fn nominator_bond_less( origin: OriginFor, @@ -676,6 +670,7 @@ pub mod pallet { Ok(().into()) } + #[pallet::call_index(12)] #[pallet::weight(T::WeightInfo::nominator_move_nomination())] pub fn nominator_move_nomination( origin: OriginFor, @@ -802,6 +797,7 @@ pub mod pallet { Ok(().into()) } + #[pallet::call_index(13)] #[pallet::weight(T::WeightInfo::unbond_frozen())] pub fn unbond_frozen(origin: OriginFor) -> DispatchResultWithPostInfo { let nominator_acc = ensure_signed(origin)?; @@ -842,6 +838,7 @@ pub mod pallet { Ok(().into()) } + #[pallet::call_index(14)] #[pallet::weight(T::WeightInfo::withdraw_unbonded())] pub fn withdraw_unbonded(origin: OriginFor) -> DispatchResultWithPostInfo { let acc = ensure_signed(origin)?; @@ -889,6 +886,7 @@ pub mod pallet { Ok(().into()) } + #[pallet::call_index(15)] #[pallet::weight(T::WeightInfo::withdraw_staking_rewards())] pub fn withdraw_staking_rewards(origin: OriginFor) -> DispatchResultWithPostInfo { let acc = ensure_signed(origin)?; @@ -924,6 +922,7 @@ pub mod pallet { /// Can be called by the `T::SlashCancelOrigin`. /// /// Parameters: session index and validator list of the slashes for that session to kill. + #[pallet::call_index(16)] #[pallet::weight(T::WeightInfo::slash_cancel_deferred(*session_idx, controllers.len() as u32))] pub fn slash_cancel_deferred( origin: OriginFor, @@ -1353,13 +1352,13 @@ pub mod pallet { let _ = if let Some(nominated_val) = opt_val { >::nominator_nominate( - T::Origin::from(Some(actor.clone()).into()), + T::RuntimeOrigin::from(Some(actor.clone()).into()), nominated_val.clone(), balance, false, ) } else { - >::validator_join_pool(T::Origin::from(Some(actor.clone()).into()), balance) + >::validator_join_pool(T::RuntimeOrigin::from(Some(actor.clone()).into()), balance) }; } diff --git a/pallets/staking/src/migrations.rs b/pallets/staking/src/migrations.rs deleted file mode 100644 index 7dcd0e50cf1..00000000000 --- a/pallets/staking/src/migrations.rs +++ /dev/null @@ -1,354 +0,0 @@ -/* - * This file is part of the Nodle Chain distributed at https://github.com/NodleCode/chain - * Copyright (C) 2020-2022 Nodle International - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -use sp_runtime::traits::Zero; -use sp_std::vec::Vec; - -pub mod v1 { - use super::*; - - use crate::{ - types::Validator, BalanceOf, Config, Invulnerables, Releases, SlashRewardProportion, StakingMaxValidators, - StakingMinNominationChillThreshold, StakingMinNominatorTotalBond, StakingMinStakeSessionSelection, - StakingMinValidatorBond, StorageVersion, TotalSelected, ValidatorFee, ValidatorState, - }; - use frame_support::{storage::migration::get_storage_value, traits::Get, weights::Weight}; - - pub fn on_runtime_upgrade() -> Weight { - log::info!("Starting Poa to Staking migration..."); - - log::info!( - "on_runtime_upgrade[{:#?}]=> Running migration with current storage version {:?} / onchain {:?}", - line!(), - crate::Releases::V1, - >::get(), - ); - - // Check for storage version - if >::get() != Releases::V0 { - return T::DbWeight::get().reads(1); - } - - let pallet_prefix: &[u8] = b"ValidatorsSet"; - let storage_item_prefix: &[u8] = b"Members"; - - let weight = if let Some(validator_members) = - get_storage_value::>(pallet_prefix, storage_item_prefix, &[]) - { - let mut weight: Weight = T::DbWeight::get().reads_writes(1, 0); - - let pre_invulnerable_validators = >::get(); - if !pre_invulnerable_validators.is_empty() { - weight = weight.saturating_add(T::DbWeight::get().reads_writes(1, 0)); - - let mut post_invulnerable_validators = pre_invulnerable_validators - .iter() - .chain(validator_members.iter()) - .cloned() - .collect::>(); - - post_invulnerable_validators.sort(); - post_invulnerable_validators.dedup(); - - >::put(post_invulnerable_validators.clone()); - weight = weight.saturating_add(T::DbWeight::get().reads_writes(0, 1)); - } else { - log::info!("Staking runtime upgrade Genesis config"); - - >::put(validator_members.to_vec()); - - // Set collator commission to default config - >::put(T::DefaultValidatorFee::get()); - // Set total selected validators to minimum config - >::put(T::MinSelectedValidators::get()); - // Set default slash reward fraction - >::put(T::DefaultSlashRewardProportion::get()); - - >::put(T::DefaultStakingMaxValidators::get()); - >::put(T::DefaultStakingMinStakeSessionSelection::get()); - >::put(T::DefaultStakingMinValidatorBond::get()); - >::put(T::DefaultStakingMinNominationChillThreshold::get()); - >::put(T::DefaultStakingMinNominatorTotalBond::get()); - - weight = weight.saturating_add(T::DbWeight::get().reads_writes(0, 5)); - } - - weight = validator_members.iter().fold(weight, |mut weight, valid_acc| { - if >::contains_key(valid_acc) { - weight = weight.saturating_add(T::DbWeight::get().reads_writes(1, 0)); - log::trace!( - "on_runtime_upgrade>[{:#?}]=> - Already staker Ignoring Address -[{:#?}]", - line!(), - valid_acc - ); - } else { - log::trace!( - "on_runtime_upgrade>[{:#?}]=> - Adding Address -[{:#?}]", - line!(), - valid_acc - ); - - >::insert( - valid_acc, - Validator::>::new(valid_acc.clone(), Zero::zero()), - ); - - log::trace!( - "on_runtime_upgrade>[{:#?}]=> - Address Added-[{:#?}]", - line!(), - >::contains_key(valid_acc), - ); - - weight = weight.saturating_add(T::DbWeight::get().reads_writes(0, 1)); - } - - weight - }); - - >::put(crate::Releases::V1); - - log::info!( - "on_runtime_upgrade>[{:#?}]=>Sucess!!! POA Validators of len {:#?} moved to Staking pallet", - line!(), - validator_members.len() - ); - weight - } else { - log::info!( - "on_runtime_upgrade[{:#?}]=> Migration did not executed, Storage ValidatorsSet doesn't exist", - line!(), - ); - T::DbWeight::get().reads(1) - }; - weight - } - - #[cfg(feature = "try-runtime")] - pub fn pre_upgrade() -> Result<(), &'static str> { - log::info!( - "pre_upgrade[{:#?}]=> with current storage version {:?} / on-chain {:?}", - line!(), - crate::Releases::V1, - >::get(), - ); - - if >::get() == Releases::V0 { - let pallet_prefix: &[u8] = b"ValidatorsSet"; - let storage_item_prefix: &[u8] = b"Members"; - let stored_data = get_storage_value::>(pallet_prefix, storage_item_prefix, &[]) - .ok_or("No ValidatorsSet storage")?; - log::info!( - "pre_upgrade[{:#?}]=> ValidatorsSet count :: [{:#?}]", - line!(), - stored_data.len(), - ); - } else { - log::info!("pallet-grants::pre_upgrade: No migration is expected"); - } - - Ok(()) - } - - #[cfg(feature = "try-runtime")] - pub fn post_upgrade() -> Result<(), &'static str> { - log::info!( - "post_upgrade[{:#?}]=> with current storage version {:?} / on-chain {:?}", - line!(), - crate::Releases::V1, - >::get(), - ); - - if >::get() == Releases::V1 { - let pallet_prefix: &[u8] = b"ValidatorsSet"; - let storage_item_prefix: &[u8] = b"Members"; - - let validator_members = if let Some(validator_members) = - get_storage_value::>(pallet_prefix, storage_item_prefix, &[]) - { - Ok(validator_members) - } else { - Err("Storage ValidatorsSet not found") - }?; - - let invulnerables = >::get(); - - log::info!( - "post_upgrade[{:#?}]=> Migration done. validators members::[{:#?}] invulnerables::[{:#?}]", - line!(), - validator_members.len(), - invulnerables.len(), - ); - } else { - log::info!( - "post_upgrade[{:#?}]=> Migration did not execute. This probably should be removed", - line!(), - ); - } - - Ok(()) - } -} - -#[cfg(test)] -mod tests { - use super::*; - use crate::migrations; - use crate::mock; - use crate::mock::{events, AccountId, Admin, ExtBuilder, NodleStaking, Origin, Test, ValidatorsSet}; - use crate::types; - use frame_support::{assert_ok, traits::SortedMembers}; - - use crate as nodle_staking; - - #[test] - #[cfg(not(tarpaulin))] - fn test_empty_list_on_migration_works() { - ExtBuilder::default().num_validators(4).build_and_execute(|| { - mock::start_active_session(1); - - let expected = vec![ - nodle_staking::Event::ValidatorChosen(2, 11, 1500), - nodle_staking::Event::ValidatorChosen(2, 21, 1000), - nodle_staking::Event::ValidatorChosen(2, 41, 1000), - nodle_staking::Event::NewSession(5, 2, 3, 3500), - ]; - assert_eq!(events(), expected); - - assert_eq!(ValidatorsSet::count(), 0); - assert_eq!(NodleStaking::invulnerables().len(), 0); - - migrations::v1::on_runtime_upgrade::(); - - assert_eq!(ValidatorsSet::count(), 0); - assert_eq!(NodleStaking::invulnerables().len(), 0); - }); - } - - #[test] - fn test_valid_list_on_migration_works() { - ExtBuilder::default().num_validators(4).build_and_execute(|| { - mock::start_active_session(1); - - let mut expected = vec![ - nodle_staking::Event::ValidatorChosen(2, 11, 1500), - nodle_staking::Event::ValidatorChosen(2, 21, 1000), - nodle_staking::Event::ValidatorChosen(2, 41, 1000), - nodle_staking::Event::NewSession(5, 2, 3, 3500), - ]; - assert_eq!(events(), expected); - - assert_eq!(NodleStaking::total(), 3500); - - assert_eq!(ValidatorsSet::count(), 0); - assert_eq!(NodleStaking::invulnerables().len(), 0); - - let poa_validators: Vec = vec![11, 21, 31, 61, 71, 81]; - - poa_validators.iter().for_each(|account_id| { - assert_ok!(ValidatorsSet::add_member(Origin::signed(Admin::get()), *account_id,)); - }); - - assert_eq!(ValidatorsSet::sorted_members(), [11, 21, 31, 61, 71, 81].to_vec()); - - #[cfg(feature = "try-runtime")] - assert_ok!(migrations::v1::pre_upgrade::()); - - migrations::v1::on_runtime_upgrade::(); - - #[cfg(feature = "try-runtime")] - assert_ok!(migrations::v1::post_upgrade::()); - - assert_eq!(ValidatorsSet::count(), 6); - assert_eq!(NodleStaking::invulnerables(), [11, 21, 31, 61, 71, 81].to_vec()); - - assert_eq!(NodleStaking::total(), 3500); - - assert_eq!( - NodleStaking::validator_state(&11).unwrap().state, - types::ValidatorStatus::Active - ); - - assert_eq!( - NodleStaking::validator_state(&21).unwrap().state, - types::ValidatorStatus::Active - ); - - assert_eq!( - NodleStaking::validator_state(&31).unwrap().state, - types::ValidatorStatus::Active - ); - - assert_eq!( - NodleStaking::validator_state(&61).unwrap().state, - types::ValidatorStatus::Active - ); - - assert_eq!( - NodleStaking::validator_state(&71).unwrap().state, - types::ValidatorStatus::Active - ); - - assert_eq!( - NodleStaking::validator_state(&81).unwrap().state, - types::ValidatorStatus::Active - ); - - mock::start_active_session(2); - - let mut new1 = vec![ - nodle_staking::Event::ValidatorChosen(3, 11, 1500), - nodle_staking::Event::ValidatorChosen(3, 21, 1000), - nodle_staking::Event::ValidatorChosen(3, 31, 0), - nodle_staking::Event::ValidatorChosen(3, 41, 1000), - nodle_staking::Event::ValidatorChosen(3, 61, 0), - nodle_staking::Event::ValidatorChosen(3, 71, 0), - nodle_staking::Event::ValidatorChosen(3, 81, 0), - nodle_staking::Event::NewSession(10, 3, 7, 3500), - ]; - - expected.append(&mut new1); - assert_eq!(events(), expected); - - assert_ok!(NodleStaking::validator_bond_more(Origin::signed(31), 500)); - assert_ok!(NodleStaking::validator_bond_more(Origin::signed(61), 500)); - assert_ok!(NodleStaking::validator_bond_more(Origin::signed(71), 500)); - assert_ok!(NodleStaking::validator_bond_more(Origin::signed(81), 500)); - - mock::start_active_session(3); - - let mut new2 = vec![ - nodle_staking::Event::ValidatorBondedMore(31, 0, 500), - nodle_staking::Event::ValidatorBondedMore(61, 0, 500), - nodle_staking::Event::ValidatorBondedMore(71, 0, 500), - nodle_staking::Event::ValidatorBondedMore(81, 0, 500), - nodle_staking::Event::ValidatorChosen(4, 11, 1500), - nodle_staking::Event::ValidatorChosen(4, 21, 1000), - nodle_staking::Event::ValidatorChosen(4, 31, 500), - nodle_staking::Event::ValidatorChosen(4, 41, 1000), - nodle_staking::Event::ValidatorChosen(4, 61, 500), - nodle_staking::Event::ValidatorChosen(4, 71, 500), - nodle_staking::Event::ValidatorChosen(4, 81, 500), - nodle_staking::Event::NewSession(15, 4, 7, 5500), - ]; - - expected.append(&mut new2); - assert_eq!(events(), expected); - - assert_eq!(NodleStaking::total(), 5500); - }); - } -} diff --git a/pallets/staking/src/mock.rs b/pallets/staking/src/mock.rs index 13edd9fbb8a..a0ee1419052 100644 --- a/pallets/staking/src/mock.rs +++ b/pallets/staking/src/mock.rs @@ -123,7 +123,7 @@ parameter_types! { pub const BlockHashCount: u64 = 250; pub BlockWeights: frame_system::limits::BlockWeights = frame_system::limits::BlockWeights::simple_max( - frame_support::weights::constants::WEIGHT_PER_SECOND * 2 + frame_support::weights::Weight::from_ref_time(frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND.saturating_mul(2)) ); pub const MaxLocks: u32 = 1024; // pub static SessionsPerEra: SessionIndex = 3; @@ -139,16 +139,16 @@ impl frame_system::Config for Test { type BlockWeights = (); type BlockLength = (); type DbWeight = RocksDbWeight; - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type Index = AccountIndex; type BlockNumber = BlockNumber; - type Call = Call; + type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = ::sp_runtime::traits::BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -164,7 +164,7 @@ impl frame_system::Config for Test { impl pallet_balances::Config for Test { type MaxLocks = MaxLocks; type Balance = Balance; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -194,7 +194,7 @@ impl pallet_session::Config for Test { type Keys = SessionKeys; type ShouldEndSession = pallet_session::PeriodicSessions; type SessionHandler = (OtherSessionHandler,); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ValidatorId = AccountId; type ValidatorIdOf = hooks::StashOf; type NextSessionRotation = pallet_session::PeriodicSessions; @@ -225,7 +225,7 @@ ord_parameter_types! { pub const Admin: u64 = 4; } impl pallet_membership::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AddOrigin = EnsureSignedBy; type RemoveOrigin = EnsureSignedBy; type SwapOrigin = EnsureSignedBy; @@ -257,7 +257,7 @@ parameter_types! { pub const StakingLockId: LockIdentifier = *b"staking "; } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type BondedDuration = BondedDuration; type MinSelectedValidators = MinSelectedValidators; @@ -541,7 +541,7 @@ pub fn is_disabled(controller: AccountId) -> bool { SESSION.with(|d| d.borrow().1.contains(&controller)) } -pub(crate) fn last_event() -> Event { +pub(crate) fn last_event() -> RuntimeEvent { System::events().pop().expect("Event expected").event } @@ -550,7 +550,7 @@ pub(crate) fn events() -> Vec> { .into_iter() .map(|r| r.event) .filter_map(|e| { - if let Event::NodleStaking(inner) = e { + if let RuntimeEvent::NodleStaking(inner) = e { Some(inner) } else { None @@ -615,13 +615,13 @@ pub(crate) fn start_active_session(session_index: SessionIndex) { pub(crate) fn bond_validator(ctrl: AccountId, val: Balance) { let _ = Balances::make_free_balance_be(&ctrl, val); - assert_ok!(NodleStaking::validator_join_pool(Origin::signed(ctrl), val)); + assert_ok!(NodleStaking::validator_join_pool(RuntimeOrigin::signed(ctrl), val)); } pub(crate) fn bond_nominator(ctrl: AccountId, val: Balance, target: AccountId) { let _ = Balances::make_free_balance_be(&ctrl, val); assert_ok!(NodleStaking::nominator_nominate( - Origin::signed(ctrl), + RuntimeOrigin::signed(ctrl), target, val, false, diff --git a/pallets/staking/src/tests.rs b/pallets/staking/src/tests.rs index 3ad30136aea..4d90c0f28f0 100644 --- a/pallets/staking/src/tests.rs +++ b/pallets/staking/src/tests.rs @@ -20,8 +20,8 @@ use super::*; use crate::mock::{ balances, bond_nominator, bond_validator, events, is_disabled, last_event, on_offence_in_session, on_offence_now, - set_author, start_session, Balance, Balances, CancelOrigin, Event as MetaEvent, ExtBuilder, NodleStaking, Origin, - Session, System, Test, + set_author, start_session, Balance, Balances, CancelOrigin, ExtBuilder, NodleStaking, RuntimeEvent as MetaEvent, + RuntimeOrigin, Session, System, Test, }; use crate::set::OrderedSet; use crate::types::{Bond, StakeReward, ValidatorSnapshot, ValidatorStatus}; @@ -52,20 +52,20 @@ fn join_validator_pool_works() { .tst_staking_build() .execute_with(|| { assert_noop!( - NodleStaking::validator_join_pool(Origin::signed(1), 11u128,), + NodleStaking::validator_join_pool(RuntimeOrigin::signed(1), 11u128,), Error::::ValidatorExists, ); assert_noop!( - NodleStaking::validator_join_pool(Origin::signed(7), 9u128,), + NodleStaking::validator_join_pool(RuntimeOrigin::signed(7), 9u128,), Error::::ValidatorBondBelowMin, ); assert_noop!( - NodleStaking::validator_join_pool(Origin::signed(8), 10u128,), + NodleStaking::validator_join_pool(RuntimeOrigin::signed(8), 10u128,), Error::::InsufficientBalance, ); assert!(System::events().is_empty()); - assert_ok!(NodleStaking::validator_join_pool(Origin::signed(3), 11u128,),); - assert_ok!(NodleStaking::validator_join_pool(Origin::signed(7), 10u128,)); + assert_ok!(NodleStaking::validator_join_pool(RuntimeOrigin::signed(3), 11u128,),); + assert_ok!(NodleStaking::validator_join_pool(RuntimeOrigin::signed(7), 10u128,)); assert_eq!( last_event(), MetaEvent::NodleStaking(Event::JoinedValidatorPool(7, 10u128, 1121u128)) @@ -121,11 +121,11 @@ fn validator_activate_works() { assert_eq!(NodleStaking::validator_state(11).unwrap().state, ValidatorStatus::Idle); assert_noop!( - NodleStaking::validator_bond_more(Origin::signed(11), 2000), + NodleStaking::validator_bond_more(RuntimeOrigin::signed(11), 2000), Error::::InsufficientBalance, ); - assert_ok!(NodleStaking::validator_bond_more(Origin::signed(11), 10)); + assert_ok!(NodleStaking::validator_bond_more(RuntimeOrigin::signed(11), 10)); let mut new1 = vec![Event::ValidatorBondedMore(11, 1000, 1010)]; @@ -207,11 +207,11 @@ fn disablestrategy_whenslashed_works() { assert_eq!(events(), expected); assert_noop!( - NodleStaking::validator_bond_more(Origin::signed(11), 2000), + NodleStaking::validator_bond_more(RuntimeOrigin::signed(11), 2000), Error::::InsufficientBalance, ); - assert_ok!(NodleStaking::validator_bond_more(Origin::signed(11), 10)); + assert_ok!(NodleStaking::validator_bond_more(RuntimeOrigin::signed(11), 10)); let mut new1 = vec![Event::ValidatorBondedMore(11, 750, 760)]; @@ -294,11 +294,11 @@ fn kick_out_if_recent_disablestrategy_whenslashed_works() { assert!(!is_disabled(11)); assert_noop!( - NodleStaking::validator_bond_more(Origin::signed(11), 2000), + NodleStaking::validator_bond_more(RuntimeOrigin::signed(11), 2000), Error::::InsufficientBalance, ); - assert_ok!(NodleStaking::validator_bond_more(Origin::signed(11), 10)); + assert_ok!(NodleStaking::validator_bond_more(RuntimeOrigin::signed(11), 10)); let mut new1 = vec![Event::ValidatorBondedMore(11, 1000, 1010)]; @@ -386,11 +386,11 @@ fn disablestrategy_never_works() { assert_eq!(events(), expected); assert_noop!( - NodleStaking::validator_bond_more(Origin::signed(11), 2000), + NodleStaking::validator_bond_more(RuntimeOrigin::signed(11), 2000), Error::::InsufficientBalance, ); - assert_ok!(NodleStaking::validator_bond_more(Origin::signed(11), 10)); + assert_ok!(NodleStaking::validator_bond_more(RuntimeOrigin::signed(11), 10)); let mut new1 = vec![Event::ValidatorBondedMore(11, 750, 760)]; @@ -473,11 +473,11 @@ fn kick_out_if_recent_disablestrategy_never_works() { assert!(!is_disabled(11)); assert_noop!( - NodleStaking::validator_bond_more(Origin::signed(11), 2000), + NodleStaking::validator_bond_more(RuntimeOrigin::signed(11), 2000), Error::::InsufficientBalance, ); - assert_ok!(NodleStaking::validator_bond_more(Origin::signed(11), 10)); + assert_ok!(NodleStaking::validator_bond_more(RuntimeOrigin::signed(11), 10)); let mut new1 = vec![Event::ValidatorBondedMore(11, 1000, 1010)]; @@ -559,11 +559,11 @@ fn validator_exit_executes_after_delay() { assert_eq!(NodleStaking::total(), 1100); assert_noop!( - NodleStaking::validator_exit_pool(Origin::signed(3)), + NodleStaking::validator_exit_pool(RuntimeOrigin::signed(3)), Error::::ValidatorDNE, ); mock::start_active_session(6); - assert_ok!(NodleStaking::validator_exit_pool(Origin::signed(2))); + assert_ok!(NodleStaking::validator_exit_pool(RuntimeOrigin::signed(2))); assert_eq!( last_event(), MetaEvent::NodleStaking(Event::ValidatorScheduledExit(6, 2, 8)), @@ -621,9 +621,9 @@ fn validator_exit_executes_after_delay() { assert_eq!(NodleStaking::total(), 700); - assert_ok!(NodleStaking::withdraw_unbonded(Origin::signed(5))); + assert_ok!(NodleStaking::withdraw_unbonded(RuntimeOrigin::signed(5))); - assert_ok!(NodleStaking::withdraw_unbonded(Origin::signed(6))); + assert_ok!(NodleStaking::withdraw_unbonded(RuntimeOrigin::signed(6))); let mut new3 = vec![ Event::Withdrawn(5, 100), @@ -714,7 +714,7 @@ fn validator_selection_chooses_top_candidates() { assert_eq!(NodleStaking::total(), 450); - assert_ok!(NodleStaking::validator_exit_pool(Origin::signed(6))); + assert_ok!(NodleStaking::validator_exit_pool(RuntimeOrigin::signed(6))); assert_eq!( last_event(), MetaEvent::NodleStaking(Event::ValidatorScheduledExit(4, 6, 6)), @@ -749,7 +749,7 @@ fn validator_selection_chooses_top_candidates() { assert_eq!(NodleStaking::total(), 400); - assert_ok!(NodleStaking::validator_join_pool(Origin::signed(6), 69u128)); + assert_ok!(NodleStaking::validator_join_pool(RuntimeOrigin::signed(6), 69u128)); assert_eq!( mock::last_event(), @@ -781,12 +781,12 @@ fn validator_selection_chooses_top_candidates() { assert_eq!(NodleStaking::total(), 469); - assert_ok!(NodleStaking::validator_exit_pool(Origin::signed(1))); - assert_ok!(NodleStaking::validator_exit_pool(Origin::signed(2))); - assert_ok!(NodleStaking::validator_exit_pool(Origin::signed(3))); - assert_ok!(NodleStaking::validator_exit_pool(Origin::signed(4))); - assert_ok!(NodleStaking::validator_exit_pool(Origin::signed(5))); - assert_ok!(NodleStaking::validator_exit_pool(Origin::signed(6))); + assert_ok!(NodleStaking::validator_exit_pool(RuntimeOrigin::signed(1))); + assert_ok!(NodleStaking::validator_exit_pool(RuntimeOrigin::signed(2))); + assert_ok!(NodleStaking::validator_exit_pool(RuntimeOrigin::signed(3))); + assert_ok!(NodleStaking::validator_exit_pool(RuntimeOrigin::signed(4))); + assert_ok!(NodleStaking::validator_exit_pool(RuntimeOrigin::signed(5))); + assert_ok!(NodleStaking::validator_exit_pool(RuntimeOrigin::signed(6))); let mut new3 = vec![ Event::ValidatorScheduledExit(8, 1, 10), @@ -908,7 +908,7 @@ fn exit_queue() { mock::start_active_session(5); - assert_ok!(NodleStaking::validator_exit_pool(Origin::signed(6))); + assert_ok!(NodleStaking::validator_exit_pool(RuntimeOrigin::signed(6))); let mut new1 = vec![ Event::ValidatorChosen(6, 1, 100), @@ -925,7 +925,7 @@ fn exit_queue() { mock::start_active_session(6); - assert_ok!(NodleStaking::validator_exit_pool(Origin::signed(5))); + assert_ok!(NodleStaking::validator_exit_pool(RuntimeOrigin::signed(5))); let mut new2 = vec![ Event::ValidatorChosen(7, 1, 100), @@ -941,7 +941,7 @@ fn exit_queue() { assert_eq!(events(), expected); mock::start_active_session(7); - assert_ok!(NodleStaking::validator_exit_pool(Origin::signed(4))); + assert_ok!(NodleStaking::validator_exit_pool(RuntimeOrigin::signed(4))); let mut new3 = vec![ Event::ValidatorLeft(6, 50, 400), @@ -959,13 +959,13 @@ fn exit_queue() { mock::start_active_session(8); assert_noop!( - NodleStaking::validator_exit_pool(Origin::signed(4)), + NodleStaking::validator_exit_pool(RuntimeOrigin::signed(4)), Error::::AlreadyLeaving, ); - assert_ok!(NodleStaking::validator_exit_pool(Origin::signed(3))); - assert_ok!(NodleStaking::validator_exit_pool(Origin::signed(2))); - assert_ok!(NodleStaking::validator_exit_pool(Origin::signed(1))); + assert_ok!(NodleStaking::validator_exit_pool(RuntimeOrigin::signed(3))); + assert_ok!(NodleStaking::validator_exit_pool(RuntimeOrigin::signed(2))); + assert_ok!(NodleStaking::validator_exit_pool(RuntimeOrigin::signed(1))); let mut new4 = vec![ Event::ValidatorLeft(5, 60, 340), @@ -1167,7 +1167,7 @@ fn payout_distribution_to_solo_validators() { assert!(NodleStaking::awarded_pts(4, 4).is_zero()); assert!(NodleStaking::awarded_pts(4, 5).is_zero()); - assert_ok!(NodleStaking::withdraw_staking_rewards(Origin::signed(1))); + assert_ok!(NodleStaking::withdraw_staking_rewards(RuntimeOrigin::signed(1))); let mut new4 = vec![Event::Rewarded(1, 1800000)]; expected.append(&mut new4); @@ -1176,7 +1176,7 @@ fn payout_distribution_to_solo_validators() { assert_eq!(mock::balances(&1), (1801000, 100)); assert_eq!(Balances::total_balance(&1), 1801000); - assert_ok!(NodleStaking::withdraw_staking_rewards(Origin::signed(2))); + assert_ok!(NodleStaking::withdraw_staking_rewards(RuntimeOrigin::signed(2))); let mut new5 = vec![Event::Rewarded(2, 600000)]; expected.append(&mut new5); @@ -1185,7 +1185,7 @@ fn payout_distribution_to_solo_validators() { assert_eq!(mock::balances(&2), (601000, 90)); assert_eq!(Balances::total_balance(&2), 601000); - assert_ok!(NodleStaking::withdraw_staking_rewards(Origin::signed(3))); + assert_ok!(NodleStaking::withdraw_staking_rewards(RuntimeOrigin::signed(3))); let mut new6 = vec![Event::Rewarded(3, 200000)]; expected.append(&mut new6); @@ -1194,7 +1194,7 @@ fn payout_distribution_to_solo_validators() { assert_eq!(mock::balances(&3), (201000, 80)); assert_eq!(Balances::total_balance(&3), 201000); - assert_ok!(NodleStaking::withdraw_staking_rewards(Origin::signed(4))); + assert_ok!(NodleStaking::withdraw_staking_rewards(RuntimeOrigin::signed(4))); let mut new7 = vec![Event::Rewarded(4, 200000)]; expected.append(&mut new7); @@ -1211,7 +1211,7 @@ fn payout_distribution_to_solo_validators() { }] ); - assert_ok!(NodleStaking::withdraw_staking_rewards(Origin::signed(5))); + assert_ok!(NodleStaking::withdraw_staking_rewards(RuntimeOrigin::signed(5))); assert_eq!(NodleStaking::stake_rewards(&5), []); @@ -1225,7 +1225,7 @@ fn payout_distribution_to_solo_validators() { assert_eq!(NodleStaking::stake_rewards(&6), []); assert_noop!( - NodleStaking::withdraw_staking_rewards(Origin::signed(6)), + NodleStaking::withdraw_staking_rewards(RuntimeOrigin::signed(6)), Error::::RewardsDNE, ); @@ -1244,7 +1244,7 @@ fn payout_distribution_to_solo_validators() { }] ); - assert_ok!(NodleStaking::withdraw_staking_rewards(Origin::signed(6)),); + assert_ok!(NodleStaking::withdraw_staking_rewards(RuntimeOrigin::signed(6)),); let mut new9 = vec![Event::Rewarded(6, 0)]; expected.append(&mut new9); @@ -1267,7 +1267,7 @@ fn payout_distribution_to_solo_validators() { }) }); - assert_ok!(NodleStaking::withdraw_staking_rewards(Origin::signed(6)),); + assert_ok!(NodleStaking::withdraw_staking_rewards(RuntimeOrigin::signed(6)),); let mut new10 = vec![Event::Rewarded(6, 0)]; expected.append(&mut new10); @@ -1296,7 +1296,7 @@ fn payout_distribution_to_solo_validators() { }) }); - assert_ok!(NodleStaking::withdraw_staking_rewards(Origin::signed(6)),); + assert_ok!(NodleStaking::withdraw_staking_rewards(RuntimeOrigin::signed(6)),); let mut new11 = vec![ Event::ValidatorChosen(10, 1, 100), @@ -1363,13 +1363,17 @@ fn validator_commission() { assert_eq!(NodleStaking::total(), 40); - assert_ok!(NodleStaking::validator_join_pool(Origin::signed(4), 20u128)); + assert_ok!(NodleStaking::validator_join_pool(RuntimeOrigin::signed(4), 20u128)); assert_eq!( last_event(), MetaEvent::NodleStaking(Event::JoinedValidatorPool(4, 20u128, 60u128)) ); - assert_ok!(Session::set_keys(Origin::signed(4), UintAuthorityId(4).into(), vec![])); + assert_ok!(Session::set_keys( + RuntimeOrigin::signed(4), + UintAuthorityId(4).into(), + vec![] + )); mock::start_active_session(5); @@ -1382,8 +1386,8 @@ fn validator_commission() { expected.append(&mut new1); assert_eq!(events(), expected); - assert_ok!(NodleStaking::nominator_nominate(Origin::signed(5), 4, 10, false)); - assert_ok!(NodleStaking::nominator_nominate(Origin::signed(6), 4, 10, false)); + assert_ok!(NodleStaking::nominator_nominate(RuntimeOrigin::signed(5), 4, 10, false)); + assert_ok!(NodleStaking::nominator_nominate(RuntimeOrigin::signed(6), 4, 10, false)); let mut new2 = vec![Event::Nomination(5, 10, 4, 30), Event::Nomination(6, 10, 4, 40)]; expected.append(&mut new2); @@ -1424,7 +1428,7 @@ fn validator_commission() { expected.append(&mut new4); assert_eq!(events(), expected); - assert_ok!(NodleStaking::withdraw_staking_rewards(Origin::signed(1))); + assert_ok!(NodleStaking::withdraw_staking_rewards(RuntimeOrigin::signed(1))); let mut new5 = vec![Event::Rewarded(1, 300000)]; expected.append(&mut new5); @@ -1433,7 +1437,7 @@ fn validator_commission() { assert_eq!(mock::balances(&1), (300100, 20)); assert_eq!(Balances::total_balance(&1), 300100); - assert_ok!(NodleStaking::withdraw_staking_rewards(Origin::signed(2))); + assert_ok!(NodleStaking::withdraw_staking_rewards(RuntimeOrigin::signed(2))); let mut new6 = vec![Event::Rewarded(2, 100000)]; expected.append(&mut new6); @@ -1442,7 +1446,7 @@ fn validator_commission() { assert_eq!(mock::balances(&2), (100100, 10)); assert_eq!(Balances::total_balance(&2), 100100); - assert_ok!(NodleStaking::withdraw_staking_rewards(Origin::signed(3))); + assert_ok!(NodleStaking::withdraw_staking_rewards(RuntimeOrigin::signed(3))); let mut new7 = vec![Event::Rewarded(3, 100000)]; expected.append(&mut new7); @@ -1451,7 +1455,7 @@ fn validator_commission() { assert_eq!(mock::balances(&3), (100100, 10)); assert_eq!(Balances::total_balance(&3), 100100); - assert_ok!(NodleStaking::withdraw_staking_rewards(Origin::signed(4))); + assert_ok!(NodleStaking::withdraw_staking_rewards(RuntimeOrigin::signed(4))); let mut new8 = vec![Event::Rewarded(4, 300000)]; expected.append(&mut new8); @@ -1460,7 +1464,7 @@ fn validator_commission() { assert_eq!(mock::balances(&4), (300100, 20)); assert_eq!(Balances::total_balance(&4), 300100); - assert_ok!(NodleStaking::withdraw_staking_rewards(Origin::signed(5))); + assert_ok!(NodleStaking::withdraw_staking_rewards(RuntimeOrigin::signed(5))); let mut new9 = vec![Event::Rewarded(5, 100000)]; expected.append(&mut new9); @@ -1469,7 +1473,7 @@ fn validator_commission() { assert_eq!(mock::balances(&5), (100100, 10)); assert_eq!(Balances::total_balance(&5), 100100); - assert_ok!(NodleStaking::withdraw_staking_rewards(Origin::signed(6))); + assert_ok!(NodleStaking::withdraw_staking_rewards(RuntimeOrigin::signed(6))); let mut new10 = vec![Event::Rewarded(6, 100000)]; expected.append(&mut new10); @@ -1578,21 +1582,21 @@ fn multiple_nominations() { assert_eq!(System::consumers(&10), 1); assert_noop!( - NodleStaking::nominator_nominate(Origin::signed(6), 1, 10, false), + NodleStaking::nominator_nominate(RuntimeOrigin::signed(6), 1, 10, false), Error::::AlreadyNominatedValidator, ); assert_noop!( - NodleStaking::nominator_nominate(Origin::signed(6), 2, 2, false), + NodleStaking::nominator_nominate(RuntimeOrigin::signed(6), 2, 2, false), Error::::NominationBelowMin, ); - assert_ok!(NodleStaking::nominator_nominate(Origin::signed(6), 2, 10, false)); - assert_ok!(NodleStaking::nominator_nominate(Origin::signed(6), 3, 10, false)); - assert_ok!(NodleStaking::nominator_nominate(Origin::signed(6), 4, 10, false)); + assert_ok!(NodleStaking::nominator_nominate(RuntimeOrigin::signed(6), 2, 10, false)); + assert_ok!(NodleStaking::nominator_nominate(RuntimeOrigin::signed(6), 3, 10, false)); + assert_ok!(NodleStaking::nominator_nominate(RuntimeOrigin::signed(6), 4, 10, false)); assert_noop!( - NodleStaking::nominator_nominate(Origin::signed(6), 5, 10, false), + NodleStaking::nominator_nominate(RuntimeOrigin::signed(6), 5, 10, false), Error::::ExceedMaxValidatorPerNom, ); @@ -1619,14 +1623,14 @@ fn multiple_nominations() { expected.append(&mut new2); assert_eq!(events(), expected); - assert_ok!(NodleStaking::nominator_nominate(Origin::signed(7), 2, 80, false)); + assert_ok!(NodleStaking::nominator_nominate(RuntimeOrigin::signed(7), 2, 80, false)); assert_noop!( - NodleStaking::nominator_nominate(Origin::signed(7), 3, 11, false), + NodleStaking::nominator_nominate(RuntimeOrigin::signed(7), 3, 11, false), Error::::InsufficientBalance ); assert_noop!( - NodleStaking::nominator_nominate(Origin::signed(10), 2, 10, false), + NodleStaking::nominator_nominate(RuntimeOrigin::signed(10), 2, 10, false), Error::::TooManyNominators ); @@ -1645,7 +1649,7 @@ fn multiple_nominations() { expected.append(&mut new3); assert_eq!(events(), expected); - assert_ok!(NodleStaking::validator_exit_pool(Origin::signed(2))); + assert_ok!(NodleStaking::validator_exit_pool(RuntimeOrigin::signed(2))); assert_eq!( last_event(), @@ -1716,10 +1720,10 @@ fn multiple_nominations() { assert_eq!(System::consumers(&9), 1); assert_eq!(System::consumers(&10), 1); - assert_ok!(NodleStaking::withdraw_unbonded(Origin::signed(6))); - assert_ok!(NodleStaking::withdraw_unbonded(Origin::signed(7))); - assert_ok!(NodleStaking::withdraw_unbonded(Origin::signed(8))); - assert_ok!(NodleStaking::withdraw_unbonded(Origin::signed(9))); + assert_ok!(NodleStaking::withdraw_unbonded(RuntimeOrigin::signed(6))); + assert_ok!(NodleStaking::withdraw_unbonded(RuntimeOrigin::signed(7))); + assert_ok!(NodleStaking::withdraw_unbonded(RuntimeOrigin::signed(8))); + assert_ok!(NodleStaking::withdraw_unbonded(RuntimeOrigin::signed(9))); let mut new6 = vec![ Event::Withdrawn(6, 10), @@ -1887,7 +1891,7 @@ fn switch_nomination_works() { assert_eq!(System::consumers(&9), 1); assert_eq!(System::consumers(&10), 1); - assert_ok!(NodleStaking::nominator_nominate(Origin::signed(6), 2, 10, false)); + assert_ok!(NodleStaking::nominator_nominate(RuntimeOrigin::signed(6), 2, 10, false)); let mut new1 = vec![Event::Nomination(6, 10, 2, 50)]; @@ -1904,27 +1908,27 @@ fn switch_nomination_works() { // Check with invalid arguments assert_noop!( - NodleStaking::nominator_move_nomination(Origin::signed(6), 2, 2, 5, false), + NodleStaking::nominator_move_nomination(RuntimeOrigin::signed(6), 2, 2, 5, false), Error::::ValidatorDNE, ); assert_noop!( - NodleStaking::nominator_move_nomination(Origin::signed(6), 2, 7, 5, false), + NodleStaking::nominator_move_nomination(RuntimeOrigin::signed(6), 2, 7, 5, false), Error::::ValidatorDNE, ); assert_noop!( - NodleStaking::nominator_move_nomination(Origin::signed(6), 7, 2, 5, false), + NodleStaking::nominator_move_nomination(RuntimeOrigin::signed(6), 7, 2, 5, false), Error::::ValidatorDNE, ); assert_noop!( - NodleStaking::nominator_move_nomination(Origin::signed(1), 2, 1, 5, false), + NodleStaking::nominator_move_nomination(RuntimeOrigin::signed(1), 2, 1, 5, false), Error::::NominatorDNE, ); assert_ok!(NodleStaking::nominator_move_nomination( - Origin::signed(6), + RuntimeOrigin::signed(6), 2, 1, 0, @@ -1948,12 +1952,12 @@ fn switch_nomination_works() { assert_eq!(NodleStaking::total(), 150); assert_noop!( - NodleStaking::nominator_move_nomination(Origin::signed(1), 2, 1, 5, false), + NodleStaking::nominator_move_nomination(RuntimeOrigin::signed(1), 2, 1, 5, false), Error::::NominatorDNE, ); - assert_ok!(NodleStaking::nominator_nominate(Origin::signed(6), 2, 10, false)); - assert_ok!(NodleStaking::nominator_nominate(Origin::signed(6), 3, 10, false)); + assert_ok!(NodleStaking::nominator_nominate(RuntimeOrigin::signed(6), 2, 10, false)); + assert_ok!(NodleStaking::nominator_nominate(RuntimeOrigin::signed(6), 3, 10, false)); let mut new3 = vec![Event::Nomination(6, 10, 2, 50), Event::Nomination(6, 10, 3, 30)]; @@ -1976,7 +1980,7 @@ fn switch_nomination_works() { assert_eq!(NodleStaking::total(), 170); assert_ok!(NodleStaking::nominator_move_nomination( - Origin::signed(6), + RuntimeOrigin::signed(6), 3, 4, 5, @@ -1985,10 +1989,10 @@ fn switch_nomination_works() { assert_eq!(NodleStaking::total(), 175); - assert_ok!(NodleStaking::nominator_nominate(Origin::signed(6), 5, 10, false)); + assert_ok!(NodleStaking::nominator_nominate(RuntimeOrigin::signed(6), 5, 10, false)); assert_ok!(NodleStaking::nominator_move_nomination( - Origin::signed(6), + RuntimeOrigin::signed(6), 2, 5, 0, @@ -2145,7 +2149,7 @@ fn reconciliation_basics_works() { assert_eq!(System::consumers(&9), 1); assert_eq!(System::consumers(&10), 1); - assert_ok!(NodleStaking::nominator_nominate(Origin::signed(6), 2, 40, false)); + assert_ok!(NodleStaking::nominator_nominate(RuntimeOrigin::signed(6), 2, 40, false)); assert_eq!(mock::balances(&6), (100, 50)); assert_eq!(Balances::total_balance(&6), 100); @@ -2174,7 +2178,7 @@ fn reconciliation_basics_works() { assert_noop!( NodleStaking::set_staking_limits( - Origin::signed(CancelOrigin::get()), + RuntimeOrigin::signed(CancelOrigin::get()), 0, s1_min_stake, s1_min_validator_bond, @@ -2186,7 +2190,7 @@ fn reconciliation_basics_works() { assert_noop!( NodleStaking::set_staking_limits( - Origin::signed(CancelOrigin::get()), + RuntimeOrigin::signed(CancelOrigin::get()), s1_max_validators, Zero::zero(), s1_min_validator_bond, @@ -2198,7 +2202,7 @@ fn reconciliation_basics_works() { assert_noop!( NodleStaking::set_staking_limits( - Origin::signed(CancelOrigin::get()), + RuntimeOrigin::signed(CancelOrigin::get()), s1_max_validators, s1_min_stake, Zero::zero(), @@ -2210,7 +2214,7 @@ fn reconciliation_basics_works() { assert_noop!( NodleStaking::set_staking_limits( - Origin::signed(CancelOrigin::get()), + RuntimeOrigin::signed(CancelOrigin::get()), s1_max_validators, s1_min_stake, s1_min_validator_bond, @@ -2222,7 +2226,7 @@ fn reconciliation_basics_works() { assert_noop!( NodleStaking::set_staking_limits( - Origin::signed(CancelOrigin::get()), + RuntimeOrigin::signed(CancelOrigin::get()), s1_max_validators, s1_min_stake, s1_min_validator_bond, @@ -2233,7 +2237,7 @@ fn reconciliation_basics_works() { ); assert_ok!(NodleStaking::set_staking_limits( - Origin::signed(CancelOrigin::get()), + RuntimeOrigin::signed(CancelOrigin::get()), s1_max_validators, s1_min_stake, s1_min_validator_bond, @@ -2305,7 +2309,7 @@ fn reconciliation_basics_works() { assert_eq!(NodleStaking::nominator_state(9).unwrap().active_bond, 0); assert_eq!(NodleStaking::nominator_state(9).unwrap().frozen_bond, 10); - assert_ok!(NodleStaking::unbond_frozen(Origin::signed(6))); + assert_ok!(NodleStaking::unbond_frozen(RuntimeOrigin::signed(6))); let mut new1 = vec![Event::NominationUnbondFrozen(6, 10, 40, 40)]; expected.append(&mut new1); @@ -2316,7 +2320,7 @@ fn reconciliation_basics_works() { assert_eq!(System::consumers(&6), 1); - assert_ok!(NodleStaking::unbond_frozen(Origin::signed(7))); + assert_ok!(NodleStaking::unbond_frozen(RuntimeOrigin::signed(7))); let mut new1 = vec![Event::NominationUnbondFrozen(7, 10, 0, 0), Event::NominatorLeft(7, 10)]; expected.append(&mut new1); @@ -2328,11 +2332,11 @@ fn reconciliation_basics_works() { assert_eq!(System::consumers(&7), 0); assert_noop!( - NodleStaking::nominator_bond_more(Origin::signed(7), 2, 50, false), + NodleStaking::nominator_bond_more(RuntimeOrigin::signed(7), 2, 50, false), Error::::NominatorDNE, ); - assert_ok!(NodleStaking::unbond_frozen(Origin::signed(10))); + assert_ok!(NodleStaking::unbond_frozen(RuntimeOrigin::signed(10))); let mut new1 = vec![ Event::NominationUnbondFrozen(10, 10, 0, 0), @@ -2347,11 +2351,11 @@ fn reconciliation_basics_works() { assert_eq!(System::consumers(&10), 0); assert_noop!( - NodleStaking::nominator_bond_more(Origin::signed(10), 2, 50, false), + NodleStaking::nominator_bond_more(RuntimeOrigin::signed(10), 2, 50, false), Error::::NominatorDNE, ); - assert_ok!(NodleStaking::unbond_frozen(Origin::signed(8))); + assert_ok!(NodleStaking::unbond_frozen(RuntimeOrigin::signed(8))); let mut new1 = vec![Event::NominationUnbondFrozen(8, 10, 0, 0), Event::NominatorLeft(8, 10)]; expected.append(&mut new1); @@ -2363,11 +2367,11 @@ fn reconciliation_basics_works() { assert_eq!(System::consumers(&8), 0); assert_noop!( - NodleStaking::nominator_bond_more(Origin::signed(8), 2, 50, false), + NodleStaking::nominator_bond_more(RuntimeOrigin::signed(8), 2, 50, false), Error::::NominatorDNE, ); - assert_ok!(NodleStaking::unbond_frozen(Origin::signed(9))); + assert_ok!(NodleStaking::unbond_frozen(RuntimeOrigin::signed(9))); let mut new1 = vec![Event::NominationUnbondFrozen(9, 10, 0, 0), Event::NominatorLeft(9, 10)]; expected.append(&mut new1); @@ -2379,7 +2383,7 @@ fn reconciliation_basics_works() { assert_eq!(System::consumers(&9), 0); assert_noop!( - NodleStaking::nominator_bond_more(Origin::signed(9), 2, 50, false), + NodleStaking::nominator_bond_more(RuntimeOrigin::signed(9), 2, 50, false), Error::::NominatorDNE, ); }); @@ -2490,7 +2494,7 @@ fn unfreeze_bond_arg_flag_works() { ), ); - assert_ok!(NodleStaking::nominator_nominate(Origin::signed(6), 3, 20, false)); + assert_ok!(NodleStaking::nominator_nominate(RuntimeOrigin::signed(6), 3, 20, false)); assert_eq!(mock::balances(&6), (100, 30)); assert_eq!(Balances::total_balance(&6), 100); @@ -2513,7 +2517,7 @@ fn unfreeze_bond_arg_flag_works() { assert_eq!(NodleStaking::nominator_state(6).unwrap().active_bond, 30); assert_eq!(NodleStaking::total(), 175); - assert_ok!(NodleStaking::nominator_nominate(Origin::signed(7), 3, 20, true,)); + assert_ok!(NodleStaking::nominator_nominate(RuntimeOrigin::signed(7), 3, 20, true,)); assert_eq!(mock::balances(&7), (100, 30)); assert_eq!(Balances::total_balance(&7), 100); @@ -2531,7 +2535,7 @@ fn unfreeze_bond_arg_flag_works() { assert_eq!(NodleStaking::nominator_state(7).unwrap().active_bond, 30); assert_eq!(NodleStaking::total(), 195); - assert_ok!(NodleStaking::nominator_nominate(Origin::signed(8), 4, 20, true,)); + assert_ok!(NodleStaking::nominator_nominate(RuntimeOrigin::signed(8), 4, 20, true,)); assert_eq!(mock::balances(&8), (100, 30)); assert_eq!(Balances::total_balance(&8), 100); @@ -2559,7 +2563,7 @@ fn unfreeze_bond_arg_flag_works() { let s1_new_min_nomination_chill_threshold = 15; assert_ok!(NodleStaking::set_staking_limits( - Origin::signed(CancelOrigin::get()), + RuntimeOrigin::signed(CancelOrigin::get()), s1_max_validators, s1_min_stake, s1_min_validator_bond, @@ -2618,18 +2622,18 @@ fn unfreeze_bond_arg_flag_works() { assert_eq!(NodleStaking::nominator_state(8).unwrap().frozen_bond, 10); assert_noop!( - NodleStaking::nominator_nominate(Origin::signed(6), 1, 14, false), + NodleStaking::nominator_nominate(RuntimeOrigin::signed(6), 1, 14, false), Error::::NominationBelowMin, ); - assert_ok!(NodleStaking::nominator_nominate(Origin::signed(6), 1, 14, true)); + assert_ok!(NodleStaking::nominator_nominate(RuntimeOrigin::signed(6), 1, 14, true)); let mut new1 = vec![Event::Nomination(6, 24, 1, 69)]; expected.append(&mut new1); assert_eq!(events(), expected); - assert_ok!(NodleStaking::nominator_bond_more(Origin::signed(6), 1, 6, true),); + assert_ok!(NodleStaking::nominator_bond_more(RuntimeOrigin::signed(6), 1, 6, true),); let mut new1 = vec![Event::NominationIncreased(6, 30, 1, 69, 75)]; expected.append(&mut new1); @@ -2769,18 +2773,18 @@ fn validators_bond() { assert_eq!(NodleStaking::total(), 140); assert_noop!( - NodleStaking::validator_bond_more(Origin::signed(6), 50), + NodleStaking::validator_bond_more(RuntimeOrigin::signed(6), 50), Error::::ValidatorDNE ); - assert_ok!(NodleStaking::validator_bond_more(Origin::signed(1), 50)); + assert_ok!(NodleStaking::validator_bond_more(RuntimeOrigin::signed(1), 50)); assert_noop!( - NodleStaking::validator_bond_more(Origin::signed(1), 40), + NodleStaking::validator_bond_more(RuntimeOrigin::signed(1), 40), Error::::InsufficientBalance ); - assert_ok!(NodleStaking::validator_exit_pool(Origin::signed(1))); + assert_ok!(NodleStaking::validator_exit_pool(RuntimeOrigin::signed(1))); let mut new1 = vec![ Event::ValidatorBondedMore(1, 20, 70), @@ -2793,7 +2797,7 @@ fn validators_bond() { mock::start_active_session(5); assert_noop!( - NodleStaking::validator_bond_more(Origin::signed(1), 30), + NodleStaking::validator_bond_more(RuntimeOrigin::signed(1), 30), Error::::CannotActivateIfLeaving, ); @@ -2819,15 +2823,15 @@ fn validators_bond() { assert_eq!(events(), expected); assert_noop!( - NodleStaking::validator_bond_more(Origin::signed(1), 40), + NodleStaking::validator_bond_more(RuntimeOrigin::signed(1), 40), Error::::ValidatorDNE, ); - assert_ok!(NodleStaking::validator_bond_more(Origin::signed(2), 80)); + assert_ok!(NodleStaking::validator_bond_more(RuntimeOrigin::signed(2), 80)); - assert_ok!(NodleStaking::validator_bond_less(Origin::signed(2), 90)); + assert_ok!(NodleStaking::validator_bond_less(RuntimeOrigin::signed(2), 90)); - assert_ok!(NodleStaking::validator_bond_less(Origin::signed(3), 10)); + assert_ok!(NodleStaking::validator_bond_less(RuntimeOrigin::signed(3), 10)); let mut new3 = vec![ Event::ValidatorBondedMore(2, 20, 100), @@ -2839,27 +2843,27 @@ fn validators_bond() { assert_eq!(events(), expected); assert_noop!( - NodleStaking::validator_bond_less(Origin::signed(2), 11), + NodleStaking::validator_bond_less(RuntimeOrigin::signed(2), 11), Error::::Underflow ); assert_noop!( - NodleStaking::validator_bond_less(Origin::signed(2), 1), + NodleStaking::validator_bond_less(RuntimeOrigin::signed(2), 1), Error::::ValidatorBondBelowMin ); assert_noop!( - NodleStaking::validator_bond_less(Origin::signed(3), 1), + NodleStaking::validator_bond_less(RuntimeOrigin::signed(3), 1), Error::::ValidatorBondBelowMin ); assert_noop!( - NodleStaking::validator_bond_less(Origin::signed(4), 11), + NodleStaking::validator_bond_less(RuntimeOrigin::signed(4), 11), Error::::ValidatorBondBelowMin ); - assert_ok!(NodleStaking::validator_bond_less(Origin::signed(4), 10)); + assert_ok!(NodleStaking::validator_bond_less(RuntimeOrigin::signed(4), 10)); mock::start_active_session(9); - assert_ok!(NodleStaking::withdraw_unbonded(Origin::signed(2))); + assert_ok!(NodleStaking::withdraw_unbonded(RuntimeOrigin::signed(2))); assert_eq!(mock::balances(&2), (100, 10)); let mut new4 = vec![ @@ -2968,38 +2972,43 @@ fn nominators_bond() { assert_eq!(NodleStaking::total(), 140); assert_noop!( - NodleStaking::nominator_bond_more(Origin::signed(1), 2, 50, false), + NodleStaking::nominator_bond_more(RuntimeOrigin::signed(1), 2, 50, false), Error::::NominatorDNE, ); assert_noop!( - NodleStaking::nominator_bond_more(Origin::signed(6), 2, 50, false), + NodleStaking::nominator_bond_more(RuntimeOrigin::signed(6), 2, 50, false), Error::::NominationDNE, ); assert_noop!( - NodleStaking::nominator_bond_more(Origin::signed(7), 6, 50, false), + NodleStaking::nominator_bond_more(RuntimeOrigin::signed(7), 6, 50, false), Error::::ValidatorDNE, ); assert_noop!( - NodleStaking::nominator_bond_less(Origin::signed(6), 1, 11), + NodleStaking::nominator_bond_less(RuntimeOrigin::signed(6), 1, 11), Error::::Underflow, ); assert_noop!( - NodleStaking::nominator_bond_less(Origin::signed(6), 1, 8), + NodleStaking::nominator_bond_less(RuntimeOrigin::signed(6), 1, 8), Error::::NominationBelowMin, ); assert_noop!( - NodleStaking::nominator_bond_less(Origin::signed(6), 1, 6), + NodleStaking::nominator_bond_less(RuntimeOrigin::signed(6), 1, 6), Error::::NominatorBondBelowMin, ); - assert_ok!(NodleStaking::nominator_bond_more(Origin::signed(6), 1, 10, false)); + assert_ok!(NodleStaking::nominator_bond_more( + RuntimeOrigin::signed(6), + 1, + 10, + false + )); assert_noop!( - NodleStaking::nominator_bond_less(Origin::signed(6), 2, 5), + NodleStaking::nominator_bond_less(RuntimeOrigin::signed(6), 2, 5), Error::::NominationDNE, ); assert_noop!( - NodleStaking::nominator_bond_more(Origin::signed(6), 1, 81, false), + NodleStaking::nominator_bond_more(RuntimeOrigin::signed(6), 1, 81, false), Error::::InsufficientBalance, ); @@ -3007,7 +3016,7 @@ fn nominators_bond() { assert_eq!(mock::balances(&6), (100, 20)); assert_eq!(NodleStaking::total(), 150); - assert_ok!(NodleStaking::validator_exit_pool(Origin::signed(1))); + assert_ok!(NodleStaking::validator_exit_pool(RuntimeOrigin::signed(1))); let mut new1 = vec![ Event::NominationIncreased(6, 20, 1, 50, 60), @@ -3047,9 +3056,9 @@ fn nominators_bond() { mock::start_active_session(8); - assert_ok!(NodleStaking::withdraw_unbonded(Origin::signed(6))); - assert_ok!(NodleStaking::withdraw_unbonded(Origin::signed(7))); - assert_ok!(NodleStaking::withdraw_unbonded(Origin::signed(10))); + assert_ok!(NodleStaking::withdraw_unbonded(RuntimeOrigin::signed(6))); + assert_ok!(NodleStaking::withdraw_unbonded(RuntimeOrigin::signed(7))); + assert_ok!(NodleStaking::withdraw_unbonded(RuntimeOrigin::signed(10))); let mut new3 = vec![ Event::ValidatorChosen(9, 2, 40), @@ -3167,20 +3176,20 @@ fn revoke_nomination_or_leave_nominators() { assert_eq!(NodleStaking::total(), 140); assert_noop!( - NodleStaking::nominator_denominate(Origin::signed(1), 2), + NodleStaking::nominator_denominate(RuntimeOrigin::signed(1), 2), Error::::NominatorDNE, ); assert_noop!( - NodleStaking::nominator_denominate(Origin::signed(6), 2), + NodleStaking::nominator_denominate(RuntimeOrigin::signed(6), 2), Error::::NominationDNE, ); assert_noop!( - NodleStaking::nominator_denominate_all(Origin::signed(1)), + NodleStaking::nominator_denominate_all(RuntimeOrigin::signed(1)), Error::::NominatorDNE, ); - assert_ok!(NodleStaking::nominator_nominate(Origin::signed(6), 2, 3, false)); - assert_ok!(NodleStaking::nominator_nominate(Origin::signed(6), 3, 3, false)); - assert_ok!(NodleStaking::nominator_denominate(Origin::signed(6), 1)); + assert_ok!(NodleStaking::nominator_nominate(RuntimeOrigin::signed(6), 2, 3, false)); + assert_ok!(NodleStaking::nominator_nominate(RuntimeOrigin::signed(6), 3, 3, false)); + assert_ok!(NodleStaking::nominator_denominate(RuntimeOrigin::signed(6), 1)); let mut new1 = vec![ Event::Nomination(6, 3, 2, 43), @@ -3193,7 +3202,7 @@ fn revoke_nomination_or_leave_nominators() { mock::start_active_session(6); - assert_ok!(NodleStaking::withdraw_unbonded(Origin::signed(6))); + assert_ok!(NodleStaking::withdraw_unbonded(RuntimeOrigin::signed(6))); let mut new2 = vec![ Event::ValidatorChosen(6, 1, 40), @@ -3215,18 +3224,18 @@ fn revoke_nomination_or_leave_nominators() { assert_eq!(events(), expected); assert_noop!( - NodleStaking::nominator_denominate(Origin::signed(6), 2), + NodleStaking::nominator_denominate(RuntimeOrigin::signed(6), 2), Error::::NominatorBondBelowMin, ); assert_noop!( - NodleStaking::nominator_denominate(Origin::signed(6), 3), + NodleStaking::nominator_denominate(RuntimeOrigin::signed(6), 3), Error::::NominatorBondBelowMin, ); // can revoke both remaining by calling leave nominators - assert_ok!(NodleStaking::nominator_denominate_all(Origin::signed(6))); + assert_ok!(NodleStaking::nominator_denominate_all(RuntimeOrigin::signed(6))); // this leads to 8 leaving set of nominators - assert_ok!(NodleStaking::nominator_denominate(Origin::signed(8), 2)); - assert_ok!(NodleStaking::nominator_denominate_all(Origin::signed(8))); + assert_ok!(NodleStaking::nominator_denominate(RuntimeOrigin::signed(8), 2)); + assert_ok!(NodleStaking::nominator_denominate_all(RuntimeOrigin::signed(8))); let mut new3 = vec![ Event::NominatorLeftValidator(6, 2, 3, 40), @@ -3239,8 +3248,8 @@ fn revoke_nomination_or_leave_nominators() { mock::start_active_session(8); - assert_ok!(NodleStaking::withdraw_unbonded(Origin::signed(6))); - assert_ok!(NodleStaking::withdraw_unbonded(Origin::signed(8))); + assert_ok!(NodleStaking::withdraw_unbonded(RuntimeOrigin::signed(6))); + assert_ok!(NodleStaking::withdraw_unbonded(RuntimeOrigin::signed(8))); let mut new4 = vec![ Event::ValidatorChosen(8, 1, 40), @@ -3381,11 +3390,11 @@ fn payouts_follow_nomination_changes() { // 1. ensure nominators are paid for 2 rounds after they leave assert_noop!( - NodleStaking::nominator_denominate_all(Origin::signed(66)), + NodleStaking::nominator_denominate_all(RuntimeOrigin::signed(66)), Error::::NominatorDNE ); - assert_ok!(NodleStaking::nominator_denominate_all(Origin::signed(6))); + assert_ok!(NodleStaking::nominator_denominate_all(RuntimeOrigin::signed(6))); mock::start_active_session(6); @@ -3425,7 +3434,7 @@ fn payouts_follow_nomination_changes() { expected.append(&mut new3); assert_eq!(events(), expected); - assert_ok!(NodleStaking::nominator_nominate(Origin::signed(8), 1, 10, false)); + assert_ok!(NodleStaking::nominator_nominate(RuntimeOrigin::signed(8), 1, 10, false)); mock::start_active_session(8); @@ -3486,14 +3495,14 @@ fn payouts_follow_nomination_changes() { expected.append(&mut new6); assert_eq!(events(), expected); - assert_ok!(NodleStaking::withdraw_unbonded(Origin::signed(6))); + assert_ok!(NodleStaking::withdraw_unbonded(RuntimeOrigin::signed(6))); let mut new7 = vec![Event::Withdrawn(6, 10), Event::NominatorLeft(6, 10)]; expected.append(&mut new7); assert_eq!(events(), expected); - assert_ok!(NodleStaking::withdraw_staking_rewards(Origin::signed(6))); + assert_ok!(NodleStaking::withdraw_staking_rewards(RuntimeOrigin::signed(6))); let mut new8 = vec![Event::Rewarded(6, 480000)]; expected.append(&mut new8); @@ -3511,7 +3520,7 @@ fn set_invulnerables_works() { ExtBuilder::default().build_and_execute(|| { let new_set1 = vec![1, 2]; - assert_ok!(NodleStaking::set_invulnerables(Origin::root(), new_set1.clone())); + assert_ok!(NodleStaking::set_invulnerables(RuntimeOrigin::root(), new_set1.clone())); assert_eq!(NodleStaking::invulnerables(), new_set1); let mut expected = vec![Event::NewInvulnerables([1, 2].to_vec())]; @@ -3520,7 +3529,7 @@ fn set_invulnerables_works() { let new_set2 = vec![3, 4]; assert_ok!(NodleStaking::set_invulnerables( - Origin::signed(CancelOrigin::get()), + RuntimeOrigin::signed(CancelOrigin::get()), new_set2.clone() )); assert_eq!(NodleStaking::invulnerables(), new_set2); @@ -3530,7 +3539,10 @@ fn set_invulnerables_works() { assert_eq!(events(), expected); // cannot set with non-root. - assert_noop!(NodleStaking::set_invulnerables(Origin::signed(1), new_set2), BadOrigin); + assert_noop!( + NodleStaking::set_invulnerables(RuntimeOrigin::signed(1), new_set2), + BadOrigin + ); }); } @@ -3541,12 +3553,12 @@ fn set_total_validator_per_round_works() { let new_total_selected = old_total_selected * 4u32; assert_noop!( - NodleStaking::set_total_validator_per_round(Origin::signed(1), new_total_selected), + NodleStaking::set_total_validator_per_round(RuntimeOrigin::signed(1), new_total_selected), BadOrigin ); assert_ok!(NodleStaking::set_total_validator_per_round( - Origin::signed(CancelOrigin::get()), + RuntimeOrigin::signed(CancelOrigin::get()), new_total_selected )); @@ -3558,7 +3570,7 @@ fn set_total_validator_per_round_works() { let new_total_selected = old_total_selected * 2u32; assert_ok!(NodleStaking::set_total_validator_per_round( - Origin::root(), + RuntimeOrigin::root(), new_total_selected )); @@ -3587,7 +3599,7 @@ fn set_staking_limits_works() { assert_noop!( NodleStaking::set_staking_limits( - Origin::signed(1), + RuntimeOrigin::signed(1), new_max_validators, new_min_stake, new_min_validator_bond, @@ -3598,7 +3610,7 @@ fn set_staking_limits_works() { ); assert_ok!(NodleStaking::set_staking_limits( - Origin::signed(CancelOrigin::get()), + RuntimeOrigin::signed(CancelOrigin::get()), new_max_validators, new_min_stake, new_min_validator_bond, @@ -3639,7 +3651,7 @@ fn set_staking_limits_works() { let new2_min_nomination_chill_threshold = old_min_nomination_chill_threshold.saturating_mul(2u32.into()); assert_ok!(NodleStaking::set_staking_limits( - Origin::root(), + RuntimeOrigin::root(), new2_max_validators, new2_min_stake, new2_min_validator_bond, @@ -3710,7 +3722,7 @@ fn payout_creates_controller() { // mock::events() // ); - // assert_ok!(NodleStaking::payout_stakers(Origin::signed(1337), 11, 1)); + // assert_ok!(NodleStaking::payout_stakers(RuntimeOrigin::signed(1337), 11, 1)); // // Controller is created // assert!(Balances::free_balance(1337) > 0); @@ -3779,7 +3791,7 @@ fn reward_validator_slashing_validator_does_not_overflow() { bond_validator(81, stake); assert_ok!(Session::set_keys( - Origin::signed(81), + RuntimeOrigin::signed(81), UintAuthorityId(81).into(), vec![] )); @@ -3824,7 +3836,7 @@ fn reward_validator_slashing_validator_does_not_overflow() { ]; assert_eq!(events(), expected); - assert_ok!(NodleStaking::withdraw_staking_rewards(Origin::signed(81))); + assert_ok!(NodleStaking::withdraw_staking_rewards(RuntimeOrigin::signed(81))); let mut new1 = vec![Event::Rewarded(81, 36893488147419103230)]; expected.append(&mut new1); @@ -4110,7 +4122,7 @@ fn slash_in_old_span_does_not_deselect() { assert_eq!(NodleStaking::total(), 3200); - assert_ok!(NodleStaking::validator_bond_more(Origin::signed(11), 10)); + assert_ok!(NodleStaking::validator_bond_more(RuntimeOrigin::signed(11), 10)); assert_eq!( NodleStaking::validator_state(11).unwrap().state, ValidatorStatus::Active @@ -4365,7 +4377,12 @@ fn invulnerables_are_not_slashed() { Balances::make_free_balance_be(&201, 1000); - assert_ok!(NodleStaking::nominator_nominate(Origin::signed(201), 21, 500, false,)); + assert_ok!(NodleStaking::nominator_nominate( + RuntimeOrigin::signed(201), + 21, + 500, + false, + )); mock::start_active_session(3); @@ -4630,9 +4647,9 @@ fn garbage_collection_after_slashing() { // TODO :: Validation of DB instance Clean-off pending // // reap_stash respects num_slashing_spans so that weight is accurate - // assert_noop!(Staking::reap_stash(Origin::none(), 11, 0), + // assert_noop!(Staking::reap_stash(RuntimeOrigin::none(), 11, 0), // Error::::IncorrectSlashingSpans); - // assert_ok!(Staking::reap_stash(Origin::none(), 11, 2)); + // assert_ok!(Staking::reap_stash(RuntimeOrigin::none(), 11, 2)); // assert!(::SlashingSpans::get(&11).is_none()); // assert_eq!(::SpanSlash::get(&(11, 0)).amount_slashed(), &0); @@ -4708,9 +4725,9 @@ fn garbage_collection_after_slashing_ed_1() { // TODO :: Validation of DB instance Clean-off pending // // reap_stash respects num_slashing_spans so that weight is accurate - // assert_noop!(Staking::reap_stash(Origin::none(), 11, 0), - // Error::::IncorrectSlashingSpans); assert_ok!(Staking::reap_stash(Origin::none(), - // 11, 2)); + // assert_noop!(Staking::reap_stash(RuntimeOrigin::none(), 11, 0), + // Error::::IncorrectSlashingSpans); + // assert_ok!(Staking::reap_stash(RuntimeOrigin::none(), 11, 2)); // assert!(::SlashingSpans::get(&11).is_none()); // assert_eq!(::SpanSlash::get(&(11, 0)).amount_slashed(), &0); @@ -4781,7 +4798,7 @@ fn slash_kicks_validators_not_nominators_and_activate_validator_to_rejoin_pool() assert_eq!(events(), expected); // activate validator 11 in session 3 - assert_ok!(NodleStaking::validator_bond_more(Origin::signed(11), 10)); + assert_ok!(NodleStaking::validator_bond_more(RuntimeOrigin::signed(11), 10)); mock::start_active_session(4); @@ -4817,7 +4834,12 @@ fn slash_kicks_validators_not_nominators_and_activate_validator_to_rejoin_pool() #[test] fn slashing_nominators_by_span_max() { ExtBuilder::default().num_validators(4).build_and_execute(|| { - assert_ok!(NodleStaking::nominator_nominate(Origin::signed(101), 21, 500, false,)); + assert_ok!(NodleStaking::nominator_nominate( + RuntimeOrigin::signed(101), + 21, + 500, + false, + )); mock::start_active_session(1); mock::start_active_session(2); @@ -4961,7 +4983,12 @@ fn slashing_nominators_by_span_max() { #[test] fn slashes_are_summed_across_spans() { ExtBuilder::default().num_validators(4).build_and_execute(|| { - assert_ok!(NodleStaking::nominator_nominate(Origin::signed(101), 21, 500, false,)); + assert_ok!(NodleStaking::nominator_nominate( + RuntimeOrigin::signed(101), + 21, + 500, + false, + )); mock::start_active_session(1); mock::start_active_session(2); mock::start_active_session(3); @@ -5024,7 +5051,7 @@ fn slashes_are_summed_across_spans() { assert_eq!(get_span(21).iter().collect::>(), expected_spans,); - assert_ok!(NodleStaking::validator_bond_more(Origin::signed(21), 10)); + assert_ok!(NodleStaking::validator_bond_more(RuntimeOrigin::signed(21), 10)); mock::start_active_session(5); @@ -5221,11 +5248,11 @@ fn remove_deferred() { // fails if empty assert_noop!( - NodleStaking::slash_cancel_deferred(Origin::root(), 1, vec![]), + NodleStaking::slash_cancel_deferred(RuntimeOrigin::root(), 1, vec![]), Error::::EmptyTargets ); - assert_ok!(NodleStaking::slash_cancel_deferred(Origin::root(), 1, vec![11],)); + assert_ok!(NodleStaking::slash_cancel_deferred(RuntimeOrigin::root(), 1, vec![11],)); mock::start_active_session(3); @@ -5378,20 +5405,20 @@ fn remove_multi_deferred() { assert_eq!(>::get(apply_at).len(), 5); assert_noop!( - NodleStaking::slash_cancel_deferred(Origin::root(), 1, vec![]), + NodleStaking::slash_cancel_deferred(RuntimeOrigin::root(), 1, vec![]), Error::::EmptyTargets ); assert_noop!( - NodleStaking::slash_cancel_deferred(Origin::root(), apply_at, vec![11]), + NodleStaking::slash_cancel_deferred(RuntimeOrigin::root(), apply_at, vec![11]), Error::::InvalidSessionIndex ); - assert_ok!(NodleStaking::slash_cancel_deferred(Origin::root(), 1, vec![11]),); + assert_ok!(NodleStaking::slash_cancel_deferred(RuntimeOrigin::root(), 1, vec![11]),); assert_eq!(>::get(apply_at).len(), 3); - assert_ok!(NodleStaking::slash_cancel_deferred(Origin::root(), 1, vec![69]),); + assert_ok!(NodleStaking::slash_cancel_deferred(RuntimeOrigin::root(), 1, vec![69]),); assert_eq!(>::get(apply_at).len(), 2); diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index a89c151d116..c8bd98ba744 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -22,18 +22,18 @@ std = [ ] [dependencies] -serde = { version = "1.0.144", optional = true, features = ["derive"] } +serde = { version = "1.0.152", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] } scale-info = { version = "2.0.1", default-features = false, features = [ "derive" ] } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.29" } -xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.29" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot.git", default-features = false, branch = "release-v0.9.29" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } +xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot.git", default-features = false, branch = "release-v0.9.37" } diff --git a/runtimes/eden/Cargo.toml b/runtimes/eden/Cargo.toml index 0a9a0c65890..bdc2b8cacde 100644 --- a/runtimes/eden/Cargo.toml +++ b/runtimes/eden/Cargo.toml @@ -38,7 +38,6 @@ std = [ "pallet-aura/std", "pallet-collator-selection/std", "pallet-contracts-primitives/std", - "pallet-contracts-rpc-runtime-api/std", "pallet-contracts/std", "pallet-xcm/std", "polkadot-parachain/std", @@ -75,10 +74,10 @@ std = [ "sp-npos-elections/std", ] runtime-benchmarks = [ - "frame-benchmarking", + "frame-benchmarking/runtime-benchmarks", + "frame-system-benchmarking/runtime-benchmarks", "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", - "frame-system-benchmarking", "pallet-allocations/runtime-benchmarks", "pallet-balances/runtime-benchmarks", "pallet-collective/runtime-benchmarks", @@ -137,12 +136,6 @@ try-runtime = [ "pallet-xcm/try-runtime", "parachain-info/try-runtime", ] -# Make contract callable functions marked as __unstable__ available. Do not enable -# on live chains as those are subject to change. -contracts-unstable-interface = [ - "pallet-contracts/unstable-interface" -] - [dependencies] static_assertions = "1.1.0" @@ -152,72 +145,73 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features = hex-literal = { version = "0.3.4", optional = true } log = { version = "0.4.17", default-features = false } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -serde = { version = "1.0.144", optional = true, features = ["derive"] } +serde = { version = "1.0.152", optional = true, features = ["derive"] } smallvec = "1.9.0" lazy_static = {version = "1.4.0", default-features = false, features = ["spin_no_std"] } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.29" } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.29" } -frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -pallet-im-online = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -pallet-membership = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -pallet-preimage = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -pallet-aura = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.29" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.37" } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.37" } +frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-im-online = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-membership = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-multisig = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-offences = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-preimage = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-uniques = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-aura = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.37" } + +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.37", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot.git", default-features = false, branch = "release-v0.9.37" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.29", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot.git", default-features = false, branch = "release-v0.9.29" } +pallet-contracts = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +pallet-contracts-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } -pallet-contracts = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -pallet-contracts-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -pallet-contracts-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot.git", default-features = false, branch = "release-v0.9.29" } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot.git", default-features = false, branch = "release-v0.9.29" } -xcm = { git = "https://github.com/paritytech/polkadot.git", default-features = false, branch = "release-v0.9.29" } -xcm-builder = { git = "https://github.com/paritytech/polkadot.git", default-features = false, branch = "release-v0.9.29" } -xcm-executor = { git = "https://github.com/paritytech/polkadot.git", default-features = false, branch = "release-v0.9.29" } -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus.git", default-features = false, branch = "polkadot-v0.9.29" } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus.git", default-features = false, branch = "polkadot-v0.9.29" } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus.git", default-features = false, branch = "polkadot-v0.9.29" } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus.git", default-features = false, branch = "polkadot-v0.9.29" } -pallet-collator-selection = { git = "https://github.com/paritytech/cumulus.git", default-features = false, branch = "polkadot-v0.9.29" } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus.git", default-features = false, branch = "polkadot-v0.9.29" } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus.git", default-features = false, branch = "polkadot-v0.9.29" } -cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus.git", default-features = false, branch = "polkadot-v0.9.29" } -parachain-info = { git = "https://github.com/paritytech/cumulus.git", default-features = false, branch = "polkadot-v0.9.29" } -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-application-crypto = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-consensus-babe = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-npos-elections = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29" } -sp-consensus-aura = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.29" } -frame-try-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29", optional = true } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot.git", default-features = false, branch = "release-v0.9.37" } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot.git", default-features = false, branch = "release-v0.9.37" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.37" } +xcm = { git = "https://github.com/paritytech/polkadot.git", default-features = false, branch = "release-v0.9.37" } +xcm-builder = { git = "https://github.com/paritytech/polkadot.git", default-features = false, branch = "release-v0.9.37" } +xcm-executor = { git = "https://github.com/paritytech/polkadot.git", default-features = false, branch = "release-v0.9.37" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/cumulus.git", default-features = false, branch = "polkadot-v0.9.37" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/cumulus.git", default-features = false, branch = "polkadot-v0.9.37" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus.git", default-features = false, branch = "polkadot-v0.9.37" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus.git", default-features = false, branch = "polkadot-v0.9.37" } +pallet-collator-selection = { git = "https://github.com/paritytech/cumulus.git", default-features = false, branch = "polkadot-v0.9.37" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus.git", default-features = false, branch = "polkadot-v0.9.37" } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/cumulus.git", default-features = false, branch = "polkadot-v0.9.37" } +cumulus-primitives-utility = { git = "https://github.com/paritytech/cumulus.git", default-features = false, branch = "polkadot-v0.9.37" } +parachain-info = { git = "https://github.com/paritytech/cumulus.git", default-features = false, branch = "polkadot-v0.9.37" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-application-crypto = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-consensus-babe = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-npos-elections = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" } +sp-consensus-aura = { git = "https://github.com/paritytech/substrate.git", default-features = false, branch = "polkadot-v0.9.37" } +frame-try-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37", optional = true } primitives = { default-features = false, path = "../../primitives" } pallet-allocations = { default-features = false, path = "../../pallets/allocations" } pallet-reserve = { default-features = false, path = "../../pallets/reserve" } @@ -225,4 +219,4 @@ pallet-grants = { default-features = false, path = "../../pallets/grants" } pallet-mandate = { default-features = false, path = "../../pallets/mandate" } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" } diff --git a/runtimes/eden/src/constants.rs b/runtimes/eden/src/constants.rs index b5b02e92109..f2cecb2d655 100644 --- a/runtimes/eden/src/constants.rs +++ b/runtimes/eden/src/constants.rs @@ -17,10 +17,11 @@ */ use frame_support::{ + dispatch::DispatchClass, parameter_types, weights::{ - constants::{BlockExecutionWeight, ExtrinsicBaseWeight, WEIGHT_PER_SECOND}, - DispatchClass, Weight, + constants::{BlockExecutionWeight, ExtrinsicBaseWeight, WEIGHT_REF_TIME_PER_SECOND}, + Weight, }, }; use frame_system::limits::BlockWeights; @@ -70,7 +71,10 @@ pub const TARGET_BLOCK_FULLNESS: Perquintill = Perquintill::from_percent(25); /// by Operational extrinsics. pub const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75); /// We allow for .5 seconds of compute with a 16 second average block time. -pub const MAXIMUM_BLOCK_WEIGHT: Weight = WEIGHT_PER_SECOND.saturating_div(2); +pub const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_parts( + WEIGHT_REF_TIME_PER_SECOND.saturating_div(2), + polkadot_primitives::v2::MAX_POV_SIZE as u64, +); const_assert!(NORMAL_DISPATCH_RATIO.deconstruct() >= AVERAGE_ON_INITIALIZE_RATIO.deconstruct()); diff --git a/runtimes/eden/src/lib.rs b/runtimes/eden/src/lib.rs index 45c7e86c53d..6e0ab92cd00 100644 --- a/runtimes/eden/src/lib.rs +++ b/runtimes/eden/src/lib.rs @@ -34,6 +34,7 @@ pub fn wasm_binary_unwrap() -> &'static [u8] { ) } +use constants::RuntimeBlockWeights; use frame_support::{construct_runtime, weights::Weight}; use pallet_transaction_payment::{FeeDetails, RuntimeDispatchInfo}; use primitives::{AccountId, Balance, BlockNumber, Hash, Index, Signature}; @@ -146,11 +147,11 @@ pub type SignedExtra = ( pallet_transaction_payment::ChargeTransactionPayment, ); /// Unchecked extrinsic type as expected by this runtime. -pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; /// The payload being signed in transactions. -pub type SignedPayload = generic::SignedPayload; +pub type SignedPayload = generic::SignedPayload; /// Extrinsic type that has already been checked. -pub type CheckedExtrinsic = generic::CheckedExtrinsic; +pub type CheckedExtrinsic = generic::CheckedExtrinsic; /// Executive: handles dispatch to the various modules. pub type Executive = frame_executive::Executive< @@ -267,41 +268,44 @@ sp_api::impl_runtime_apis! { } } - impl pallet_contracts_rpc_runtime_api::ContractsApi + impl pallet_contracts::ContractsApi for Runtime { fn call( origin: AccountId, dest: AccountId, value: Balance, - gas_limit: u64, + gas_limit: Option, storage_deposit_limit: Option, input_data: Vec, ) -> pallet_contracts_primitives::ContractExecResult { + let gas_limit = gas_limit.unwrap_or(RuntimeBlockWeights::get().max_block); Contracts::bare_call( origin, dest, value, - Weight::from_ref_time(gas_limit), + gas_limit, storage_deposit_limit, input_data, constants::CONTRACTS_DEBUG_OUTPUT, + pallet_contracts::Determinism::Deterministic, ) } fn instantiate( origin: AccountId, value: Balance, - gas_limit: u64, + gas_limit: Option, storage_deposit_limit: Option, code: pallet_contracts_primitives::Code, data: Vec, salt: Vec, ) -> pallet_contracts_primitives::ContractInstantiateResult { + let gas_limit = gas_limit.unwrap_or(RuntimeBlockWeights::get().max_block); Contracts::bare_instantiate( origin, value, - Weight::from_ref_time(gas_limit), + gas_limit, storage_deposit_limit, code, data, @@ -314,8 +318,9 @@ sp_api::impl_runtime_apis! { origin: AccountId, code: Vec, storage_deposit_limit: Option, + determinism: pallet_contracts::Determinism, ) -> pallet_contracts_primitives::CodeUploadResult { - Contracts::bare_upload_code(origin, code, storage_deposit_limit) + Contracts::bare_upload_code(origin, code, storage_deposit_limit, determinism) } fn get_storage( @@ -402,18 +407,18 @@ sp_api::impl_runtime_apis! { #[cfg(feature = "try-runtime")] impl frame_try_runtime::TryRuntime for Runtime { - fn on_runtime_upgrade() -> (Weight, Weight) { + fn on_runtime_upgrade(checks: frame_support::traits::UpgradeCheckSelect) -> (Weight, Weight) { // NOTE: intentional unwrap: we don't want to propagate the error backwards, and want to // have a backtrace here. If any of the pre/post migration checks fail, we shall stop // right here and right now. log::debug!("on_runtime_upgrade"); - let weight = Executive::try_runtime_upgrade().unwrap(); + let weight = Executive::try_runtime_upgrade(checks).unwrap(); (weight, constants::RuntimeBlockWeights::get().max_block) } - fn execute_block(block: Block, state_root_check: bool, select: frame_support::traits::TryStateSelect) -> Weight { + fn execute_block(block: Block, state_root_check: bool, signature_check: bool, select: frame_support::traits::TryStateSelect) -> Weight { log::debug!("Executive::try_execute_block {block:?}-{state_root_check:?}-{select:?}"); - Executive::try_execute_block(block, state_root_check, select).expect("execute-block failed") + Executive::try_execute_block(block, state_root_check, signature_check,select).expect("execute-block failed") } } } @@ -454,7 +459,7 @@ mod tests { fn validate_transaction_submitter_bounds() { fn is_submit_signed_transaction() where - T: CreateSignedTransaction, + T: CreateSignedTransaction, { } diff --git a/runtimes/eden/src/migrations.rs b/runtimes/eden/src/migrations.rs index 2dc05aaabaa..254d9c058be 100644 --- a/runtimes/eden/src/migrations.rs +++ b/runtimes/eden/src/migrations.rs @@ -3,7 +3,9 @@ use frame_support::{migration, parameter_types, traits::OnRuntimeUpgrade, weight use primitives::{AccountId, Balance}; #[cfg(feature = "try-runtime")] -use frame_support::traits::OnRuntimeUpgradeHelpersExt; +use codec::{Decode, Encode}; +#[cfg(feature = "try-runtime")] +use sp_std::prelude::*; // MaxMembers is chosen based on what used to be the MaxMembers param for the pallet ValidaorsSet // We have intentionally used the same number for MaxInvulnerables for the pallet CollatorSelection @@ -80,21 +82,20 @@ impl OnRuntimeUpgrade for MoveValidatorsSetToInvulnerables { } #[cfg(feature = "try-runtime")] - fn pre_upgrade() -> Result<(), &'static str> { + fn pre_upgrade() -> Result, &'static str> { if let Some(validators) = migration::get_storage_value::>( VALIDATORS_SET_MODULE, MEMBERS_ITEM, EMPTY_HASH, ) { - Self::set_temp_storage(validators, "ValidatorsSet::Members"); - Ok(()) + Ok(validators.encode()) } else { Err("Remove the runtime upgrade code") } } #[cfg(feature = "try-runtime")] - fn post_upgrade() -> Result<(), &'static str> { + fn post_upgrade(state: Vec) -> Result<(), &'static str> { if migration::have_storage_value(VALIDATORS_SET_MODULE, MEMBERS_ITEM, EMPTY_HASH) || migration::have_storage_value(VALIDATORS_SET_MODULE, PRIME_ITEM, EMPTY_HASH) || migration::have_storage_value(POA_MODULE, STORAGE_VERSION_ITEM, EMPTY_HASH) @@ -113,8 +114,7 @@ impl OnRuntimeUpgrade for MoveValidatorsSetToInvulnerables { "CollatorSelection::candidacy_bond is {:?}", candidacy_bond ); - let validators = - Self::get_temp_storage::>("ValidatorsSet::Members").unwrap(); + let validators: BoundedVec = Decode::decode(&mut state.as_slice()).unwrap(); if invulnerables == validators && candidacy_bond == CANDIDACY_BOND { log::info!(target: TRY_RUNTIME, "MoveValidatorsSetToInvulnerables was successful"); Ok(()) diff --git a/runtimes/eden/src/pallets_consensus.rs b/runtimes/eden/src/pallets_consensus.rs index 8470ef65017..3b79f92848c 100644 --- a/runtimes/eden/src/pallets_consensus.rs +++ b/runtimes/eden/src/pallets_consensus.rs @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -use crate::{constants, Aura, Balances, CollatorSelection, Event, Runtime, Session}; +use crate::{constants, Aura, Balances, CollatorSelection, Runtime, RuntimeEvent, Session}; use frame_support::{parameter_types, PalletId}; use frame_system::EnsureRoot; use primitives::{AccountId, AuraId}; @@ -49,7 +49,7 @@ impl pallet_session::Config for Runtime { type SessionManager = CollatorSelection; type ShouldEndSession = pallet_session::PeriodicSessions; type NextSessionRotation = pallet_session::PeriodicSessions; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type SessionHandler = ::KeyTypeIdProviders; type Keys = SessionKeys; type ValidatorId = AccountId; @@ -80,7 +80,7 @@ parameter_types! { pub type CollatorSelectionUpdateOrigin = EnsureRoot; impl pallet_collator_selection::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type UpdateOrigin = CollatorSelectionUpdateOrigin; type PotId = PotId; diff --git a/runtimes/eden/src/pallets_governance.rs b/runtimes/eden/src/pallets_governance.rs index 23975378775..b188ac141bb 100644 --- a/runtimes/eden/src/pallets_governance.rs +++ b/runtimes/eden/src/pallets_governance.rs @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -use crate::{constants, Call, Event, Origin, Runtime, TechnicalCommittee}; +use crate::{constants, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, TechnicalCommittee}; use frame_support::{parameter_types, traits::EitherOfDiverse, PalletId}; use frame_system::{EnsureNever, EnsureRoot}; use primitives::{AccountId, BlockNumber}; @@ -27,10 +27,10 @@ parameter_types! { } impl pallet_reserve::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = pallet_balances::Pallet; type ExternalOrigin = MoreThanHalfOfTechComm; - type Call = Call; + type RuntimeCall = RuntimeCall; type PalletId = CompanyReservePalletId; type WeightInfo = pallet_reserve::weights::SubstrateWeight; } @@ -40,10 +40,10 @@ parameter_types! { } impl pallet_reserve::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = pallet_balances::Pallet; type ExternalOrigin = MoreThanHalfOfTechComm; - type Call = Call; + type RuntimeCall = RuntimeCall; type PalletId = InternationalReservePalletId; type WeightInfo = pallet_reserve::weights::SubstrateWeight; } @@ -53,10 +53,10 @@ parameter_types! { } impl pallet_reserve::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = pallet_balances::Pallet; type ExternalOrigin = MoreThanHalfOfTechComm; - type Call = Call; + type RuntimeCall = RuntimeCall; type PalletId = UsaReservePalletId; type WeightInfo = pallet_reserve::weights::SubstrateWeight; } @@ -66,12 +66,12 @@ parameter_types! { } impl pallet_reserve::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = pallet_balances::Pallet; // as of now nobody can spend this, later, we need to map this to the // correct governance origin. type ExternalOrigin = EnsureNever; - type Call = Call; + type RuntimeCall = RuntimeCall; type PalletId = DaoReservePalletId; type WeightInfo = pallet_reserve::weights::SubstrateWeight; } @@ -86,9 +86,9 @@ pub type MoreThanHalfOfTechComm = pallet_collective::EnsureProportionMoreThan; pub type EnsureRootOrMoreThanHalfOfTechComm = EitherOfDiverse, MoreThanHalfOfTechComm>; impl pallet_collective::Config for Runtime { - type Origin = Origin; - type Proposal = Call; - type Event = Event; + type RuntimeOrigin = RuntimeOrigin; + type Proposal = RuntimeCall; + type RuntimeEvent = RuntimeEvent; type MotionDuration = MotionDuration; type MaxProposals = MaxProposals; type WeightInfo = (); @@ -97,7 +97,7 @@ impl pallet_collective::Config for Runtime { } impl pallet_membership::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AddOrigin = MoreThanHalfOfTechComm; type RemoveOrigin = MoreThanHalfOfTechComm; type SwapOrigin = MoreThanHalfOfTechComm; @@ -110,7 +110,7 @@ impl pallet_membership::Config for Runtime { } impl pallet_mandate::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type ExternalOrigin = MoreThanHalfOfTechComm; } diff --git a/runtimes/eden/src/pallets_nodle.rs b/runtimes/eden/src/pallets_nodle.rs index 87c1f99f7e4..baa90a7d7ce 100644 --- a/runtimes/eden/src/pallets_nodle.rs +++ b/runtimes/eden/src/pallets_nodle.rs @@ -17,7 +17,7 @@ */ use crate::{ constants, implementations::RelayChainBlockNumberProvider, pallets_governance::MoreThanHalfOfTechComm, - AllocationsOracles, Balances, CompanyReserve, Event, Runtime, + AllocationsOracles, Balances, CompanyReserve, Runtime, RuntimeEvent, }; use frame_support::{parameter_types, PalletId}; use lazy_static::lazy_static; @@ -87,7 +87,7 @@ parameter_types! { } impl pallet_allocations::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type PalletId = AllocPalletId; type ProtocolFee = ProtocolFee; @@ -105,7 +105,7 @@ parameter_types! { } impl pallet_membership::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type AddOrigin = MoreThanHalfOfTechComm; type RemoveOrigin = MoreThanHalfOfTechComm; type SwapOrigin = MoreThanHalfOfTechComm; diff --git a/runtimes/eden/src/pallets_parachain.rs b/runtimes/eden/src/pallets_parachain.rs index c021bf2b432..69cd562e137 100644 --- a/runtimes/eden/src/pallets_parachain.rs +++ b/runtimes/eden/src/pallets_parachain.rs @@ -17,8 +17,8 @@ */ use crate::{ - constants, pallets_governance::EnsureRootOrMoreThanHalfOfTechComm, xcm_config::XcmConfig, DmpQueue, Event, Runtime, - XcmpQueue, + constants, pallets_governance::EnsureRootOrMoreThanHalfOfTechComm, xcm_config::XcmConfig, DmpQueue, Runtime, + RuntimeEvent, XcmpQueue, }; use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; use frame_support::{dispatch::Weight, match_types, parameter_types}; @@ -31,7 +31,7 @@ match_types! { } impl cumulus_pallet_dmp_queue::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type XcmExecutor = XcmExecutor; type ExecuteOverweightOrigin = EnsureRootOrMoreThanHalfOfTechComm; } @@ -41,7 +41,7 @@ parameter_types! { } impl cumulus_pallet_parachain_system::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnSystemEvent = (); type SelfParaId = parachain_info::Pallet; type OutboundXcmpMessageSource = XcmpQueue; diff --git a/runtimes/eden/src/pallets_system.rs b/runtimes/eden/src/pallets_system.rs index fd7175ce514..d7ed4cbe3db 100644 --- a/runtimes/eden/src/pallets_system.rs +++ b/runtimes/eden/src/pallets_system.rs @@ -19,8 +19,8 @@ #![allow(clippy::identity_op)] use crate::{ - constants, implementations::DealWithFees, version::VERSION, Balances, Call, CompanyReserve, Event, Origin, - PalletInfo, Runtime, SignedExtra, SignedPayload, System, UncheckedExtrinsic, + constants, implementations::DealWithFees, version::VERSION, Balances, CompanyReserve, PalletInfo, Runtime, + RuntimeCall, RuntimeEvent, RuntimeOrigin, SignedExtra, SignedPayload, System, UncheckedExtrinsic, }; use codec::Encode; use frame_support::{ @@ -52,8 +52,8 @@ impl frame_system::Config for Runtime { type BlockWeights = constants::RuntimeBlockWeights; type BlockLength = RuntimeBlockLength; type DbWeight = RocksDbWeight; - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = Index; type BlockNumber = BlockNumber; type Hash = Hash; @@ -61,7 +61,7 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; type Lookup = AccountIdLookup; type Header = generic::Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = Version; type PalletInfo = PalletInfo; @@ -97,7 +97,7 @@ impl pallet_balances::Config for Runtime { type ReserveIdentifier = [u8; 8]; type Balance = Balance; type DustRemoval = CompanyReserve; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = frame_system::Pallet; type WeightInfo = crate::weights::pallet_balances::WeightInfo; @@ -112,7 +112,7 @@ parameter_types! { } impl pallet_transaction_payment::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type OnChargeTransaction = CurrencyAdapter; type WeightToFee = IdentityFee; type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; @@ -122,15 +122,15 @@ impl pallet_transaction_payment::Config for Runtime { impl frame_system::offchain::CreateSignedTransaction for Runtime where - Call: From, + RuntimeCall: From, { fn create_transaction>( - call: Call, + call: RuntimeCall, public: ::Signer, account: AccountId, nonce: Index, ) -> Option<( - Call, + RuntimeCall, ::SignaturePayload, )> { // take the biggest period possible. @@ -173,8 +173,8 @@ impl frame_system::offchain::SigningTypes for Runtime { impl frame_system::offchain::SendTransactionTypes for Runtime where - Call: From, + RuntimeCall: From, { - type OverarchingCall = Call; + type OverarchingCall = RuntimeCall; type Extrinsic = UncheckedExtrinsic; } diff --git a/runtimes/eden/src/pallets_util.rs b/runtimes/eden/src/pallets_util.rs index e290cb9abb9..06a0b44aa26 100644 --- a/runtimes/eden/src/pallets_util.rs +++ b/runtimes/eden/src/pallets_util.rs @@ -19,11 +19,11 @@ use crate::{ constants, implementations::RelayChainBlockNumberProvider, pallets_governance::MoreThanHalfOfTechComm, Balances, - Call, Event, Origin, OriginCaller, Preimage, RandomnessCollectiveFlip, Runtime, Timestamp, + OriginCaller, Preimage, RandomnessCollectiveFlip, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, Timestamp, }; use frame_support::{ parameter_types, - traits::{AsEnsureOriginWithArg, ConstU32, EqualPrivilegeOnly, Nothing}, + traits::{AsEnsureOriginWithArg, ConstBool, ConstU32, EqualPrivilegeOnly, Nothing}, weights::Weight, }; use frame_system::{EnsureRoot, EnsureSigned}; @@ -37,7 +37,7 @@ parameter_types! { } impl pallet_grants::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type CancelOrigin = MoreThanHalfOfTechComm; type MaxSchedule = MaxSchedule; @@ -46,8 +46,8 @@ impl pallet_grants::Config for Runtime { } impl pallet_utility::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type PalletsOrigin = OriginCaller; type WeightInfo = crate::weights::pallet_utility::WeightInfo; } @@ -60,8 +60,8 @@ parameter_types! { pub const MaxSignatories: u16 = 100; } impl pallet_multisig::Config for Runtime { - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; type Currency = Balances; type DepositBase = DepositBase; type DepositFactor = DepositFactor; @@ -79,21 +79,19 @@ parameter_types! { } impl pallet_scheduler::Config for Runtime { - type Event = Event; - type Origin = Origin; + type RuntimeEvent = RuntimeEvent; + type RuntimeOrigin = RuntimeOrigin; type PalletsOrigin = OriginCaller; - type Call = Call; + type RuntimeCall = RuntimeCall; type MaximumWeight = MaximumSchedulerWeight; type ScheduleOrigin = frame_system::EnsureRoot; type MaxScheduledPerBlock = MaxScheduledPerBlock; type OriginPrivilegeCmp = EqualPrivilegeOnly; type WeightInfo = crate::weights::pallet_scheduler::WeightInfo; - type PreimageProvider = Preimage; - type NoPreimagePostponement = NoPreimagePostponement; + type Preimages = Preimage; } parameter_types! { - pub const PreimageMaxSize: u32 = 4096 * 1024; pub const PreimageBaseDeposit: Balance = constants::deposit(2, 64); pub const PreimageByteDeposit: Balance = constants::deposit(0, 1); } @@ -101,10 +99,9 @@ parameter_types! { #[allow(clippy::identity_op)] impl pallet_preimage::Config for Runtime { type WeightInfo = crate::weights::pallet_preimage::WeightInfo; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type ManagerOrigin = EnsureRoot; - type MaxSize = PreimageMaxSize; type BaseDeposit = PreimageBaseDeposit; type ByteDeposit = PreimageByteDeposit; } @@ -120,7 +117,7 @@ parameter_types! { } impl pallet_uniques::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type CollectionId = u32; type ItemId = u32; type Currency = Balances; @@ -159,8 +156,8 @@ impl pallet_contracts::Config for Runtime { type Time = Timestamp; type Randomness = RandomnessCollectiveFlip; type Currency = Balances; - type Event = Event; - type Call = Call; + type RuntimeEvent = RuntimeEvent; + type RuntimeCall = RuntimeCall; /// The safest default is to allow no calls at all. /// /// Runtimes should whitelist dispatchables that are allowed to be called from contracts @@ -178,8 +175,8 @@ impl pallet_contracts::Config for Runtime { type Schedule = MySchedule; type CallStack = [Frame; 31]; type AddressGenerator = pallet_contracts::DefaultAddressGenerator; - type ContractAccessWeight = pallet_contracts::DefaultContractAccessWeight; type MaxCodeLen = ConstU32<{ 128 * 1024 }>; - type RelaxedMaxCodeLen = ConstU32<{ 256 * 1024 }>; type MaxStorageKeyLen = ConstU32<128>; + type UnsafeUnstableInterface = ConstBool; + type MaxDebugBufferLen = ConstU32<{ 2 * 1024 * 1024 }>; } diff --git a/runtimes/eden/src/weights/frame_system.rs b/runtimes/eden/src/weights/frame_system.rs index a57ceb88e01..96bf7e866e8 100644 --- a/runtimes/eden/src/weights/frame_system.rs +++ b/runtimes/eden/src/weights/frame_system.rs @@ -19,114 +19,87 @@ //! Autogenerated weights for frame_system //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-11-09, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! HOSTNAME: `chain-bench-012bd056`, CPU: `AMD EPYC 7B13` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: -// target/release/nodle-parachain +// ./target/release/nodle-parachain // benchmark // pallet // --chain=dev // --steps=50 // --repeat=20 -// --pallet=* +// --pallet=frame_system // --extrinsic=* // --execution=wasm // --wasm-execution=compiled -// --template=./.maintain/frame-weight-template.hbs +// --template=./.maintain/external_pallet_weights.hbs // --output=runtimes/eden/src/weights +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -use frame_support::{ - traits::Get, - weights::{constants::RocksDbWeight, Weight}, -}; +use frame_support::{traits::Get, weights::{Weight}}; use sp_std::marker::PhantomData; -/// Weight functions needed for frame_system. -pub trait WeightInfo { - fn remark(b: u32) -> Weight; - fn remark_with_event(b: u32) -> Weight; - fn set_heap_pages() -> Weight; - fn set_storage(i: u32) -> Weight; - fn kill_storage(i: u32) -> Weight; - fn kill_prefix(p: u32) -> Weight; -} - -/// Weights for frame_system using the Substrate node and recommended hardware. -pub struct SubstrateWeight(PhantomData); - -impl WeightInfo for SubstrateWeight { - fn remark(_b: u32) -> Weight { - Weight::from_ref_time(6_613_000_u64) - } - fn remark_with_event(b: u32) -> Weight { - Weight::from_ref_time(0_u64) +/// Weight functions for `frame_system`. +pub struct WeightInfo(PhantomData); +impl frame_system::WeightInfo for WeightInfo { + /// The range of component `b` is `[0, 3932160]`. + fn remark(b: u32, ) -> Weight { + // Minimum execution time: 5_789 nanoseconds. + Weight::from_ref_time(6_831_458_u64) // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000).saturating_mul(b as u64)) + .saturating_add(Weight::from_ref_time(288_u64).saturating_mul(b as u64)) + } + // Storage: System Number (r:1 w:0) + // Storage: System ExecutionPhase (r:1 w:0) + // Storage: System EventCount (r:1 w:1) + // Storage: System Events (r:1 w:1) + /// The range of component `b` is `[0, 3932160]`. + fn remark_with_event(b: u32, ) -> Weight { + // Minimum execution time: 18_840 nanoseconds. + Weight::from_ref_time(35_683_603_u64) + // Standard Error: 3 + .saturating_add(Weight::from_ref_time(1_697_u64).saturating_mul(b as u64)) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } + // Storage: System Digest (r:1 w:1) + // Storage: unknown [0x3a686561707061676573] (r:0 w:1) fn set_heap_pages() -> Weight { - Weight::from_ref_time(19_450_000_u64) + // Minimum execution time: 11_650 nanoseconds. + Weight::from_ref_time(12_231_000_u64) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } - fn set_storage(i: u32) -> Weight { - Weight::from_ref_time(72_573_000_u64) - // Standard Error: 45_000 - .saturating_add(Weight::from_ref_time(1_234_000).saturating_mul(i as u64)) + // Storage: Skipped Metadata (r:0 w:0) + /// The range of component `i` is `[0, 1000]`. + fn set_storage(i: u32, ) -> Weight { + // Minimum execution time: 5_640 nanoseconds. + Weight::from_ref_time(5_790_000_u64) + // Standard Error: 2_209 + .saturating_add(Weight::from_ref_time(876_703_u64).saturating_mul(i as u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i as u64))) } - fn kill_storage(i: u32) -> Weight { - Weight::from_ref_time(0_u64) - // Standard Error: 31_000 - .saturating_add(Weight::from_ref_time(1_389_000).saturating_mul(i as u64)) + // Storage: Skipped Metadata (r:0 w:0) + /// The range of component `i` is `[0, 1000]`. + fn kill_storage(i: u32, ) -> Weight { + // Minimum execution time: 5_640 nanoseconds. + Weight::from_ref_time(5_840_000_u64) + // Standard Error: 894 + .saturating_add(Weight::from_ref_time(599_567_u64).saturating_mul(i as u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i as u64))) } - fn kill_prefix(p: u32) -> Weight { - Weight::from_ref_time(29_451_000_u64) - // Standard Error: 71_000 - .saturating_add(Weight::from_ref_time(2_148_000).saturating_mul(p as u64)) + // Storage: Skipped Metadata (r:0 w:0) + /// The range of component `p` is `[0, 1000]`. + fn kill_prefix(p: u32, ) -> Weight { + // Minimum execution time: 8_070 nanoseconds. + Weight::from_ref_time(8_210_000_u64) + // Standard Error: 1_118 + .saturating_add(Weight::from_ref_time(1_197_428_u64).saturating_mul(p as u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p as u64))) } } - -// For backwards compatibility and tests -impl WeightInfo for () { - fn remark(_b: u32) -> Weight { - Weight::from_ref_time(6_613_000_u64) - } - fn remark_with_event(b: u32) -> Weight { - Weight::from_ref_time(0_u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000).saturating_mul(b as u64)) - .saturating_add(RocksDbWeight::get().reads(4_u64)) - .saturating_add(RocksDbWeight::get().writes(2_u64)) - } - fn set_heap_pages() -> Weight { - Weight::from_ref_time(19_450_000_u64) - .saturating_add(RocksDbWeight::get().reads(1_u64)) - .saturating_add(RocksDbWeight::get().writes(2_u64)) - } - fn set_storage(i: u32) -> Weight { - Weight::from_ref_time(72_573_000_u64) - // Standard Error: 45_000 - .saturating_add(Weight::from_ref_time(1_234_000).saturating_mul(i as u64)) - .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(i as u64))) - } - fn kill_storage(i: u32) -> Weight { - Weight::from_ref_time(0_u64) - // Standard Error: 31_000 - .saturating_add(Weight::from_ref_time(1_389_000).saturating_mul(i as u64)) - .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(i as u64))) - } - fn kill_prefix(p: u32) -> Weight { - Weight::from_ref_time(29_451_000_u64) - // Standard Error: 71_000 - .saturating_add(Weight::from_ref_time(2_148_000).saturating_mul(p as u64)) - .saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(p as u64))) - } -} diff --git a/runtimes/eden/src/weights/pallet_balances.rs b/runtimes/eden/src/weights/pallet_balances.rs index 8b168c990aa..2f3b44ec0c0 100644 --- a/runtimes/eden/src/weights/pallet_balances.rs +++ b/runtimes/eden/src/weights/pallet_balances.rs @@ -19,22 +19,22 @@ //! Autogenerated weights for pallet_balances //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-11-10, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! HOSTNAME: `chain-bench-012bd056`, CPU: `AMD EPYC 7B13` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: -// target/release/nodle-parachain +// ./target/release/nodle-parachain // benchmark // pallet // --chain=dev // --steps=50 // --repeat=20 -// --pallet=* +// --pallet=pallet_balances // --extrinsic=* // --execution=wasm // --wasm-execution=compiled -// --template=./.maintain/frame-weight-template.hbs +// --template=./.maintain/external_pallet_weights.hbs // --output=runtimes/eden/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] @@ -53,8 +53,8 @@ impl pallet_balances::WeightInfo for WeightInfo { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn transfer() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(148_400_000_u64) + // Minimum execution time: 74_510 nanoseconds. + Weight::from_ref_time(77_120_000_u64) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -64,8 +64,8 @@ impl pallet_balances::WeightInfo for WeightInfo { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn transfer_keep_alive() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(89_270_000_u64) + // Minimum execution time: 47_051 nanoseconds. + Weight::from_ref_time(48_040_000_u64) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -76,8 +76,8 @@ impl pallet_balances::WeightInfo for WeightInfo { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn set_balance_creating() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(58_480_000_u64) + // Minimum execution time: 32_031 nanoseconds. + Weight::from_ref_time(33_220_000_u64) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -88,8 +88,8 @@ impl pallet_balances::WeightInfo for WeightInfo { // Storage: System Events (r:1 w:1) // Storage: Balances TotalIssuance (r:1 w:1) fn set_balance_killing() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(67_690_000_u64) + // Minimum execution time: 36_060 nanoseconds. + Weight::from_ref_time(38_020_000_u64) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -99,8 +99,8 @@ impl pallet_balances::WeightInfo for WeightInfo { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn force_transfer() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(146_180_000_u64) + // Minimum execution time: 73_050 nanoseconds. + Weight::from_ref_time(75_180_000_u64) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -110,8 +110,8 @@ impl pallet_balances::WeightInfo for WeightInfo { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn transfer_all() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(108_510_000_u64) + // Minimum execution time: 56_240 nanoseconds. + Weight::from_ref_time(58_370_000_u64) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -121,8 +121,8 @@ impl pallet_balances::WeightInfo for WeightInfo { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn force_unreserve() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(51_860_000_u64) + // Minimum execution time: 28_760 nanoseconds. + Weight::from_ref_time(30_040_000_u64) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } diff --git a/runtimes/eden/src/weights/pallet_collator_selection.rs b/runtimes/eden/src/weights/pallet_collator_selection.rs index 5d905141d4f..d819cfba2e0 100644 --- a/runtimes/eden/src/weights/pallet_collator_selection.rs +++ b/runtimes/eden/src/weights/pallet_collator_selection.rs @@ -19,22 +19,22 @@ //! Autogenerated weights for pallet_collator_selection //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-11-10, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! HOSTNAME: `chain-bench-012bd056`, CPU: `AMD EPYC 7B13` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: -// target/release/nodle-parachain +// ./target/release/nodle-parachain // benchmark // pallet // --chain=dev // --steps=50 // --repeat=20 -// --pallet=* +// --pallet=pallet_collator_selection // --extrinsic=* // --execution=wasm // --wasm-execution=compiled -// --template=./.maintain/frame-weight-template.hbs +// --template=./.maintain/external_pallet_weights.hbs // --output=runtimes/eden/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] @@ -55,10 +55,10 @@ impl pallet_collator_selection::WeightInfo for WeightIn // Storage: CollatorSelection Invulnerables (r:0 w:1) /// The range of component `b` is `[1, 50]`. fn set_invulnerables(b: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(27_740_000_u64) - // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(3_825_000_u64).saturating_mul(b as u64)) + // Minimum execution time: 27_500 nanoseconds. + Weight::from_ref_time(27_690_752_u64) + // Standard Error: 6_224 + .saturating_add(Weight::from_ref_time(3_646_206_u64).saturating_mul(b as u64)) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(b as u64))) .saturating_add(T::DbWeight::get().writes(3_u64)) @@ -69,8 +69,8 @@ impl pallet_collator_selection::WeightInfo for WeightIn // Storage: System Events (r:1 w:1) // Storage: CollatorSelection DesiredCandidates (r:0 w:1) fn set_desired_candidates() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(17_060_000_u64) + // Minimum execution time: 17_980 nanoseconds. + Weight::from_ref_time(18_519_000_u64) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -80,8 +80,8 @@ impl pallet_collator_selection::WeightInfo for WeightIn // Storage: System Events (r:1 w:1) // Storage: CollatorSelection CandidacyBond (r:0 w:1) fn set_candidacy_bond() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(17_210_000_u64) + // Minimum execution time: 18_310 nanoseconds. + Weight::from_ref_time(18_690_000_u64) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -95,12 +95,12 @@ impl pallet_collator_selection::WeightInfo for WeightIn // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) - /// The range of component `c` is `[1, 1000]`. + /// The range of component `c` is `[1, 999]`. fn register_as_candidate(c: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(87_743_000_u64) - // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(174_000_u64).saturating_mul(c as u64)) + // Minimum execution time: 63_740 nanoseconds. + Weight::from_ref_time(70_915_519_u64) + // Standard Error: 1_045 + .saturating_add(Weight::from_ref_time(98_293_u64).saturating_mul(c as u64)) .saturating_add(T::DbWeight::get().reads(9_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -112,10 +112,10 @@ impl pallet_collator_selection::WeightInfo for WeightIn // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) /// The range of component `c` is `[6, 1000]`. fn leave_intent(c: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(74_476_000_u64) - // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(176_000_u64).saturating_mul(c as u64)) + // Minimum execution time: 48_830 nanoseconds. + Weight::from_ref_time(50_443_394_u64) + // Standard Error: 1_094 + .saturating_add(Weight::from_ref_time(98_703_u64).saturating_mul(c as u64)) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -127,8 +127,8 @@ impl pallet_collator_selection::WeightInfo for WeightIn // Storage: System BlockWeight (r:1 w:1) // Storage: CollatorSelection LastAuthoredBlock (r:0 w:1) fn note_author() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(48_840_000_u64) + // Minimum execution time: 47_750 nanoseconds. + Weight::from_ref_time(49_210_000_u64) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(6_u64)) } @@ -143,15 +143,14 @@ impl pallet_collator_selection::WeightInfo for WeightIn // Storage: System BlockWeight (r:1 w:1) /// The range of component `r` is `[1, 1000]`. /// The range of component `c` is `[1, 1000]`. - fn new_session(r: u32, c: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(0_u64) - // Standard Error: 1_586_000 - .saturating_add(Weight::from_ref_time(9_206_000_u64).saturating_mul(r as u64)) - // Standard Error: 1_586_000 - .saturating_add(Weight::from_ref_time(42_192_000_u64).saturating_mul(c as u64)) - .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(c as u64))) - .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r as u64))) + fn new_session(_r: u32, c: u32, ) -> Weight { + // Minimum execution time: 28_870 nanoseconds. + Weight::from_ref_time(29_680_000_u64) + // Standard Error: 929_982 + .saturating_add(Weight::from_ref_time(32_997_978_u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c as u64))) + .saturating_add(T::DbWeight::get().writes(1_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c as u64))) } } diff --git a/runtimes/eden/src/weights/pallet_contracts.rs b/runtimes/eden/src/weights/pallet_contracts.rs index 83a405a40b9..2faada095e8 100644 --- a/runtimes/eden/src/weights/pallet_contracts.rs +++ b/runtimes/eden/src/weights/pallet_contracts.rs @@ -19,22 +19,22 @@ //! Autogenerated weights for pallet_contracts //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-11-10, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! HOSTNAME: `chain-bench-012bd056`, CPU: `AMD EPYC 7B13` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: -// target/release/nodle-parachain +// ./target/release/nodle-parachain // benchmark // pallet // --chain=dev // --steps=50 // --repeat=20 -// --pallet=* +// --pallet=pallet_contracts // --extrinsic=* // --execution=wasm // --wasm-execution=compiled -// --template=./.maintain/frame-weight-template.hbs +// --template=./.maintain/external_pallet_weights.hbs // --output=runtimes/eden/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] @@ -50,17 +50,17 @@ pub struct WeightInfo(PhantomData); impl pallet_contracts::weights::WeightInfo for WeightInfo { // Storage: Contracts DeletionQueue (r:1 w:0) fn on_process_deletion_queue_batch() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(4_330_000_u64) + // Minimum execution time: 4_000 nanoseconds. + Weight::from_ref_time(4_170_000_u64) .saturating_add(T::DbWeight::get().reads(1_u64)) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `k` is `[0, 1024]`. fn on_initialize_per_trie_key(k: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(15_641_000_u64) - // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(1_222_000_u64).saturating_mul(k as u64)) + // Minimum execution time: 20_000 nanoseconds. + Weight::from_ref_time(3_119_030_u64) + // Standard Error: 1_317 + .saturating_add(Weight::from_ref_time(1_129_027_u64).saturating_mul(k as u64)) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(k as u64))) @@ -68,10 +68,10 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: Contracts DeletionQueue (r:1 w:0) /// The range of component `q` is `[0, 1024]`. fn on_initialize_per_queue_item(q: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(40_257_000_u64) - // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(1_772_000_u64).saturating_mul(q as u64)) + // Minimum execution time: 4_050 nanoseconds. + Weight::from_ref_time(1_055_856_u64) + // Standard Error: 6_649 + .saturating_add(Weight::from_ref_time(1_786_983_u64).saturating_mul(q as u64)) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -79,13 +79,14 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: Contracts CodeStorage (r:0 w:1) /// The range of component `c` is `[0, 64226]`. fn reinstrument(c: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(30_422_000_u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(55_000_u64).saturating_mul(c as u64)) + // Minimum execution time: 40_800 nanoseconds. + Weight::from_ref_time(39_878_984_u64) + // Standard Error: 54 + .saturating_add(Weight::from_ref_time(64_530_u64).saturating_mul(c as u64)) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -97,14 +98,15 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `c` is `[0, 131072]`. fn call_with_code_per_byte(c: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(0_u64) - // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(91_000_u64).saturating_mul(c as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 387_340 nanoseconds. + Weight::from_ref_time(421_731_977_u64) + // Standard Error: 25 + .saturating_add(Weight::from_ref_time(34_775_u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(6_u64)) } // Storage: Contracts CodeStorage (r:1 w:1) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts Nonce (r:1 w:1) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Timestamp Now (r:1 w:0) @@ -117,18 +119,22 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: Contracts PristineCode (r:0 w:1) // Storage: Contracts OwnerInfoOf (r:0 w:1) /// The range of component `c` is `[0, 64226]`. + /// The range of component `i` is `[0, 1048576]`. /// The range of component `s` is `[0, 1048576]`. - fn instantiate_with_code(c: u32, s: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(355_140_000_u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(135_000_u64).saturating_mul(c as u64)) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000_u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(12_u64)) + fn instantiate_with_code(c: u32, i: u32, s: u32, ) -> Weight { + // Minimum execution time: 4_647_050 nanoseconds. + Weight::from_ref_time(418_726_582_u64) + // Standard Error: 202 + .saturating_add(Weight::from_ref_time(115_626_u64).saturating_mul(c as u64)) + // Standard Error: 12 + .saturating_add(Weight::from_ref_time(2_033_u64).saturating_mul(i as u64)) + // Standard Error: 12 + .saturating_add(Weight::from_ref_time(2_063_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(13_u64)) .saturating_add(T::DbWeight::get().writes(11_u64)) } // Storage: Contracts CodeStorage (r:1 w:1) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts Nonce (r:1 w:1) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Timestamp Now (r:1 w:0) @@ -139,15 +145,19 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System Events (r:1 w:1) // Storage: Contracts OwnerInfoOf (r:1 w:1) // Storage: System EventTopics (r:2 w:2) + /// The range of component `i` is `[0, 1048576]`. /// The range of component `s` is `[0, 1048576]`. - fn instantiate(s: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(266_401_000_u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000_u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(12_u64)) + fn instantiate(i: u32, s: u32, ) -> Weight { + // Minimum execution time: 2_360_140 nanoseconds. + Weight::from_ref_time(337_684_646_u64) + // Standard Error: 8 + .saturating_add(Weight::from_ref_time(1_955_u64).saturating_mul(i as u64)) + // Standard Error: 8 + .saturating_add(Weight::from_ref_time(2_006_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(13_u64)) .saturating_add(T::DbWeight::get().writes(9_u64)) } + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -158,9 +168,9 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System Events (r:1 w:1) // Storage: System EventTopics (r:2 w:2) fn call() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(224_880_000_u64) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 228_229 nanoseconds. + Weight::from_ref_time(233_950_000_u64) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(6_u64)) } // Storage: Contracts CodeStorage (r:1 w:1) @@ -173,10 +183,10 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: Contracts OwnerInfoOf (r:0 w:1) /// The range of component `c` is `[0, 64226]`. fn upload_code(c: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(76_559_000_u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(56_000_u64).saturating_mul(c as u64)) + // Minimum execution time: 396_700 nanoseconds. + Weight::from_ref_time(397_731_277_u64) + // Standard Error: 67 + .saturating_add(Weight::from_ref_time(114_243_u64).saturating_mul(c as u64)) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(6_u64)) } @@ -189,8 +199,8 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: Contracts CodeStorage (r:0 w:1) // Storage: Contracts PristineCode (r:0 w:1) fn remove_code() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(46_190_000_u64) + // Minimum execution time: 51_091 nanoseconds. + Weight::from_ref_time(52_110_000_u64) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(6_u64)) } @@ -202,12 +212,13 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System Events (r:1 w:1) // Storage: System EventTopics (r:3 w:3) fn set_code() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(50_911_000_u64) + // Minimum execution time: 52_370 nanoseconds. + Weight::from_ref_time(53_900_000_u64) .saturating_add(T::DbWeight::get().reads(10_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -218,14 +229,15 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `r` is `[0, 20]`. fn seal_caller(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(294_173_000_u64) - // Standard Error: 39_000 - .saturating_add(Weight::from_ref_time(61_089_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 374_930 nanoseconds. + Weight::from_ref_time(384_241_995_u64) + // Standard Error: 29_594 + .saturating_add(Weight::from_ref_time(29_744_875_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -236,15 +248,16 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `r` is `[0, 20]`. fn seal_is_contract(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(0_u64) - // Standard Error: 12_484_000 - .saturating_add(Weight::from_ref_time(597_845_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 373_770 nanoseconds. + Weight::from_ref_time(375_223_244_u64) + // Standard Error: 191_220 + .saturating_add(Weight::from_ref_time(273_344_760_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().reads((80_u64).saturating_mul(r as u64))) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -255,15 +268,16 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `r` is `[0, 20]`. fn seal_code_hash(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(1_532_524_000_u64) - // Standard Error: 5_671_000 - .saturating_add(Weight::from_ref_time(318_251_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 375_390 nanoseconds. + Weight::from_ref_time(389_041_521_u64) + // Standard Error: 181_376 + .saturating_add(Weight::from_ref_time(349_831_355_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().reads((80_u64).saturating_mul(r as u64))) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -274,14 +288,15 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `r` is `[0, 20]`. fn seal_own_code_hash(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(296_955_000_u64) - // Standard Error: 39_000 - .saturating_add(Weight::from_ref_time(69_060_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 373_929 nanoseconds. + Weight::from_ref_time(383_209_465_u64) + // Standard Error: 38_732 + .saturating_add(Weight::from_ref_time(39_570_471_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -292,14 +307,15 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `r` is `[0, 20]`. fn seal_caller_is_origin(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(365_477_000_u64) - // Standard Error: 267_000 - .saturating_add(Weight::from_ref_time(29_015_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 370_380 nanoseconds. + Weight::from_ref_time(380_740_983_u64) + // Standard Error: 18_917 + .saturating_add(Weight::from_ref_time(12_233_096_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -310,14 +326,15 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `r` is `[0, 20]`. fn seal_address(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(399_984_000_u64) - // Standard Error: 43_000 - .saturating_add(Weight::from_ref_time(159_073_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 375_450 nanoseconds. + Weight::from_ref_time(384_574_143_u64) + // Standard Error: 31_217 + .saturating_add(Weight::from_ref_time(29_980_846_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -328,14 +345,15 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `r` is `[0, 20]`. fn seal_gas_left(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(844_956_000_u64) - // Standard Error: 4_039_000 - .saturating_add(Weight::from_ref_time(77_171_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 374_130 nanoseconds. + Weight::from_ref_time(384_147_293_u64) + // Standard Error: 28_073 + .saturating_add(Weight::from_ref_time(29_730_935_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -346,14 +364,15 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `r` is `[0, 20]`. fn seal_balance(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(284_213_000_u64) - // Standard Error: 11_175_000 - .saturating_add(Weight::from_ref_time(336_425_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(11_u64)) + // Minimum execution time: 373_630 nanoseconds. + Weight::from_ref_time(389_256_459_u64) + // Standard Error: 71_558 + .saturating_add(Weight::from_ref_time(163_882_572_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(12_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -364,14 +383,15 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `r` is `[0, 20]`. fn seal_value_transferred(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(344_787_000_u64) - // Standard Error: 304_000 - .saturating_add(Weight::from_ref_time(57_103_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 375_040 nanoseconds. + Weight::from_ref_time(383_650_511_u64) + // Standard Error: 31_008 + .saturating_add(Weight::from_ref_time(29_938_528_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -382,14 +402,15 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `r` is `[0, 20]`. fn seal_minimum_balance(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(295_508_000_u64) - // Standard Error: 38_000 - .saturating_add(Weight::from_ref_time(60_308_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 375_661 nanoseconds. + Weight::from_ref_time(384_730_322_u64) + // Standard Error: 39_273 + .saturating_add(Weight::from_ref_time(29_645_374_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -400,14 +421,15 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `r` is `[0, 20]`. fn seal_block_number(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(295_589_000_u64) - // Standard Error: 34_000 - .saturating_add(Weight::from_ref_time(60_084_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 375_240 nanoseconds. + Weight::from_ref_time(383_974_823_u64) + // Standard Error: 32_916 + .saturating_add(Weight::from_ref_time(29_775_447_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -418,14 +440,15 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `r` is `[0, 20]`. fn seal_now(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(293_930_000_u64) - // Standard Error: 36_000 - .saturating_add(Weight::from_ref_time(60_440_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 373_560 nanoseconds. + Weight::from_ref_time(386_410_274_u64) + // Standard Error: 33_967 + .saturating_add(Weight::from_ref_time(30_281_784_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -437,14 +460,15 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: TransactionPayment NextFeeMultiplier (r:1 w:0) /// The range of component `r` is `[0, 20]`. fn seal_weight_to_fee(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(299_711_000_u64) - // Standard Error: 53_000 - .saturating_add(Weight::from_ref_time(171_668_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(11_u64)) + // Minimum execution time: 373_770 nanoseconds. + Weight::from_ref_time(390_200_544_u64) + // Standard Error: 111_958 + .saturating_add(Weight::from_ref_time(147_820_066_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(12_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -455,14 +479,15 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `r` is `[0, 20]`. fn seal_gas(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(0_u64) - // Standard Error: 1_888_000 - .saturating_add(Weight::from_ref_time(70_995_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 209_880 nanoseconds. + Weight::from_ref_time(220_388_453_u64) + // Standard Error: 17_950 + .saturating_add(Weight::from_ref_time(10_038_336_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -473,14 +498,15 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `r` is `[0, 20]`. fn seal_input(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(489_558_000_u64) - // Standard Error: 3_192_000 - .saturating_add(Weight::from_ref_time(107_244_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 374_510 nanoseconds. + Weight::from_ref_time(385_779_367_u64) + // Standard Error: 39_644 + .saturating_add(Weight::from_ref_time(23_037_287_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -491,14 +517,15 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `n` is `[0, 1024]`. fn seal_input_per_kb(n: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(468_860_000_u64) - // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(12_004_000_u64).saturating_mul(n as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 406_220 nanoseconds. + Weight::from_ref_time(426_732_983_u64) + // Standard Error: 1_825 + .saturating_add(Weight::from_ref_time(12_075_040_u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -509,14 +536,15 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `r` is `[0, 1]`. fn seal_return(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(287_480_000_u64) - // Standard Error: 456_000 - .saturating_add(Weight::from_ref_time(1_608_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 367_860 nanoseconds. + Weight::from_ref_time(377_678_457_u64) + // Standard Error: 511_935 + .saturating_add(Weight::from_ref_time(4_612_442_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -527,14 +555,15 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `n` is `[0, 1024]`. fn seal_return_per_kb(n: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(290_396_000_u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(223_000_u64).saturating_mul(n as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 374_270 nanoseconds. + Weight::from_ref_time(380_250_092_u64) + // Standard Error: 360 + .saturating_add(Weight::from_ref_time(223_682_u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -547,16 +576,17 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: Contracts OwnerInfoOf (r:1 w:1) /// The range of component `r` is `[0, 1]`. fn seal_terminate(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(291_082_000_u64) - // Standard Error: 431_000 - .saturating_add(Weight::from_ref_time(78_397_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 371_680 nanoseconds. + Weight::from_ref_time(380_869_024_u64) + // Standard Error: 486_176 + .saturating_add(Weight::from_ref_time(83_978_875_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().reads((5_u64).saturating_mul(r as u64))) .saturating_add(T::DbWeight::get().writes(5_u64)) .saturating_add(T::DbWeight::get().writes((6_u64).saturating_mul(r as u64))) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -568,14 +598,15 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0) /// The range of component `r` is `[0, 20]`. fn seal_random(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(81_376_000_u64) - // Standard Error: 1_711_000 - .saturating_add(Weight::from_ref_time(559_864_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(11_u64)) + // Minimum execution time: 374_580 nanoseconds. + Weight::from_ref_time(386_078_408_u64) + // Standard Error: 74_486 + .saturating_add(Weight::from_ref_time(190_517_722_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(12_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -586,14 +617,15 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `r` is `[0, 20]`. fn seal_deposit_event(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(327_316_000_u64) - // Standard Error: 3_275_000 - .saturating_add(Weight::from_ref_time(911_539_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 369_670 nanoseconds. + Weight::from_ref_time(384_220_936_u64) + // Standard Error: 87_596 + .saturating_add(Weight::from_ref_time(392_571_322_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -605,18 +637,19 @@ impl pallet_contracts::weights::WeightInfo for WeightIn /// The range of component `t` is `[0, 4]`. /// The range of component `n` is `[0, 16]`. fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(2_425_069_000_u64) - // Standard Error: 15_920_000 - .saturating_add(Weight::from_ref_time(207_279_000_u64).saturating_mul(t as u64)) - // Standard Error: 4_372_000 - .saturating_add(Weight::from_ref_time(22_009_000_u64).saturating_mul(n as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 1_746_740 nanoseconds. + Weight::from_ref_time(637_101_068_u64) + // Standard Error: 3_338_167 + .saturating_add(Weight::from_ref_time(274_612_317_u64).saturating_mul(t as u64)) + // Standard Error: 916_822 + .saturating_add(Weight::from_ref_time(70_829_555_u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().reads((80_u64).saturating_mul(t as u64))) .saturating_add(T::DbWeight::get().writes(5_u64)) .saturating_add(T::DbWeight::get().writes((80_u64).saturating_mul(t as u64))) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -627,21 +660,21 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `r` is `[0, 20]`. fn seal_debug_message(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(474_725_000_u64) - // Standard Error: 872_000 - .saturating_add(Weight::from_ref_time(25_204_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 224_980 nanoseconds. + Weight::from_ref_time(235_465_001_u64) + // Standard Error: 33_585 + .saturating_add(Weight::from_ref_time(16_670_320_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `r` is `[0, 10]`. fn seal_set_storage(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(0_u64) - // Standard Error: 18_897_000 - .saturating_add(Weight::from_ref_time(1_030_847_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 375_840 nanoseconds. + Weight::from_ref_time(362_075_686_u64) + // Standard Error: 286_905 + .saturating_add(Weight::from_ref_time(507_426_254_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().reads((80_u64).saturating_mul(r as u64))) .saturating_add(T::DbWeight::get().writes(5_u64)) .saturating_add(T::DbWeight::get().writes((80_u64).saturating_mul(r as u64))) @@ -649,11 +682,11 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: Skipped Metadata (r:0 w:0) /// The range of component `n` is `[0, 8]`. fn seal_set_storage_per_new_kb(n: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(1_335_782_000_u64) - // Standard Error: 5_226_000 - .saturating_add(Weight::from_ref_time(14_987_000_u64).saturating_mul(n as u64)) - .saturating_add(T::DbWeight::get().reads(56_u64)) + // Minimum execution time: 586_160 nanoseconds. + Weight::from_ref_time(781_959_208_u64) + // Standard Error: 1_794_493 + .saturating_add(Weight::from_ref_time(103_944_808_u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(57_u64)) .saturating_add(T::DbWeight::get().reads((7_u64).saturating_mul(n as u64))) .saturating_add(T::DbWeight::get().writes(52_u64)) .saturating_add(T::DbWeight::get().writes((7_u64).saturating_mul(n as u64))) @@ -661,108 +694,109 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: Skipped Metadata (r:0 w:0) /// The range of component `n` is `[0, 8]`. fn seal_set_storage_per_old_kb(n: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(695_363_000_u64) - // Standard Error: 1_476_000 - .saturating_add(Weight::from_ref_time(69_164_000_u64).saturating_mul(n as u64)) + // Minimum execution time: 585_660 nanoseconds. + Weight::from_ref_time(730_420_078_u64) + // Standard Error: 1_299_756 + .saturating_add(Weight::from_ref_time(65_166_667_u64).saturating_mul(n as u64)) .saturating_add(T::DbWeight::get().reads(56_u64)) .saturating_add(T::DbWeight::get().reads((7_u64).saturating_mul(n as u64))) - .saturating_add(T::DbWeight::get().writes(52_u64)) + .saturating_add(T::DbWeight::get().writes(51_u64)) .saturating_add(T::DbWeight::get().writes((7_u64).saturating_mul(n as u64))) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `r` is `[0, 10]`. fn seal_clear_storage(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(277_889_000_u64) - // Standard Error: 251_000 - .saturating_add(Weight::from_ref_time(554_103_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 373_500 nanoseconds. + Weight::from_ref_time(356_858_657_u64) + // Standard Error: 323_179 + .saturating_add(Weight::from_ref_time(499_722_120_u64).saturating_mul(r as u64)) .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().reads((80_u64).saturating_mul(r as u64))) - .saturating_add(T::DbWeight::get().writes(6_u64)) + .saturating_add(T::DbWeight::get().writes(5_u64)) .saturating_add(T::DbWeight::get().writes((80_u64).saturating_mul(r as u64))) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `n` is `[0, 8]`. fn seal_clear_storage_per_kb(n: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(666_001_000_u64) - // Standard Error: 1_664_000 - .saturating_add(Weight::from_ref_time(71_550_000_u64).saturating_mul(n as u64)) - .saturating_add(T::DbWeight::get().reads(55_u64)) + // Minimum execution time: 541_360 nanoseconds. + Weight::from_ref_time(696_840_573_u64) + // Standard Error: 1_422_251 + .saturating_add(Weight::from_ref_time(70_507_554_u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(56_u64)) .saturating_add(T::DbWeight::get().reads((7_u64).saturating_mul(n as u64))) - .saturating_add(T::DbWeight::get().writes(51_u64)) + .saturating_add(T::DbWeight::get().writes(50_u64)) .saturating_add(T::DbWeight::get().writes((7_u64).saturating_mul(n as u64))) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `r` is `[0, 10]`. fn seal_get_storage(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(281_244_000_u64) - // Standard Error: 212_000 - .saturating_add(Weight::from_ref_time(465_757_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 375_630 nanoseconds. + Weight::from_ref_time(369_022_038_u64) + // Standard Error: 283_405 + .saturating_add(Weight::from_ref_time(418_659_327_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().reads((80_u64).saturating_mul(r as u64))) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `n` is `[0, 8]`. fn seal_get_storage_per_kb(n: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(612_778_000_u64) - // Standard Error: 1_464_000 - .saturating_add(Weight::from_ref_time(146_497_000_u64).saturating_mul(n as u64)) - .saturating_add(T::DbWeight::get().reads(55_u64)) + // Minimum execution time: 510_950 nanoseconds. + Weight::from_ref_time(696_743_469_u64) + // Standard Error: 2_142_695 + .saturating_add(Weight::from_ref_time(146_456_902_u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(56_u64)) .saturating_add(T::DbWeight::get().reads((7_u64).saturating_mul(n as u64))) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `r` is `[0, 10]`. fn seal_contains_storage(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(279_929_000_u64) - // Standard Error: 181_000 - .saturating_add(Weight::from_ref_time(434_102_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 376_820 nanoseconds. + Weight::from_ref_time(369_612_732_u64) + // Standard Error: 225_398 + .saturating_add(Weight::from_ref_time(401_089_260_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().reads((80_u64).saturating_mul(r as u64))) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `n` is `[0, 8]`. fn seal_contains_storage_per_kb(n: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(580_015_000_u64) - // Standard Error: 1_236_000 - .saturating_add(Weight::from_ref_time(63_161_000_u64).saturating_mul(n as u64)) - .saturating_add(T::DbWeight::get().reads(55_u64)) + // Minimum execution time: 509_629 nanoseconds. + Weight::from_ref_time(641_054_053_u64) + // Standard Error: 1_187_815 + .saturating_add(Weight::from_ref_time(62_459_232_u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(56_u64)) .saturating_add(T::DbWeight::get().reads((7_u64).saturating_mul(n as u64))) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `r` is `[0, 10]`. fn seal_take_storage(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(282_158_000_u64) - // Standard Error: 235_000 - .saturating_add(Weight::from_ref_time(582_938_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 374_690 nanoseconds. + Weight::from_ref_time(357_636_339_u64) + // Standard Error: 305_917 + .saturating_add(Weight::from_ref_time(518_681_324_u64).saturating_mul(r as u64)) .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().reads((80_u64).saturating_mul(r as u64))) - .saturating_add(T::DbWeight::get().writes(6_u64)) + .saturating_add(T::DbWeight::get().writes(5_u64)) .saturating_add(T::DbWeight::get().writes((80_u64).saturating_mul(r as u64))) } // Storage: Skipped Metadata (r:0 w:0) /// The range of component `n` is `[0, 8]`. fn seal_take_storage_per_kb(n: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(697_468_000_u64) - // Standard Error: 1_892_000 - .saturating_add(Weight::from_ref_time(154_514_000_u64).saturating_mul(n as u64)) + // Minimum execution time: 539_760 nanoseconds. + Weight::from_ref_time(752_918_382_u64) + // Standard Error: 2_296_949 + .saturating_add(Weight::from_ref_time(154_570_665_u64).saturating_mul(n as u64)) .saturating_add(T::DbWeight::get().reads(56_u64)) .saturating_add(T::DbWeight::get().reads((7_u64).saturating_mul(n as u64))) - .saturating_add(T::DbWeight::get().writes(51_u64)) + .saturating_add(T::DbWeight::get().writes(50_u64)) .saturating_add(T::DbWeight::get().writes((7_u64).saturating_mul(n as u64))) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -773,16 +807,17 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `r` is `[0, 20]`. fn seal_transfer(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(0_u64) - // Standard Error: 88_949_000 - .saturating_add(Weight::from_ref_time(5_690_029_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(11_u64)) + // Minimum execution time: 375_390 nanoseconds. + Weight::from_ref_time(311_502_046_u64) + // Standard Error: 422_872 + .saturating_add(Weight::from_ref_time(2_317_260_070_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(12_u64)) .saturating_add(T::DbWeight::get().reads((80_u64).saturating_mul(r as u64))) .saturating_add(T::DbWeight::get().writes(6_u64)) .saturating_add(T::DbWeight::get().writes((80_u64).saturating_mul(r as u64))) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -793,16 +828,17 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `r` is `[0, 20]`. fn seal_call(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(0_u64) - // Standard Error: 210_338_000 - .saturating_add(Weight::from_ref_time(21_803_527_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(11_u64)) + // Minimum execution time: 376_480 nanoseconds. + Weight::from_ref_time(380_739_000_u64) + // Standard Error: 6_953_397 + .saturating_add(Weight::from_ref_time(26_367_840_416_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(12_u64)) .saturating_add(T::DbWeight::get().reads((160_u64).saturating_mul(r as u64))) .saturating_add(T::DbWeight::get().writes(5_u64)) .saturating_add(T::DbWeight::get().writes((160_u64).saturating_mul(r as u64))) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -813,14 +849,17 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `r` is `[0, 20]`. fn seal_delegate_call(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(15_455_397_000_u64) - // Standard Error: 274_361_000 - .saturating_add(Weight::from_ref_time(23_463_183_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads((158_u64).saturating_mul(r as u64))) - .saturating_add(T::DbWeight::get().writes((79_u64).saturating_mul(r as u64))) + // Minimum execution time: 375_240 nanoseconds. + Weight::from_ref_time(379_890_000_u64) + // Standard Error: 9_773_871 + .saturating_add(Weight::from_ref_time(26_059_927_893_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) + .saturating_add(T::DbWeight::get().reads((150_u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(5_u64)) + .saturating_add(T::DbWeight::get().writes((75_u64).saturating_mul(r as u64))) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:81 w:81) // Storage: Contracts CodeStorage (r:2 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -832,16 +871,19 @@ impl pallet_contracts::weights::WeightInfo for WeightIn /// The range of component `t` is `[0, 1]`. /// The range of component `c` is `[0, 1024]`. fn seal_call_per_transfer_clone_kb(t: u32, c: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(32_277_802_000_u64) - // Standard Error: 280_000 - .saturating_add(Weight::from_ref_time(1_555_000_u64).saturating_mul(c as u64)) - .saturating_add(T::DbWeight::get().reads(171_u64)) + // Minimum execution time: 14_856_658 nanoseconds. + Weight::from_ref_time(13_096_083_616_u64) + // Standard Error: 4_314_249 + .saturating_add(Weight::from_ref_time(1_904_331_080_u64).saturating_mul(t as u64)) + // Standard Error: 6_468 + .saturating_add(Weight::from_ref_time(12_305_168_u64).saturating_mul(c as u64)) + .saturating_add(T::DbWeight::get().reads(172_u64)) .saturating_add(T::DbWeight::get().reads((81_u64).saturating_mul(t as u64))) .saturating_add(T::DbWeight::get().writes(165_u64)) .saturating_add(T::DbWeight::get().writes((81_u64).saturating_mul(t as u64))) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -854,16 +896,17 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: Contracts OwnerInfoOf (r:80 w:80) /// The range of component `r` is `[0, 20]`. fn seal_instantiate(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(0_u64) - // Standard Error: 401_546_000 - .saturating_add(Weight::from_ref_time(32_146_190_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(12_u64)) + // Minimum execution time: 374_820 nanoseconds. + Weight::from_ref_time(381_820_000_u64) + // Standard Error: 37_991_839 + .saturating_add(Weight::from_ref_time(34_256_030_643_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(13_u64)) .saturating_add(T::DbWeight::get().reads((400_u64).saturating_mul(r as u64))) .saturating_add(T::DbWeight::get().writes(7_u64)) .saturating_add(T::DbWeight::get().writes((400_u64).saturating_mul(r as u64))) } // Storage: System Account (r:81 w:81) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:81 w:81) // Storage: Contracts CodeStorage (r:2 w:1) // Storage: Timestamp Now (r:1 w:0) @@ -875,20 +918,24 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: Contracts OwnerInfoOf (r:1 w:1) // Storage: System EventTopics (r:82 w:82) /// The range of component `t` is `[0, 1]`. + /// The range of component `i` is `[0, 960]`. /// The range of component `s` is `[0, 960]`. - fn seal_instantiate_per_transfer_salt_kb(t: u32, s: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(17_031_126_000_u64) - // Standard Error: 184_503_000 - .saturating_add(Weight::from_ref_time(2_239_556_000_u64).saturating_mul(t as u64)) - // Standard Error: 295_000 - .saturating_add(Weight::from_ref_time(133_497_000_u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(253_u64)) + fn seal_instantiate_per_transfer_input_salt_kb(t: u32, i: u32, s: u32, ) -> Weight { + // Minimum execution time: 172_650_495 nanoseconds. + Weight::from_ref_time(20_507_482_309_u64) + // Standard Error: 72_145_724 + .saturating_add(Weight::from_ref_time(885_467_280_u64).saturating_mul(t as u64)) + // Standard Error: 117_649 + .saturating_add(Weight::from_ref_time(158_436_455_u64).saturating_mul(i as u64)) + // Standard Error: 117_649 + .saturating_add(Weight::from_ref_time(159_114_943_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(254_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(t as u64))) .saturating_add(T::DbWeight::get().writes(249_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(t as u64))) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -897,16 +944,17 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) // Storage: System EventTopics (r:2 w:2) - /// The range of component `r` is `[0, 20]`. + /// The range of component `r` is `[0, 1]`. fn seal_hash_sha2_256(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(293_983_000_u64) - // Standard Error: 34_000 - .saturating_add(Weight::from_ref_time(60_464_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 368_810 nanoseconds. + Weight::from_ref_time(377_539_332_u64) + // Standard Error: 411_469 + .saturating_add(Weight::from_ref_time(37_527_667_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -917,14 +965,15 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `n` is `[0, 1024]`. fn seal_hash_sha2_256_per_kb(n: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(1_349_680_000_u64) - // Standard Error: 517_000 - .saturating_add(Weight::from_ref_time(70_253_000_u64).saturating_mul(n as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 411_320 nanoseconds. + Weight::from_ref_time(413_949_000_u64) + // Standard Error: 117_743 + .saturating_add(Weight::from_ref_time(91_882_152_u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -933,16 +982,17 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) // Storage: System EventTopics (r:2 w:2) - /// The range of component `r` is `[0, 20]`. + /// The range of component `r` is `[0, 1]`. fn seal_hash_keccak_256(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(291_125_000_u64) - // Standard Error: 37_000 - .saturating_add(Weight::from_ref_time(90_053_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 368_531 nanoseconds. + Weight::from_ref_time(377_473_073_u64) + // Standard Error: 449_402 + .saturating_add(Weight::from_ref_time(65_905_726_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -953,14 +1003,15 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `n` is `[0, 1024]`. fn seal_hash_keccak_256_per_kb(n: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(1_367_835_000_u64) - // Standard Error: 510_000 - .saturating_add(Weight::from_ref_time(234_990_000_u64).saturating_mul(n as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 438_940 nanoseconds. + Weight::from_ref_time(442_890_000_u64) + // Standard Error: 115_798 + .saturating_add(Weight::from_ref_time(256_347_756_u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -969,16 +1020,17 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) // Storage: System EventTopics (r:2 w:2) - /// The range of component `r` is `[0, 20]`. + /// The range of component `r` is `[0, 1]`. fn seal_hash_blake2_256(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(291_272_000_u64) - // Standard Error: 40_000 - .saturating_add(Weight::from_ref_time(75_207_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 368_880 nanoseconds. + Weight::from_ref_time(377_968_383_u64) + // Standard Error: 456_544 + .saturating_add(Weight::from_ref_time(47_378_516_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -989,14 +1041,15 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `n` is `[0, 1024]`. fn seal_hash_blake2_256_per_kb(n: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(1_261_495_000_u64) - // Standard Error: 502_000 - .saturating_add(Weight::from_ref_time(114_134_000_u64).saturating_mul(n as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 417_180 nanoseconds. + Weight::from_ref_time(424_810_000_u64) + // Standard Error: 118_011 + .saturating_add(Weight::from_ref_time(135_721_772_u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -1005,16 +1058,17 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) // Storage: System EventTopics (r:2 w:2) - /// The range of component `r` is `[0, 20]`. + /// The range of component `r` is `[0, 1]`. fn seal_hash_blake2_128(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(289_948_000_u64) - // Standard Error: 34_000 - .saturating_add(Weight::from_ref_time(72_869_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 369_160 nanoseconds. + Weight::from_ref_time(377_700_802_u64) + // Standard Error: 383_440 + .saturating_add(Weight::from_ref_time(46_940_097_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -1025,14 +1079,15 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventTopics (r:2 w:2) /// The range of component `n` is `[0, 1024]`. fn seal_hash_blake2_128_per_kb(n: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(1_262_361_000_u64) - // Standard Error: 503_000 - .saturating_add(Weight::from_ref_time(113_968_000_u64).saturating_mul(n as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 419_220 nanoseconds. + Weight::from_ref_time(422_530_000_u64) + // Standard Error: 121_035 + .saturating_add(Weight::from_ref_time(135_821_850_u64).saturating_mul(n as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -1041,16 +1096,17 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) // Storage: System EventTopics (r:2 w:2) - /// The range of component `r` is `[0, 20]`. + /// The range of component `r` is `[0, 1]`. fn seal_ecdsa_recover(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(381_361_000_u64) - // Standard Error: 1_596_000 - .saturating_add(Weight::from_ref_time(3_486_331_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 374_080 nanoseconds. + Weight::from_ref_time(383_243_006_u64) + // Standard Error: 494_644 + .saturating_add(Weight::from_ref_time(3_460_104_693_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -1059,16 +1115,17 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) // Storage: System EventTopics (r:2 w:2) - /// The range of component `r` is `[0, 20]`. + /// The range of component `r` is `[0, 1]`. fn seal_ecdsa_to_eth_address(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(308_376_000_u64) - // Standard Error: 1_714_000 - .saturating_add(Weight::from_ref_time(2_483_898_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads(10_u64)) + // Minimum execution time: 373_720 nanoseconds. + Weight::from_ref_time(382_171_389_u64) + // Standard Error: 490_180 + .saturating_add(Weight::from_ref_time(893_717_410_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) // Storage: Contracts ContractInfoOf (r:1 w:1) // Storage: Contracts CodeStorage (r:1 w:0) // Storage: Timestamp Now (r:1 w:0) @@ -1080,368 +1137,435 @@ impl pallet_contracts::weights::WeightInfo for WeightIn // Storage: Contracts OwnerInfoOf (r:16 w:16) /// The range of component `r` is `[0, 20]`. fn seal_set_code_hash(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(0_u64) - // Standard Error: 2_122_000 - .saturating_add(Weight::from_ref_time(1_634_965_000_u64).saturating_mul(r as u64)) - .saturating_add(T::DbWeight::get().reads((158_u64).saturating_mul(r as u64))) - .saturating_add(T::DbWeight::get().writes((158_u64).saturating_mul(r as u64))) + // Minimum execution time: 375_400 nanoseconds. + Weight::from_ref_time(379_920_000_u64) + // Standard Error: 4_274_293 + .saturating_add(Weight::from_ref_time(2_075_242_900_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) + .saturating_add(T::DbWeight::get().reads((225_u64).saturating_mul(r as u64))) + .saturating_add(T::DbWeight::get().writes(5_u64)) + .saturating_add(T::DbWeight::get().writes((150_u64).saturating_mul(r as u64))) + } + // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) + // Storage: Contracts ContractInfoOf (r:1 w:1) + // Storage: Contracts CodeStorage (r:1 w:0) + // Storage: Timestamp Now (r:1 w:0) + // Storage: System Number (r:1 w:0) + // Storage: System ExecutionPhase (r:1 w:0) + // Storage: System EventCount (r:1 w:1) + // Storage: System Events (r:1 w:1) + // Storage: System EventTopics (r:2 w:2) + /// The range of component `r` is `[0, 20]`. + fn seal_reentrance_count(r: u32, ) -> Weight { + // Minimum execution time: 371_340 nanoseconds. + Weight::from_ref_time(380_448_352_u64) + // Standard Error: 25_172 + .saturating_add(Weight::from_ref_time(12_749_761_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) + .saturating_add(T::DbWeight::get().writes(5_u64)) + } + // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) + // Storage: Contracts ContractInfoOf (r:1 w:1) + // Storage: Contracts CodeStorage (r:1 w:0) + // Storage: Timestamp Now (r:1 w:0) + // Storage: System Number (r:1 w:0) + // Storage: System ExecutionPhase (r:1 w:0) + // Storage: System EventCount (r:1 w:1) + // Storage: System Events (r:1 w:1) + // Storage: System EventTopics (r:2 w:2) + /// The range of component `r` is `[0, 20]`. + fn seal_account_reentrance_count(r: u32, ) -> Weight { + // Minimum execution time: 374_570 nanoseconds. + Weight::from_ref_time(396_424_298_u64) + // Standard Error: 94_030 + .saturating_add(Weight::from_ref_time(21_655_277_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(11_u64)) + .saturating_add(T::DbWeight::get().writes(5_u64)) + } + // Storage: System Account (r:1 w:0) + // Storage: Balances TotalIssuance (r:1 w:0) + // Storage: Contracts ContractInfoOf (r:1 w:1) + // Storage: Contracts CodeStorage (r:1 w:0) + // Storage: Timestamp Now (r:1 w:0) + // Storage: System Number (r:1 w:0) + // Storage: System ExecutionPhase (r:1 w:0) + // Storage: System EventCount (r:1 w:1) + // Storage: System Events (r:1 w:1) + // Storage: System EventTopics (r:2 w:2) + // Storage: Contracts Nonce (r:1 w:1) + /// The range of component `r` is `[0, 20]`. + fn seal_instantiation_nonce(r: u32, ) -> Weight { + // Minimum execution time: 370_100 nanoseconds. + Weight::from_ref_time(382_842_223_u64) + // Standard Error: 20_033 + .saturating_add(Weight::from_ref_time(10_541_825_u64).saturating_mul(r as u64)) + .saturating_add(T::DbWeight::get().reads(12_u64)) + .saturating_add(T::DbWeight::get().writes(6_u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64const(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(88_662_000_u64) - // Standard Error: 84_000 - .saturating_add(Weight::from_ref_time(1_449_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_589 nanoseconds. + Weight::from_ref_time(1_764_328_u64) + // Standard Error: 232 + .saturating_add(Weight::from_ref_time(409_645_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64load(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(5_852_000_u64) - // Standard Error: 137_000 - .saturating_add(Weight::from_ref_time(10_651_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_780 nanoseconds. + Weight::from_ref_time(2_393_634_u64) + // Standard Error: 2_645 + .saturating_add(Weight::from_ref_time(1_204_105_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64store(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(80_054_000_u64) - // Standard Error: 7_000 - .saturating_add(Weight::from_ref_time(8_388_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_840 nanoseconds. + Weight::from_ref_time(2_235_907_u64) + // Standard Error: 3_239 + .saturating_add(Weight::from_ref_time(1_861_634_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_select(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(91_884_000_u64) - // Standard Error: 117_000 - .saturating_add(Weight::from_ref_time(11_506_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_571 nanoseconds. + Weight::from_ref_time(1_960_642_u64) + // Standard Error: 1_635 + .saturating_add(Weight::from_ref_time(1_203_956_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_if(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(37_887_000_u64) - // Standard Error: 312_000 - .saturating_add(Weight::from_ref_time(9_501_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_530 nanoseconds. + Weight::from_ref_time(1_046_496_u64) + // Standard Error: 20_799 + .saturating_add(Weight::from_ref_time(2_208_534_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_br(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(80_078_000_u64) - // Standard Error: 150_000 - .saturating_add(Weight::from_ref_time(2_879_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_560 nanoseconds. + Weight::from_ref_time(2_052_033_u64) + // Standard Error: 326 + .saturating_add(Weight::from_ref_time(669_385_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_br_if(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(85_433_000_u64) - // Standard Error: 156_000 - .saturating_add(Weight::from_ref_time(3_353_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_580 nanoseconds. + Weight::from_ref_time(2_065_657_u64) + // Standard Error: 389 + .saturating_add(Weight::from_ref_time(1_012_658_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_br_table(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(77_449_000_u64) - // Standard Error: 8_000 - .saturating_add(Weight::from_ref_time(3_234_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_610 nanoseconds. + Weight::from_ref_time(2_095_868_u64) + // Standard Error: 413 + .saturating_add(Weight::from_ref_time(1_157_260_u64).saturating_mul(r as u64)) } /// The range of component `e` is `[1, 256]`. fn instr_br_table_per_entry(e: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(85_202_000_u64) - // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(47_000_u64).saturating_mul(e as u64)) + // Minimum execution time: 3_400 nanoseconds. + Weight::from_ref_time(3_855_329_u64) + // Standard Error: 171 + .saturating_add(Weight::from_ref_time(6_281_u64).saturating_mul(e as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_call(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(80_634_000_u64) - // Standard Error: 14_000 - .saturating_add(Weight::from_ref_time(9_260_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_630 nanoseconds. + Weight::from_ref_time(2_002_514_u64) + // Standard Error: 4_081 + .saturating_add(Weight::from_ref_time(5_150_481_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_call_indirect(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(85_680_000_u64) - // Standard Error: 15_000 - .saturating_add(Weight::from_ref_time(11_657_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_860 nanoseconds. + Weight::from_ref_time(5_531_873_u64) + // Standard Error: 5_507 + .saturating_add(Weight::from_ref_time(5_663_703_u64).saturating_mul(r as u64)) } /// The range of component `p` is `[0, 128]`. fn instr_call_indirect_per_param(p: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(79_501_000_u64) - // Standard Error: 47_000 - .saturating_add(Weight::from_ref_time(1_296_000_u64).saturating_mul(p as u64)) + // Minimum execution time: 9_070 nanoseconds. + Weight::from_ref_time(10_271_111_u64) + // Standard Error: 1_266 + .saturating_add(Weight::from_ref_time(252_217_u64).saturating_mul(p as u64)) + } + /// The range of component `l` is `[0, 1024]`. + fn instr_call_per_local(l: u32, ) -> Weight { + // Minimum execution time: 6_720 nanoseconds. + Weight::from_ref_time(8_073_105_u64) + // Standard Error: 42 + .saturating_add(Weight::from_ref_time(57_899_u64).saturating_mul(l as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_local_get(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(129_078_000_u64) - // Standard Error: 145_000 - .saturating_add(Weight::from_ref_time(1_582_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 3_250 nanoseconds. + Weight::from_ref_time(3_482_082_u64) + // Standard Error: 1_360 + .saturating_add(Weight::from_ref_time(2_178_479_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_local_set(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(80_510_000_u64) - // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(1_451_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 3_211 nanoseconds. + Weight::from_ref_time(3_465_643_u64) + // Standard Error: 1_578 + .saturating_add(Weight::from_ref_time(446_580_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_local_tee(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(68_209_000_u64) - // Standard Error: 101_000 - .saturating_add(Weight::from_ref_time(2_827_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 3_220 nanoseconds. + Weight::from_ref_time(3_469_928_u64) + // Standard Error: 506 + .saturating_add(Weight::from_ref_time(640_982_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_global_get(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(160_642_000_u64) - // Standard Error: 195_000 - .saturating_add(Weight::from_ref_time(1_471_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_750 nanoseconds. + Weight::from_ref_time(2_434_656_u64) + // Standard Error: 385 + .saturating_add(Weight::from_ref_time(1_058_479_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_global_set(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(63_044_000_u64) - // Standard Error: 65_000 - .saturating_add(Weight::from_ref_time(8_037_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_780 nanoseconds. + Weight::from_ref_time(2_077_807_u64) + // Standard Error: 4_320 + .saturating_add(Weight::from_ref_time(1_181_788_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_memory_current(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(123_628_000_u64) - // Standard Error: 84_000 - .saturating_add(Weight::from_ref_time(675_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_760 nanoseconds. + Weight::from_ref_time(2_112_579_u64) + // Standard Error: 775 + .saturating_add(Weight::from_ref_time(745_715_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 1]`. fn instr_memory_grow(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(76_967_000_u64) - // Standard Error: 591_000 - .saturating_add(Weight::from_ref_time(229_782_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_660 nanoseconds. + Weight::from_ref_time(1_847_979_u64) + // Standard Error: 105_747 + .saturating_add(Weight::from_ref_time(218_780_020_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64clz(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(85_513_000_u64) - // Standard Error: 130_000 - .saturating_add(Weight::from_ref_time(6_500_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_569 nanoseconds. + Weight::from_ref_time(1_842_224_u64) + // Standard Error: 272 + .saturating_add(Weight::from_ref_time(638_488_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64ctz(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(101_347_000_u64) - // Standard Error: 45_000 - .saturating_add(Weight::from_ref_time(1_529_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_520 nanoseconds. + Weight::from_ref_time(1_842_355_u64) + // Standard Error: 263 + .saturating_add(Weight::from_ref_time(666_726_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64popcnt(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(77_186_000_u64) - // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(2_180_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_600 nanoseconds. + Weight::from_ref_time(1_813_062_u64) + // Standard Error: 370 + .saturating_add(Weight::from_ref_time(667_557_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64eqz(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(77_472_000_u64) - // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(2_203_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_570 nanoseconds. + Weight::from_ref_time(1_825_004_u64) + // Standard Error: 255 + .saturating_add(Weight::from_ref_time(665_885_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64extendsi32(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(76_838_000_u64) - // Standard Error: 15_000 - .saturating_add(Weight::from_ref_time(2_251_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_570 nanoseconds. + Weight::from_ref_time(1_815_123_u64) + // Standard Error: 724 + .saturating_add(Weight::from_ref_time(636_201_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64extendui32(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(77_669_000_u64) - // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(2_161_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_590 nanoseconds. + Weight::from_ref_time(1_842_831_u64) + // Standard Error: 270 + .saturating_add(Weight::from_ref_time(635_226_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i32wrapi64(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(77_375_000_u64) - // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(2_178_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_530 nanoseconds. + Weight::from_ref_time(1_824_672_u64) + // Standard Error: 380 + .saturating_add(Weight::from_ref_time(666_976_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64eq(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(77_302_000_u64) - // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(4_904_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_580 nanoseconds. + Weight::from_ref_time(1_697_816_u64) + // Standard Error: 2_784 + .saturating_add(Weight::from_ref_time(913_092_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64ne(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(46_331_000_u64) - // Standard Error: 167_000 - .saturating_add(Weight::from_ref_time(6_930_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_600 nanoseconds. + Weight::from_ref_time(1_887_693_u64) + // Standard Error: 333 + .saturating_add(Weight::from_ref_time(923_438_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64lts(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(129_591_000_u64) - // Standard Error: 130_000 - .saturating_add(Weight::from_ref_time(4_023_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_540 nanoseconds. + Weight::from_ref_time(1_910_495_u64) + // Standard Error: 348 + .saturating_add(Weight::from_ref_time(924_272_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64ltu(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(78_198_000_u64) - // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(4_847_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_560 nanoseconds. + Weight::from_ref_time(1_937_203_u64) + // Standard Error: 350 + .saturating_add(Weight::from_ref_time(923_110_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64gts(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(93_231_000_u64) - // Standard Error: 110_000 - .saturating_add(Weight::from_ref_time(4_757_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_610 nanoseconds. + Weight::from_ref_time(1_946_759_u64) + // Standard Error: 474 + .saturating_add(Weight::from_ref_time(895_916_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64gtu(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(77_573_000_u64) - // Standard Error: 5_000 - .saturating_add(Weight::from_ref_time(4_868_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_560 nanoseconds. + Weight::from_ref_time(1_920_301_u64) + // Standard Error: 570 + .saturating_add(Weight::from_ref_time(925_226_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64les(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(76_888_000_u64) - // Standard Error: 184_000 - .saturating_add(Weight::from_ref_time(6_111_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_540 nanoseconds. + Weight::from_ref_time(1_926_167_u64) + // Standard Error: 337 + .saturating_add(Weight::from_ref_time(923_736_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64leu(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(30_313_000_u64) - // Standard Error: 187_000 - .saturating_add(Weight::from_ref_time(8_072_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_640 nanoseconds. + Weight::from_ref_time(1_894_778_u64) + // Standard Error: 799 + .saturating_add(Weight::from_ref_time(926_035_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64ges(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(101_605_000_u64) - // Standard Error: 49_000 - .saturating_add(Weight::from_ref_time(4_298_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_610 nanoseconds. + Weight::from_ref_time(1_930_084_u64) + // Standard Error: 794 + .saturating_add(Weight::from_ref_time(896_842_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64geu(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(77_361_000_u64) - // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(4_873_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_620 nanoseconds. + Weight::from_ref_time(1_906_810_u64) + // Standard Error: 469 + .saturating_add(Weight::from_ref_time(924_795_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64add(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(50_838_000_u64) - // Standard Error: 174_000 - .saturating_add(Weight::from_ref_time(6_831_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_650 nanoseconds. + Weight::from_ref_time(1_932_959_u64) + // Standard Error: 320 + .saturating_add(Weight::from_ref_time(951_932_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64sub(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(80_444_000_u64) - // Standard Error: 208_000 - .saturating_add(Weight::from_ref_time(7_596_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_590 nanoseconds. + Weight::from_ref_time(1_948_251_u64) + // Standard Error: 507 + .saturating_add(Weight::from_ref_time(895_059_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64mul(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(136_704_000_u64) - // Standard Error: 160_000 - .saturating_add(Weight::from_ref_time(4_274_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_670 nanoseconds. + Weight::from_ref_time(1_939_255_u64) + // Standard Error: 563 + .saturating_add(Weight::from_ref_time(923_359_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64divs(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(76_879_000_u64) - // Standard Error: 7_000 - .saturating_add(Weight::from_ref_time(4_965_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_610 nanoseconds. + Weight::from_ref_time(1_973_220_u64) + // Standard Error: 445 + .saturating_add(Weight::from_ref_time(1_007_017_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64divu(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(98_158_000_u64) - // Standard Error: 108_000 - .saturating_add(Weight::from_ref_time(4_677_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_630 nanoseconds. + Weight::from_ref_time(1_957_867_u64) + // Standard Error: 407 + .saturating_add(Weight::from_ref_time(979_493_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64rems(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(76_966_000_u64) - // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(4_962_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_570 nanoseconds. + Weight::from_ref_time(1_925_390_u64) + // Standard Error: 1_097 + .saturating_add(Weight::from_ref_time(1_004_588_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64remu(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(77_834_000_u64) - // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(4_970_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_620 nanoseconds. + Weight::from_ref_time(1_937_506_u64) + // Standard Error: 1_140 + .saturating_add(Weight::from_ref_time(1_010_462_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64and(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(76_815_000_u64) - // Standard Error: 7_000 - .saturating_add(Weight::from_ref_time(4_884_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_610 nanoseconds. + Weight::from_ref_time(1_946_892_u64) + // Standard Error: 333 + .saturating_add(Weight::from_ref_time(895_641_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64or(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(89_230_000_u64) - // Standard Error: 166_000 - .saturating_add(Weight::from_ref_time(5_414_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_600 nanoseconds. + Weight::from_ref_time(1_909_159_u64) + // Standard Error: 1_174 + .saturating_add(Weight::from_ref_time(926_966_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64xor(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(37_857_000_u64) - // Standard Error: 195_000 - .saturating_add(Weight::from_ref_time(8_944_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_570 nanoseconds. + Weight::from_ref_time(1_920_084_u64) + // Standard Error: 327 + .saturating_add(Weight::from_ref_time(923_880_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64shl(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(133_789_000_u64) - // Standard Error: 100_000 - .saturating_add(Weight::from_ref_time(3_697_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_620 nanoseconds. + Weight::from_ref_time(1_951_544_u64) + // Standard Error: 497 + .saturating_add(Weight::from_ref_time(895_313_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64shrs(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(49_154_000_u64) - // Standard Error: 204_000 - .saturating_add(Weight::from_ref_time(7_538_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_571 nanoseconds. + Weight::from_ref_time(1_971_579_u64) + // Standard Error: 723 + .saturating_add(Weight::from_ref_time(923_021_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64shru(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(77_213_000_u64) - // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(4_902_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_580 nanoseconds. + Weight::from_ref_time(1_939_863_u64) + // Standard Error: 550 + .saturating_add(Weight::from_ref_time(924_116_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64rotl(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(47_777_000_u64) - // Standard Error: 162_000 - .saturating_add(Weight::from_ref_time(6_806_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_570 nanoseconds. + Weight::from_ref_time(1_920_722_u64) + // Standard Error: 972 + .saturating_add(Weight::from_ref_time(897_627_u64).saturating_mul(r as u64)) } /// The range of component `r` is `[0, 50]`. fn instr_i64rotr(r: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(102_595_000_u64) - // Standard Error: 59_000 - .saturating_add(Weight::from_ref_time(4_228_000_u64).saturating_mul(r as u64)) + // Minimum execution time: 1_580 nanoseconds. + Weight::from_ref_time(1_909_428_u64) + // Standard Error: 648 + .saturating_add(Weight::from_ref_time(925_529_u64).saturating_mul(r as u64)) } } diff --git a/runtimes/eden/src/weights/pallet_membership.rs b/runtimes/eden/src/weights/pallet_membership.rs index 3058a262984..362604d2d5c 100644 --- a/runtimes/eden/src/weights/pallet_membership.rs +++ b/runtimes/eden/src/weights/pallet_membership.rs @@ -19,22 +19,22 @@ //! Autogenerated weights for pallet_membership //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-11-10, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! HOSTNAME: `chain-bench-012bd056`, CPU: `AMD EPYC 7B13` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: -// target/release/nodle-parachain +// ./target/release/nodle-parachain // benchmark // pallet // --chain=dev // --steps=50 // --repeat=20 -// --pallet=* +// --pallet=pallet_membership // --extrinsic=* // --execution=wasm // --wasm-execution=compiled -// --template=./.maintain/frame-weight-template.hbs +// --template=./.maintain/external_pallet_weights.hbs // --output=runtimes/eden/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] @@ -57,10 +57,10 @@ impl pallet_membership::WeightInfo for WeightInfo { // Storage: TechnicalCommittee Prime (r:0 w:1) /// The range of component `m` is `[1, 49]`. fn add_member(m: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(27_262_000_u64) - // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(66_000_u64).saturating_mul(m as u64)) + // Minimum execution time: 27_980 nanoseconds. + Weight::from_ref_time(29_393_446_u64) + // Standard Error: 1_589 + .saturating_add(Weight::from_ref_time(48_457_u64).saturating_mul(m as u64)) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -75,10 +75,10 @@ impl pallet_membership::WeightInfo for WeightInfo { // Storage: TechnicalCommittee Prime (r:0 w:1) /// The range of component `m` is `[2, 50]`. fn remove_member(m: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(30_896_000_u64) - // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(59_000_u64).saturating_mul(m as u64)) + // Minimum execution time: 31_510 nanoseconds. + Weight::from_ref_time(32_744_808_u64) + // Standard Error: 1_545 + .saturating_add(Weight::from_ref_time(40_025_u64).saturating_mul(m as u64)) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -93,10 +93,10 @@ impl pallet_membership::WeightInfo for WeightInfo { // Storage: TechnicalCommittee Prime (r:0 w:1) /// The range of component `m` is `[2, 50]`. fn swap_member(m: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(30_952_000_u64) - // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(75_000_u64).saturating_mul(m as u64)) + // Minimum execution time: 31_569 nanoseconds. + Weight::from_ref_time(32_727_825_u64) + // Standard Error: 1_375 + .saturating_add(Weight::from_ref_time(58_988_u64).saturating_mul(m as u64)) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -111,10 +111,10 @@ impl pallet_membership::WeightInfo for WeightInfo { // Storage: TechnicalCommittee Prime (r:0 w:1) /// The range of component `m` is `[1, 50]`. fn reset_member(m: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(30_795_000_u64) - // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(201_000_u64).saturating_mul(m as u64)) + // Minimum execution time: 31_260 nanoseconds. + Weight::from_ref_time(33_035_881_u64) + // Standard Error: 2_036 + .saturating_add(Weight::from_ref_time(178_547_u64).saturating_mul(m as u64)) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -129,10 +129,10 @@ impl pallet_membership::WeightInfo for WeightInfo { // Storage: TechnicalCommittee Prime (r:0 w:1) /// The range of component `m` is `[1, 50]`. fn change_key(m: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(32_024_000_u64) - // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(79_000_u64).saturating_mul(m as u64)) + // Minimum execution time: 32_710 nanoseconds. + Weight::from_ref_time(33_938_745_u64) + // Standard Error: 1_807 + .saturating_add(Weight::from_ref_time(63_762_u64).saturating_mul(m as u64)) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(6_u64)) } @@ -141,10 +141,10 @@ impl pallet_membership::WeightInfo for WeightInfo { // Storage: TechnicalCommittee Prime (r:0 w:1) /// The range of component `m` is `[1, 50]`. fn set_prime(m: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(11_878_000_u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(18_000_u64).saturating_mul(m as u64)) + // Minimum execution time: 11_750 nanoseconds. + Weight::from_ref_time(12_321_084_u64) + // Standard Error: 842 + .saturating_add(Weight::from_ref_time(10_510_u64).saturating_mul(m as u64)) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -152,10 +152,10 @@ impl pallet_membership::WeightInfo for WeightInfo { // Storage: TechnicalCommittee Prime (r:0 w:1) /// The range of component `m` is `[1, 50]`. fn clear_prime(m: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(7_410_000_u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000_u64).saturating_mul(m as u64)) + // Minimum execution time: 7_269 nanoseconds. + Weight::from_ref_time(7_746_368_u64) + // Standard Error: 470 + .saturating_add(Weight::from_ref_time(1_212_u64).saturating_mul(m as u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } } diff --git a/runtimes/eden/src/weights/pallet_multisig.rs b/runtimes/eden/src/weights/pallet_multisig.rs index ecf64c9a350..e9c351c2e83 100644 --- a/runtimes/eden/src/weights/pallet_multisig.rs +++ b/runtimes/eden/src/weights/pallet_multisig.rs @@ -19,22 +19,22 @@ //! Autogenerated weights for pallet_multisig //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-11-10, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! HOSTNAME: `chain-bench-012bd056`, CPU: `AMD EPYC 7B13` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: -// target/release/nodle-parachain +// ./target/release/nodle-parachain // benchmark // pallet // --chain=dev // --steps=50 // --repeat=20 -// --pallet=* +// --pallet=pallet_multisig // --extrinsic=* // --execution=wasm // --wasm-execution=compiled -// --template=./.maintain/frame-weight-template.hbs +// --template=./.maintain/external_pallet_weights.hbs // --output=runtimes/eden/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] @@ -48,9 +48,11 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl pallet_multisig::WeightInfo for WeightInfo { /// The range of component `z` is `[0, 10000]`. - fn as_multi_threshold_1(_z: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(24_782_000_u64) + fn as_multi_threshold_1(z: u32, ) -> Weight { + // Minimum execution time: 20_590 nanoseconds. + Weight::from_ref_time(21_903_356_u64) + // Standard Error: 5 + .saturating_add(Weight::from_ref_time(447_u64).saturating_mul(z as u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: System Number (r:1 w:0) @@ -61,69 +63,33 @@ impl pallet_multisig::WeightInfo for WeightInfo { /// The range of component `s` is `[2, 100]`. /// The range of component `z` is `[0, 10000]`. fn as_multi_create(s: u32, z: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(29_734_000_u64) - // Standard Error: 20_000 - .saturating_add(Weight::from_ref_time(217_000_u64).saturating_mul(s as u64)) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(5_000_u64).saturating_mul(z as u64)) + // Minimum execution time: 62_270 nanoseconds. + Weight::from_ref_time(51_778_642_u64) + // Standard Error: 1_568 + .saturating_add(Weight::from_ref_time(128_023_u64).saturating_mul(s as u64)) + // Standard Error: 15 + .saturating_add(Weight::from_ref_time(1_670_u64).saturating_mul(z as u64)) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Multisig Multisigs (r:1 w:1) - // Storage: Multisig Calls (r:1 w:1) - // Storage: System Number (r:1 w:0) - // Storage: System ExecutionPhase (r:1 w:0) - // Storage: System EventCount (r:1 w:1) - // Storage: System Events (r:1 w:1) - // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) - /// The range of component `s` is `[2, 100]`. - /// The range of component `z` is `[0, 10000]`. - fn as_multi_create_store(s: u32, z: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(35_564_000_u64) - // Standard Error: 21_000 - .saturating_add(Weight::from_ref_time(596_000_u64).saturating_mul(s as u64)) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000_u64).saturating_mul(z as u64)) - .saturating_add(T::DbWeight::get().reads(7_u64)) - .saturating_add(T::DbWeight::get().writes(4_u64)) - } - // Storage: Multisig Multisigs (r:1 w:1) // Storage: System Number (r:1 w:0) // Storage: System ExecutionPhase (r:1 w:0) // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) /// The range of component `s` is `[3, 100]`. /// The range of component `z` is `[0, 10000]`. - fn as_multi_approve(s: u32, _z: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(48_344_000_u64) - // Standard Error: 12_000 - .saturating_add(Weight::from_ref_time(262_000_u64).saturating_mul(s as u64)) + fn as_multi_approve(s: u32, z: u32, ) -> Weight { + // Minimum execution time: 44_990 nanoseconds. + Weight::from_ref_time(37_416_709_u64) + // Standard Error: 1_316 + .saturating_add(Weight::from_ref_time(101_647_u64).saturating_mul(s as u64)) + // Standard Error: 12 + .saturating_add(Weight::from_ref_time(1_512_u64).saturating_mul(z as u64)) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Multisig Multisigs (r:1 w:1) - // Storage: Multisig Calls (r:1 w:1) - // Storage: System Number (r:1 w:0) - // Storage: System ExecutionPhase (r:1 w:0) - // Storage: System EventCount (r:1 w:1) - // Storage: System Events (r:1 w:1) - /// The range of component `s` is `[3, 100]`. - /// The range of component `z` is `[0, 10000]`. - fn as_multi_approve_store(s: u32, z: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(51_314_000_u64) - // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(156_000_u64).saturating_mul(s as u64)) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000_u64).saturating_mul(z as u64)) - .saturating_add(T::DbWeight::get().reads(6_u64)) - .saturating_add(T::DbWeight::get().writes(4_u64)) - } - // Storage: Multisig Multisigs (r:1 w:1) - // Storage: Multisig Calls (r:1 w:1) // Storage: System Account (r:1 w:1) // Storage: System Number (r:1 w:0) // Storage: System ExecutionPhase (r:1 w:0) @@ -132,14 +98,14 @@ impl pallet_multisig::WeightInfo for WeightInfo { /// The range of component `s` is `[2, 100]`. /// The range of component `z` is `[0, 10000]`. fn as_multi_complete(s: u32, z: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(65_960_000_u64) - // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(180_000_u64).saturating_mul(s as u64)) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000_u64).saturating_mul(z as u64)) - .saturating_add(T::DbWeight::get().reads(7_u64)) - .saturating_add(T::DbWeight::get().writes(5_u64)) + // Minimum execution time: 66_470 nanoseconds. + Weight::from_ref_time(53_483_566_u64) + // Standard Error: 1_329 + .saturating_add(Weight::from_ref_time(153_045_u64).saturating_mul(s as u64)) + // Standard Error: 13 + .saturating_add(Weight::from_ref_time(1_673_u64).saturating_mul(z as u64)) + .saturating_add(T::DbWeight::get().reads(6_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: Multisig Multisigs (r:1 w:1) // Storage: System Number (r:1 w:0) @@ -149,57 +115,39 @@ impl pallet_multisig::WeightInfo for WeightInfo { // Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0) /// The range of component `s` is `[2, 100]`. fn approve_as_multi_create(s: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(47_711_000_u64) - // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(159_000_u64).saturating_mul(s as u64)) + // Minimum execution time: 48_290 nanoseconds. + Weight::from_ref_time(50_653_628_u64) + // Standard Error: 1_526 + .saturating_add(Weight::from_ref_time(121_291_u64).saturating_mul(s as u64)) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Multisig Multisigs (r:1 w:1) - // Storage: Multisig Calls (r:1 w:0) // Storage: System Number (r:1 w:0) // Storage: System ExecutionPhase (r:1 w:0) // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) /// The range of component `s` is `[2, 100]`. fn approve_as_multi_approve(s: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(31_840_000_u64) - // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(144_000_u64).saturating_mul(s as u64)) + // Minimum execution time: 32_270 nanoseconds. + Weight::from_ref_time(34_269_607_u64) + // Standard Error: 1_473 + .saturating_add(Weight::from_ref_time(107_382_u64).saturating_mul(s as u64)) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Multisig Multisigs (r:1 w:1) - // Storage: Multisig Calls (r:1 w:1) - // Storage: System Account (r:1 w:1) // Storage: System Number (r:1 w:0) // Storage: System ExecutionPhase (r:1 w:0) // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) /// The range of component `s` is `[2, 100]`. - fn approve_as_multi_complete(s: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(79_342_000_u64) - // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(181_000_u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(7_u64)) - .saturating_add(T::DbWeight::get().writes(5_u64)) - } - // Storage: Multisig Multisigs (r:1 w:1) - // Storage: System Number (r:1 w:0) - // Storage: System ExecutionPhase (r:1 w:0) - // Storage: System EventCount (r:1 w:1) - // Storage: System Events (r:1 w:1) - // Storage: Multisig Calls (r:1 w:1) - /// The range of component `s` is `[2, 100]`. fn cancel_as_multi(s: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(66_920_000_u64) - // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(166_000_u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(6_u64)) - .saturating_add(T::DbWeight::get().writes(4_u64)) + // Minimum execution time: 46_269 nanoseconds. + Weight::from_ref_time(48_223_404_u64) + // Standard Error: 1_307 + .saturating_add(Weight::from_ref_time(121_642_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) } } diff --git a/runtimes/eden/src/weights/pallet_preimage.rs b/runtimes/eden/src/weights/pallet_preimage.rs index 475dab390ba..23329aa6821 100644 --- a/runtimes/eden/src/weights/pallet_preimage.rs +++ b/runtimes/eden/src/weights/pallet_preimage.rs @@ -19,22 +19,22 @@ //! Autogenerated weights for pallet_preimage //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-11-10, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! HOSTNAME: `chain-bench-012bd056`, CPU: `AMD EPYC 7B13` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: -// target/release/nodle-parachain +// ./target/release/nodle-parachain // benchmark // pallet // --chain=dev // --steps=50 // --repeat=20 -// --pallet=* +// --pallet=pallet_preimage // --extrinsic=* // --execution=wasm // --wasm-execution=compiled -// --template=./.maintain/frame-weight-template.hbs +// --template=./.maintain/external_pallet_weights.hbs // --output=runtimes/eden/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] @@ -47,50 +47,50 @@ use sp_std::marker::PhantomData; /// Weight functions for `pallet_preimage`. pub struct WeightInfo(PhantomData); impl pallet_preimage::WeightInfo for WeightInfo { - // Storage: Preimage PreimageFor (r:1 w:1) // Storage: Preimage StatusFor (r:1 w:1) // Storage: System Number (r:1 w:0) // Storage: System ExecutionPhase (r:1 w:0) // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) + // Storage: Preimage PreimageFor (r:0 w:1) /// The range of component `s` is `[0, 4194304]`. fn note_preimage(s: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(0_u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000_u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(6_u64)) + // Minimum execution time: 42_800 nanoseconds. + Weight::from_ref_time(44_484_666_u64) + // Standard Error: 8 + .saturating_add(Weight::from_ref_time(2_264_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:0) + // Storage: Preimage StatusFor (r:1 w:1) // Storage: System Number (r:1 w:0) // Storage: System ExecutionPhase (r:1 w:0) // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) + // Storage: Preimage PreimageFor (r:0 w:1) /// The range of component `s` is `[0, 4194304]`. fn note_requested_preimage(s: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(0_u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000_u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(6_u64)) - .saturating_add(T::DbWeight::get().writes(3_u64)) + // Minimum execution time: 29_730 nanoseconds. + Weight::from_ref_time(8_456_299_u64) + // Standard Error: 8 + .saturating_add(Weight::from_ref_time(2_267_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:0) + // Storage: Preimage StatusFor (r:1 w:1) // Storage: System Number (r:1 w:0) // Storage: System ExecutionPhase (r:1 w:0) // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) + // Storage: Preimage PreimageFor (r:0 w:1) /// The range of component `s` is `[0, 4194304]`. fn note_no_deposit_preimage(s: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(38_741_000_u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(2_000_u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(6_u64)) - .saturating_add(T::DbWeight::get().writes(3_u64)) + // Minimum execution time: 27_800 nanoseconds. + Weight::from_ref_time(28_140_000_u64) + // Standard Error: 4 + .saturating_add(Weight::from_ref_time(2_266_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: Preimage StatusFor (r:1 w:1) // Storage: System Number (r:1 w:0) @@ -99,8 +99,8 @@ impl pallet_preimage::WeightInfo for WeightInfo { // Storage: System Events (r:1 w:1) // Storage: Preimage PreimageFor (r:0 w:1) fn unnote_preimage() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(47_460_000_u64) + // Minimum execution time: 50_530 nanoseconds. + Weight::from_ref_time(52_320_000_u64) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -111,8 +111,8 @@ impl pallet_preimage::WeightInfo for WeightInfo { // Storage: System Events (r:1 w:1) // Storage: Preimage PreimageFor (r:0 w:1) fn unnote_no_deposit_preimage() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(30_480_000_u64) + // Minimum execution time: 33_940 nanoseconds. + Weight::from_ref_time(35_160_000_u64) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -122,21 +122,17 @@ impl pallet_preimage::WeightInfo for WeightInfo { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn request_preimage() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(45_610_000_u64) + // Minimum execution time: 32_420 nanoseconds. + Weight::from_ref_time(33_520_000_u64) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Preimage StatusFor (r:1 w:1) - // Storage: System Number (r:1 w:0) - // Storage: System ExecutionPhase (r:1 w:0) - // Storage: System EventCount (r:1 w:1) - // Storage: System Events (r:1 w:1) fn request_no_deposit_preimage() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(28_630_000_u64) - .saturating_add(T::DbWeight::get().reads(5_u64)) - .saturating_add(T::DbWeight::get().writes(3_u64)) + // Minimum execution time: 16_740 nanoseconds. + Weight::from_ref_time(17_550_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Preimage StatusFor (r:1 w:1) // Storage: System Number (r:1 w:0) @@ -144,15 +140,15 @@ impl pallet_preimage::WeightInfo for WeightInfo { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn request_unnoted_preimage() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(24_231_000_u64) + // Minimum execution time: 26_700 nanoseconds. + Weight::from_ref_time(27_671_000_u64) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } // Storage: Preimage StatusFor (r:1 w:1) fn request_requested_preimage() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(12_630_000_u64) + // Minimum execution time: 13_420 nanoseconds. + Weight::from_ref_time(13_830_000_u64) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -163,27 +159,22 @@ impl pallet_preimage::WeightInfo for WeightInfo { // Storage: System Events (r:1 w:1) // Storage: Preimage PreimageFor (r:0 w:1) fn unrequest_preimage() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(30_250_000_u64) + // Minimum execution time: 33_160 nanoseconds. + Weight::from_ref_time(33_940_000_u64) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } // Storage: Preimage StatusFor (r:1 w:1) - // Storage: System Number (r:1 w:0) - // Storage: System ExecutionPhase (r:1 w:0) - // Storage: System EventCount (r:1 w:1) - // Storage: System Events (r:1 w:1) - // Storage: Preimage PreimageFor (r:0 w:1) fn unrequest_unnoted_preimage() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(26_560_000_u64) - .saturating_add(T::DbWeight::get().reads(5_u64)) - .saturating_add(T::DbWeight::get().writes(4_u64)) + // Minimum execution time: 13_010 nanoseconds. + Weight::from_ref_time(13_600_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Preimage StatusFor (r:1 w:1) fn unrequest_multi_referenced_preimage() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(12_820_000_u64) + // Minimum execution time: 13_340 nanoseconds. + Weight::from_ref_time(13_720_000_u64) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } diff --git a/runtimes/eden/src/weights/pallet_scheduler.rs b/runtimes/eden/src/weights/pallet_scheduler.rs index 49e48bdaaa2..644f0df021d 100644 --- a/runtimes/eden/src/weights/pallet_scheduler.rs +++ b/runtimes/eden/src/weights/pallet_scheduler.rs @@ -19,22 +19,22 @@ //! Autogenerated weights for pallet_scheduler //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-11-10, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! HOSTNAME: `chain-bench-012bd056`, CPU: `AMD EPYC 7B13` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: -// target/release/nodle-parachain +// ./target/release/nodle-parachain // benchmark // pallet // --chain=dev // --steps=50 // --repeat=20 -// --pallet=* +// --pallet=pallet_scheduler // --extrinsic=* // --execution=wasm // --wasm-execution=compiled -// --template=./.maintain/frame-weight-template.hbs +// --template=./.maintain/external_pallet_weights.hbs // --output=runtimes/eden/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] @@ -47,180 +47,88 @@ use sp_std::marker::PhantomData; /// Weight functions for `pallet_scheduler`. pub struct WeightInfo(PhantomData); impl pallet_scheduler::WeightInfo for WeightInfo { - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:1) - // Storage: System Number (r:1 w:0) - // Storage: System ExecutionPhase (r:1 w:0) - // Storage: System EventCount (r:1 w:1) - // Storage: System Events (r:1 w:1) - // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_periodic_named_resolved(s: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(451_087_000_u64) - // Standard Error: 1_366_000 - .saturating_add(Weight::from_ref_time(34_187_000_u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(5_u64)) - .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(T::DbWeight::get().writes((4_u64).saturating_mul(s as u64))) + // Storage: Scheduler IncompleteSince (r:1 w:1) + fn service_agendas_base() -> Weight { + // Minimum execution time: 6_240 nanoseconds. + Weight::from_ref_time(6_540_000_u64) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } // Storage: Scheduler Agenda (r:1 w:1) - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:1) - // Storage: System Number (r:1 w:0) - // Storage: System ExecutionPhase (r:1 w:0) - // Storage: System EventCount (r:1 w:1) - // Storage: System Events (r:1 w:1) - // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_named_resolved(s: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(0_u64) - // Standard Error: 1_112_000 - .saturating_add(Weight::from_ref_time(44_867_000_u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(5_u64)) - .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(s as u64))) + /// The range of component `s` is `[0, 50]`. + fn service_agenda_base(s: u32, ) -> Weight { + // Minimum execution time: 5_929 nanoseconds. + Weight::from_ref_time(9_788_855_u64) + // Standard Error: 3_565 + .saturating_add(Weight::from_ref_time(927_237_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) } - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Preimage PreimageFor (r:1 w:1) - // Storage: Preimage StatusFor (r:1 w:1) // Storage: System Number (r:1 w:0) // Storage: System ExecutionPhase (r:1 w:0) // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_periodic_resolved(s: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(7_435_000_u64) - // Standard Error: 102_000 - .saturating_add(Weight::from_ref_time(51_896_000_u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(5_u64)) - .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(s as u64))) + fn service_task_base() -> Weight { + // Minimum execution time: 13_580 nanoseconds. + Weight::from_ref_time(14_010_000_u64) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } - // Storage: Scheduler Agenda (r:1 w:1) // Storage: Preimage PreimageFor (r:1 w:1) // Storage: Preimage StatusFor (r:1 w:1) // Storage: System Number (r:1 w:0) // Storage: System ExecutionPhase (r:1 w:0) // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_resolved(s: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(26_102_000_u64) - // Standard Error: 24_000 - .saturating_add(Weight::from_ref_time(44_972_000_u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(5_u64)) - .saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(s as u64))) - } - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Preimage PreimageFor (r:1 w:0) - // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_named_aborted(s: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(15_889_000_u64) - // Standard Error: 22_000 - .saturating_add(Weight::from_ref_time(19_041_000_u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2_u64)) - .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(2_u64)) - .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s as u64))) - } - // Storage: Scheduler Agenda (r:2 w:2) - // Storage: Preimage PreimageFor (r:1 w:0) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_aborted(s: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(21_212_000_u64) - // Standard Error: 4_000 - .saturating_add(Weight::from_ref_time(8_281_000_u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(2_u64)) - .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(2_u64)) + /// The range of component `s` is `[128, 4194304]`. + fn service_task_fetched(s: u32, ) -> Weight { + // Minimum execution time: 32_029 nanoseconds. + Weight::from_ref_time(32_460_000_u64) + // Standard Error: 4 + .saturating_add(Weight::from_ref_time(1_026_u64).saturating_mul(s as u64)) + .saturating_add(T::DbWeight::get().reads(6_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) } - // Storage: Scheduler Agenda (r:2 w:2) // Storage: System Number (r:1 w:0) // Storage: System ExecutionPhase (r:1 w:0) // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_periodic_named(s: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(0_u64) - // Standard Error: 353_000 - .saturating_add(Weight::from_ref_time(33_779_000_u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(5_u64)) - .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s as u64))) + fn service_task_named() -> Weight { + // Minimum execution time: 16_140 nanoseconds. + Weight::from_ref_time(16_720_000_u64) + .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(T::DbWeight::get().writes((2_u64).saturating_mul(s as u64))) } - // Storage: Scheduler Agenda (r:2 w:2) // Storage: System Number (r:1 w:0) // Storage: System ExecutionPhase (r:1 w:0) // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_periodic(s: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(30_046_000_u64) - // Standard Error: 10_000 - .saturating_add(Weight::from_ref_time(20_541_000_u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(5_u64)) - .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s as u64))) - .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s as u64))) + fn service_task_periodic() -> Weight { + // Minimum execution time: 13_350 nanoseconds. + Weight::from_ref_time(14_170_000_u64) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } - // Storage: Scheduler Agenda (r:1 w:1) - // Storage: System Number (r:1 w:0) - // Storage: System ExecutionPhase (r:1 w:0) - // Storage: System EventCount (r:1 w:1) - // Storage: System Events (r:1 w:1) - // Storage: Scheduler Lookup (r:0 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize_named(s: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(29_905_000_u64) - // Standard Error: 8_000 - .saturating_add(Weight::from_ref_time(19_281_000_u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(5_u64)) - .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s as u64))) + fn execute_dispatch_signed() -> Weight { + // Minimum execution time: 6_380 nanoseconds. + Weight::from_ref_time(6_700_000_u64) } - // Storage: Scheduler Agenda (r:1 w:1) - // Storage: System Number (r:1 w:0) - // Storage: System ExecutionPhase (r:1 w:0) - // Storage: System EventCount (r:1 w:1) - // Storage: System Events (r:1 w:1) - /// The range of component `s` is `[1, 50]`. - fn on_initialize(s: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(31_771_000_u64) - // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(14_910_000_u64).saturating_mul(s as u64)) - .saturating_add(T::DbWeight::get().reads(5_u64)) - .saturating_add(T::DbWeight::get().writes(3_u64)) + fn execute_dispatch_unsigned() -> Weight { + // Minimum execution time: 6_220 nanoseconds. + Weight::from_ref_time(7_330_000_u64) } // Storage: System Number (r:1 w:0) // Storage: Scheduler Agenda (r:1 w:1) // Storage: System ExecutionPhase (r:1 w:0) // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) - /// The range of component `s` is `[0, 50]`. + /// The range of component `s` is `[0, 49]`. fn schedule(s: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(47_894_000_u64) - // Standard Error: 3_000 - .saturating_add(Weight::from_ref_time(111_000_u64).saturating_mul(s as u64)) + // Minimum execution time: 25_470 nanoseconds. + Weight::from_ref_time(29_939_622_u64) + // Standard Error: 4_290 + .saturating_add(Weight::from_ref_time(971_925_u64).saturating_mul(s as u64)) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -232,10 +140,10 @@ impl pallet_scheduler::WeightInfo for WeightInfo { // Storage: Scheduler Lookup (r:0 w:1) /// The range of component `s` is `[1, 50]`. fn cancel(s: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(45_882_000_u64) - // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(1_221_000_u64).saturating_mul(s as u64)) + // Minimum execution time: 31_020 nanoseconds. + Weight::from_ref_time(30_739_806_u64) + // Standard Error: 5_224 + .saturating_add(Weight::from_ref_time(1_637_239_u64).saturating_mul(s as u64)) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -245,12 +153,12 @@ impl pallet_scheduler::WeightInfo for WeightInfo { // Storage: System ExecutionPhase (r:1 w:0) // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) - /// The range of component `s` is `[0, 50]`. + /// The range of component `s` is `[0, 49]`. fn schedule_named(s: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(58_843_000_u64) - // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(241_000_u64).saturating_mul(s as u64)) + // Minimum execution time: 29_830 nanoseconds. + Weight::from_ref_time(35_132_322_u64) + // Standard Error: 4_532 + .saturating_add(Weight::from_ref_time(996_343_u64).saturating_mul(s as u64)) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -261,9 +169,11 @@ impl pallet_scheduler::WeightInfo for WeightInfo { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) /// The range of component `s` is `[1, 50]`. - fn cancel_named(_s: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(69_373_000_u64) + fn cancel_named(s: u32, ) -> Weight { + // Minimum execution time: 33_100 nanoseconds. + Weight::from_ref_time(33_469_694_u64) + // Standard Error: 5_816 + .saturating_add(Weight::from_ref_time(1_649_537_u64).saturating_mul(s as u64)) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } diff --git a/runtimes/eden/src/weights/pallet_timestamp.rs b/runtimes/eden/src/weights/pallet_timestamp.rs index 51e36fc4642..f5ea7609b38 100644 --- a/runtimes/eden/src/weights/pallet_timestamp.rs +++ b/runtimes/eden/src/weights/pallet_timestamp.rs @@ -19,22 +19,22 @@ //! Autogenerated weights for pallet_timestamp //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-11-10, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! HOSTNAME: `chain-bench-012bd056`, CPU: `AMD EPYC 7B13` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: -// target/release/nodle-parachain +// ./target/release/nodle-parachain // benchmark // pallet // --chain=dev // --steps=50 // --repeat=20 -// --pallet=* +// --pallet=pallet_timestamp // --extrinsic=* // --execution=wasm // --wasm-execution=compiled -// --template=./.maintain/frame-weight-template.hbs +// --template=./.maintain/external_pallet_weights.hbs // --output=runtimes/eden/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] @@ -49,13 +49,13 @@ pub struct WeightInfo(PhantomData); impl pallet_timestamp::WeightInfo for WeightInfo { // Storage: Timestamp Now (r:1 w:1) fn set() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(20_360_000_u64) + // Minimum execution time: 11_490 nanoseconds. + Weight::from_ref_time(12_240_000_u64) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } fn on_finalize() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(11_440_000_u64) + // Minimum execution time: 6_280 nanoseconds. + Weight::from_ref_time(6_540_000_u64) } } diff --git a/runtimes/eden/src/weights/pallet_uniques.rs b/runtimes/eden/src/weights/pallet_uniques.rs index e60afffaaf3..dace9d8a101 100644 --- a/runtimes/eden/src/weights/pallet_uniques.rs +++ b/runtimes/eden/src/weights/pallet_uniques.rs @@ -19,22 +19,22 @@ //! Autogenerated weights for pallet_uniques //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-11-10, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! HOSTNAME: `chain-bench-012bd056`, CPU: `AMD EPYC 7B13` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: -// target/release/nodle-parachain +// ./target/release/nodle-parachain // benchmark // pallet // --chain=dev // --steps=50 // --repeat=20 -// --pallet=* +// --pallet=pallet_uniques // --extrinsic=* // --execution=wasm // --wasm-execution=compiled -// --template=./.maintain/frame-weight-template.hbs +// --template=./.maintain/external_pallet_weights.hbs // --output=runtimes/eden/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] @@ -54,8 +54,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: System Events (r:1 w:1) // Storage: Uniques ClassAccount (r:0 w:1) fn create() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(41_370_000_u64) + // Minimum execution time: 44_080 nanoseconds. + Weight::from_ref_time(45_731_000_u64) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -66,8 +66,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: System Events (r:1 w:1) // Storage: Uniques ClassAccount (r:0 w:1) fn force_create() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(25_850_000_u64) + // Minimum execution time: 28_771 nanoseconds. + Weight::from_ref_time(29_829_000_u64) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -87,14 +87,14 @@ impl pallet_uniques::WeightInfo for WeightInfo { /// The range of component `m` is `[0, 1000]`. /// The range of component `a` is `[0, 1000]`. fn destroy(n: u32, m: u32, a: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(0_u64) - // Standard Error: 11_000 - .saturating_add(Weight::from_ref_time(13_621_000_u64).saturating_mul(n as u64)) - // Standard Error: 11_000 - .saturating_add(Weight::from_ref_time(1_948_000_u64).saturating_mul(m as u64)) - // Standard Error: 11_000 - .saturating_add(Weight::from_ref_time(1_801_000_u64).saturating_mul(a as u64)) + // Minimum execution time: 2_719_690 nanoseconds. + Weight::from_ref_time(2_738_030_000_u64) + // Standard Error: 27_786 + .saturating_add(Weight::from_ref_time(11_910_266_u64).saturating_mul(n as u64)) + // Standard Error: 27_786 + .saturating_add(Weight::from_ref_time(272_969_u64).saturating_mul(m as u64)) + // Standard Error: 27_786 + .saturating_add(Weight::from_ref_time(277_638_u64).saturating_mul(a as u64)) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(n as u64))) .saturating_add(T::DbWeight::get().writes(6_u64)) @@ -111,8 +111,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: System Events (r:1 w:1) // Storage: Uniques Account (r:0 w:1) fn mint() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(53_120_000_u64) + // Minimum execution time: 54_800 nanoseconds. + Weight::from_ref_time(56_831_000_u64) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -125,8 +125,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques Account (r:0 w:1) // Storage: Uniques ItemPriceOf (r:0 w:1) fn burn() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(55_520_000_u64) + // Minimum execution time: 57_630 nanoseconds. + Weight::from_ref_time(59_180_000_u64) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(6_u64)) } @@ -139,8 +139,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques Account (r:0 w:2) // Storage: Uniques ItemPriceOf (r:0 w:1) fn transfer() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(42_250_000_u64) + // Minimum execution time: 44_100 nanoseconds. + Weight::from_ref_time(45_180_000_u64) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(6_u64)) } @@ -152,10 +152,10 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: Uniques Asset (r:102 w:102) /// The range of component `i` is `[0, 5000]`. fn redeposit(i: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(0_u64) - // Standard Error: 9_000 - .saturating_add(Weight::from_ref_time(16_962_000_u64).saturating_mul(i as u64)) + // Minimum execution time: 28_620 nanoseconds. + Weight::from_ref_time(29_100_000_u64) + // Standard Error: 10_589 + .saturating_add(Weight::from_ref_time(18_529_997_u64).saturating_mul(i as u64)) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(i as u64))) .saturating_add(T::DbWeight::get().writes(3_u64)) @@ -168,8 +168,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn freeze() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(32_040_000_u64) + // Minimum execution time: 33_200 nanoseconds. + Weight::from_ref_time(34_220_000_u64) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -180,8 +180,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn thaw() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(31_980_000_u64) + // Minimum execution time: 33_200 nanoseconds. + Weight::from_ref_time(33_800_000_u64) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -191,8 +191,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn freeze_collection() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(26_200_000_u64) + // Minimum execution time: 26_980 nanoseconds. + Weight::from_ref_time(27_760_000_u64) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -202,8 +202,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn thaw_collection() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(26_210_000_u64) + // Minimum execution time: 26_930 nanoseconds. + Weight::from_ref_time(27_510_000_u64) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -215,8 +215,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: System Events (r:1 w:1) // Storage: Uniques ClassAccount (r:0 w:2) fn transfer_ownership() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(37_000_000_u64) + // Minimum execution time: 38_810 nanoseconds. + Weight::from_ref_time(39_810_000_u64) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(6_u64)) } @@ -226,8 +226,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn set_team() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(27_240_000_u64) + // Minimum execution time: 27_269 nanoseconds. + Weight::from_ref_time(28_420_000_u64) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -238,8 +238,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: System Events (r:1 w:1) // Storage: Uniques ClassAccount (r:0 w:1) fn force_item_status() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(30_530_000_u64) + // Minimum execution time: 30_271 nanoseconds. + Weight::from_ref_time(31_230_000_u64) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -251,8 +251,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn set_attribute() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(63_571_000_u64) + // Minimum execution time: 65_250 nanoseconds. + Weight::from_ref_time(66_310_000_u64) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -264,8 +264,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn clear_attribute() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(59_940_000_u64) + // Minimum execution time: 61_190 nanoseconds. + Weight::from_ref_time(62_350_000_u64) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -276,8 +276,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn set_metadata() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(48_700_000_u64) + // Minimum execution time: 49_900 nanoseconds. + Weight::from_ref_time(51_570_000_u64) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -288,8 +288,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn clear_metadata() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(51_210_000_u64) + // Minimum execution time: 51_560 nanoseconds. + Weight::from_ref_time(53_090_000_u64) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -300,8 +300,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn set_collection_metadata() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(48_150_000_u64) + // Minimum execution time: 48_390 nanoseconds. + Weight::from_ref_time(50_160_000_u64) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -312,8 +312,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn clear_collection_metadata() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(47_070_000_u64) + // Minimum execution time: 46_640 nanoseconds. + Weight::from_ref_time(48_700_000_u64) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -324,8 +324,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn approve_transfer() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(33_330_000_u64) + // Minimum execution time: 34_180 nanoseconds. + Weight::from_ref_time(35_370_000_u64) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -336,8 +336,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn cancel_approval() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(33_010_000_u64) + // Minimum execution time: 34_490 nanoseconds. + Weight::from_ref_time(35_840_000_u64) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -347,8 +347,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn set_accept_ownership() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(31_300_000_u64) + // Minimum execution time: 32_350 nanoseconds. + Weight::from_ref_time(33_570_000_u64) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -359,8 +359,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn set_collection_max_supply() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(29_090_000_u64) + // Minimum execution time: 30_000 nanoseconds. + Weight::from_ref_time(30_900_000_u64) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -371,8 +371,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: System Events (r:1 w:1) // Storage: Uniques ItemPriceOf (r:0 w:1) fn set_price() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(29_900_000_u64) + // Minimum execution time: 30_370 nanoseconds. + Weight::from_ref_time(30_780_000_u64) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -385,8 +385,8 @@ impl pallet_uniques::WeightInfo for WeightInfo { // Storage: System Events (r:1 w:1) // Storage: Uniques Account (r:0 w:2) fn buy_item() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(57_110_000_u64) + // Minimum execution time: 58_240 nanoseconds. + Weight::from_ref_time(60_290_000_u64) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(6_u64)) } diff --git a/runtimes/eden/src/weights/pallet_utility.rs b/runtimes/eden/src/weights/pallet_utility.rs index b224538bf52..ddd904a6fe2 100644 --- a/runtimes/eden/src/weights/pallet_utility.rs +++ b/runtimes/eden/src/weights/pallet_utility.rs @@ -19,22 +19,22 @@ //! Autogenerated weights for pallet_utility //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-11-10, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-02-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` //! HOSTNAME: `chain-bench-012bd056`, CPU: `AMD EPYC 7B13` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024 // Executed Command: -// target/release/nodle-parachain +// ./target/release/nodle-parachain // benchmark // pallet // --chain=dev // --steps=50 // --repeat=20 -// --pallet=* +// --pallet=pallet_utility // --extrinsic=* // --execution=wasm // --wasm-execution=compiled -// --template=./.maintain/frame-weight-template.hbs +// --template=./.maintain/external_pallet_weights.hbs // --output=runtimes/eden/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] @@ -53,16 +53,16 @@ impl pallet_utility::WeightInfo for WeightInfo { // Storage: System Events (r:1 w:1) /// The range of component `c` is `[0, 1000]`. fn batch(c: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(25_228_000_u64) - // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(5_556_000_u64).saturating_mul(c as u64)) + // Minimum execution time: 17_190 nanoseconds. + Weight::from_ref_time(28_612_838_u64) + // Standard Error: 1_474 + .saturating_add(Weight::from_ref_time(6_333_168_u64).saturating_mul(c as u64)) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } fn as_derivative() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(9_180_000_u64) + // Minimum execution time: 9_930 nanoseconds. + Weight::from_ref_time(10_340_000_u64) } // Storage: System Number (r:1 w:0) // Storage: System ExecutionPhase (r:1 w:0) @@ -70,10 +70,10 @@ impl pallet_utility::WeightInfo for WeightInfo { // Storage: System Events (r:1 w:1) /// The range of component `c` is `[0, 1000]`. fn batch_all(c: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(21_481_000_u64) - // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(5_822_000_u64).saturating_mul(c as u64)) + // Minimum execution time: 17_350 nanoseconds. + Weight::from_ref_time(27_422_193_u64) + // Standard Error: 1_175 + .saturating_add(Weight::from_ref_time(6_671_527_u64).saturating_mul(c as u64)) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -82,8 +82,8 @@ impl pallet_utility::WeightInfo for WeightInfo { // Storage: System EventCount (r:1 w:1) // Storage: System Events (r:1 w:1) fn dispatch_as() -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(19_400_000_u64) + // Minimum execution time: 20_770 nanoseconds. + Weight::from_ref_time(21_340_000_u64) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -93,10 +93,10 @@ impl pallet_utility::WeightInfo for WeightInfo { // Storage: System Events (r:1 w:1) /// The range of component `c` is `[0, 1000]`. fn force_batch(c: u32, ) -> Weight { - // Minimum execution time: nanoseconds. - Weight::from_ref_time(28_048_000_u64) - // Standard Error: 1_000 - .saturating_add(Weight::from_ref_time(5_547_000_u64).saturating_mul(c as u64)) + // Minimum execution time: 17_400 nanoseconds. + Weight::from_ref_time(22_283_731_u64) + // Standard Error: 1_125 + .saturating_add(Weight::from_ref_time(6_331_130_u64).saturating_mul(c as u64)) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } diff --git a/runtimes/eden/src/xcm_config.rs b/runtimes/eden/src/xcm_config.rs index 5509734fcf5..4832fa32e4f 100644 --- a/runtimes/eden/src/xcm_config.rs +++ b/runtimes/eden/src/xcm_config.rs @@ -1,5 +1,6 @@ use super::{ - AccountId, Balance, Balances, Call, Event, Origin, ParachainInfo, ParachainSystem, PolkadotXcm, Runtime, XcmpQueue, + AccountId, Balance, Balances, ParachainInfo, ParachainSystem, PolkadotXcm, Runtime, RuntimeCall, RuntimeEvent, + RuntimeOrigin, XcmpQueue, }; use crate::implementations::DealWithFees; use frame_support::{ @@ -41,7 +42,7 @@ pub type Barrier = ( AllowSubscriptionsFrom, ); -pub type LocalOriginToLocation = SignedToAccountId32; +pub type LocalOriginToLocation = SignedToAccountId32; /// The means for routing XCM messages which are not for local execution into the right message /// queues. @@ -55,7 +56,7 @@ parameter_types! { pub RelayLocation: MultiLocation = MultiLocation::parent(); pub const NodlLocation: MultiLocation = Here.into(); pub const RelayNetwork: NetworkId = NetworkId::Any; - pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into(); + pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into(); pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into(); } @@ -66,18 +67,18 @@ pub type XcmOriginToTransactDispatchOrigin = ( // Sovereign account converter; this attempts to derive an `AccountId` from the origin location // using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for // foreign chains who want to have a local sovereign account on this chain which they control. - SovereignSignedViaLocation, + SovereignSignedViaLocation, // Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when // recognised. - RelayChainAsNative, + RelayChainAsNative, // Native converter for sibling Parachains; will convert to a `SiblingPara` origin when // recognised. - SiblingParachainAsNative, + SiblingParachainAsNative, // Native signed account converter; this just converts an `AccountId32` origin into a normal // `Origin::Signed` origin of the same 32-byte value. - SignedAccountId32AsNative, + SignedAccountId32AsNative, // Xcm origins can be represented natively under the Xcm pallet's Xcm origin. - XcmPassthrough, + XcmPassthrough, ); /// Means for transacting assets on this chain. pub type AssetTransactors = CurrencyTransactor; @@ -103,7 +104,7 @@ parameter_types! { pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { - type Call = Call; + type RuntimeCall = RuntimeCall; type XcmSender = XcmRouter; type AssetTransactor = AssetTransactors; type OriginConverter = XcmOriginToTransactDispatchOrigin; @@ -111,7 +112,7 @@ impl xcm_executor::Config for XcmConfig { type IsTeleporter = (); type LocationInverter = LocationInverter; type Barrier = Barrier; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type Trader = UsingComponents, RelayLocation, AccountId, Balances, DealWithFees>; type ResponseHandler = (); // Don't handle responses for now. type AssetTrap = PolkadotXcm; @@ -120,24 +121,24 @@ impl xcm_executor::Config for XcmConfig { } impl pallet_xcm::Config for Runtime { - type Event = Event; - type SendXcmOrigin = EnsureXcmOrigin; + type RuntimeEvent = RuntimeEvent; + type SendXcmOrigin = EnsureXcmOrigin; type XcmRouter = XcmRouter; - type ExecuteXcmOrigin = EnsureXcmOrigin; + type ExecuteXcmOrigin = EnsureXcmOrigin; type XcmExecuteFilter = Nothing; type XcmExecutor = XcmExecutor; type XcmTeleportFilter = Nothing; type XcmReserveTransferFilter = Everything; - type Weigher = FixedWeightBounds; + type Weigher = FixedWeightBounds; type LocationInverter = LocationInverter; - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100; type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion; } impl cumulus_pallet_xcmp_queue::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type XcmExecutor = XcmExecutor; type ChannelInfo = ParachainSystem; type VersionWrapper = PolkadotXcm; @@ -147,6 +148,6 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type WeightInfo = cumulus_pallet_xcmp_queue::weights::SubstrateWeight; } impl cumulus_pallet_xcm::Config for Runtime { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type XcmExecutor = XcmExecutor; } diff --git a/scripts/run_benchmarks.sh b/scripts/run_benchmarks.sh index 5ed82866c64..240f612bbb8 100755 --- a/scripts/run_benchmarks.sh +++ b/scripts/run_benchmarks.sh @@ -25,12 +25,10 @@ mv weights/pallet_allocations.rs pallets/allocations/src/weights.rs mv weights/pallet_grants.rs pallets/grants/src/weights.rs mv weights/pallet_reserve.rs pallets/reserve/src/weights.rs -exit for PALLET in $external do -echo ./target/release/nodle-parachain benchmark pallet \ - benchmark pallet \ +./target/release/nodle-parachain benchmark pallet \ --chain=dev \ --steps=50 \ --repeat=20 \ @@ -42,7 +40,6 @@ echo ./target/release/nodle-parachain benchmark pallet \ --output=runtimes/eden/src/weights done -exit