diff --git a/.gitignore b/.gitignore index d75a43f93ed..a2b2abe4141 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ lcov.info /basilisk tmp/ +raw.json \ No newline at end of file diff --git a/.maintain/basilisk-bench-data.json b/.maintain/basilisk-bench-data.json deleted file mode 100644 index fd7f4432174..00000000000 --- a/.maintain/basilisk-bench-data.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "pallet-xyk": { - "create_pool": 203.5, - "add_liquidity": 163.8, - "remove_liquidity": 156.9, - "sell": 120.0, - "buy": 120.0 - }, - "pallet-exchange": { - "sell_intention": 93.0, - "buy_intention": 92.0, - "sell_extrinsic": 121.0, - "on_finalize_for_one_sell_extrinsic": 160.0, - "buy_extrinsic": 121.0, - "on_finalize_for_one_buy_extrinsic": 169.0 - }, - "pallet-transaction-multi-payment": { - "withdraw_fee_non_native": 87.0, - "set_currency": 106.0, - "add_currency": 17.0, - "remove_currency": 18.0 - } -} diff --git a/.maintain/pallet-weight-template.hbs b/.maintain/pallet-weight-template.hbs deleted file mode 100644 index 53bb8464761..00000000000 --- a/.maintain/pallet-weight-template.hbs +++ /dev/null @@ -1,138 +0,0 @@ -// This file is part of Basilisk. - -// Copyright (C) 2020-2023 Intergalactic, Limited (GIB). -// SPDX-License-Identifier: Apache-2.0 - -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -{{header}} -//! Autogenerated weights for `{{pallet}}` -//! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}} -//! DATE: {{date}}, STEPS: `{{cmd.steps}}`, REPEAT: `{{cmd.repeat}}`, LOW RANGE: `{{cmd.lowest_range_values}}`, HIGH RANGE: `{{cmd.highest_range_values}}` -//! WORST CASE MAP SIZE: `{{cmd.worst_case_map_values}}` -//! HOSTNAME: `{{hostname}}`, CPU: `{{cpuname}}` -//! WASM-EXECUTION: `{{cmd.wasm_execution}}`, CHAIN: `{{cmd.chain}}`, DB CACHE: `{{cmd.db_cache}}` - -// Executed Command: -{{#each args as |arg|}} -// {{arg}} -{{/each}} - -#![cfg_attr(rustfmt, rustfmt_skip)] -#![allow(unused_parens)] -#![allow(unused_imports)] -#![allow(missing_docs)] - -use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; -use core::marker::PhantomData; - -/// Weight functions needed for `{{pallet}}`. -pub trait WeightInfo { - {{#each benchmarks as |benchmark|}} - fn {{benchmark.name~}} - ( - {{~#each benchmark.components as |c| ~}} - {{c.name}}: u32, {{/each~}} - ) -> Weight; - {{/each}} -} - -/// Weights for `{{pallet}}` using the Basilisk node and recommended hardware. -pub struct BasiliskWeight(PhantomData); -{{#if (eq pallet "frame_system")}} -impl WeightInfo for BasiliskWeight { -{{else}} -impl WeightInfo for BasiliskWeight { -{{/if}} - {{#each benchmarks as |benchmark|}} - {{#each benchmark.comments as |comment|}} - /// {{comment}} - {{/each}} - {{#each benchmark.component_ranges as |range|}} - /// The range of component `{{range.name}}` is `[{{range.min}}, {{range.max}}]`. - {{/each}} - fn {{benchmark.name~}} - ( - {{~#each benchmark.components as |c| ~}} - {{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}} - ) -> Weight { - // Proof Size summary in bytes: - // Measured: `{{benchmark.base_recorded_proof_size}}{{#each benchmark.component_recorded_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}` - // Estimated: `{{benchmark.base_calculated_proof_size}}{{#each benchmark.component_calculated_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}` - // Minimum execution time: {{underscore benchmark.min_execution_time}}_000 picoseconds. - Weight::from_parts({{underscore benchmark.base_weight}}, {{benchmark.base_calculated_proof_size}}) - {{#each benchmark.component_weight as |cw|}} - // Standard Error: {{underscore cw.error}} - .saturating_add(Weight::from_parts({{underscore cw.slope}}, 0).saturating_mul({{cw.name}}.into())) - {{/each}} - {{#if (ne benchmark.base_reads "0")}} - .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}_u64)) - {{/if}} - {{#each benchmark.component_reads as |cr|}} - .saturating_add(T::DbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into()))) - {{/each}} - {{#if (ne benchmark.base_writes "0")}} - .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}_u64)) - {{/if}} - {{#each benchmark.component_writes as |cw|}} - .saturating_add(T::DbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into()))) - {{/each}} - {{#each benchmark.component_calculated_proof_size as |cp|}} - .saturating_add(Weight::from_parts(0, {{cp.slope}}).saturating_mul({{cp.name}}.into())) - {{/each}} - } - {{/each}} -} - -// For backwards compatibility and tests. -impl WeightInfo for () { - {{#each benchmarks as |benchmark|}} - {{#each benchmark.comments as |comment|}} - /// {{comment}} - {{/each}} - {{#each benchmark.component_ranges as |range|}} - /// The range of component `{{range.name}}` is `[{{range.min}}, {{range.max}}]`. - {{/each}} - fn {{benchmark.name~}} - ( - {{~#each benchmark.components as |c| ~}} - {{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}} - ) -> Weight { - // Proof Size summary in bytes: - // Measured: `{{benchmark.base_recorded_proof_size}}{{#each benchmark.component_recorded_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}` - // Estimated: `{{benchmark.base_calculated_proof_size}}{{#each benchmark.component_calculated_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}` - // Minimum execution time: {{underscore benchmark.min_execution_time}}_000 picoseconds. - Weight::from_parts({{underscore benchmark.base_weight}}, {{benchmark.base_calculated_proof_size}}) - {{#each benchmark.component_weight as |cw|}} - // Standard Error: {{underscore cw.error}} - .saturating_add(Weight::from_parts({{underscore cw.slope}}, 0).saturating_mul({{cw.name}}.into())) - {{/each}} - {{#if (ne benchmark.base_reads "0")}} - .saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}}_u64)) - {{/if}} - {{#each benchmark.component_reads as |cr|}} - .saturating_add(RocksDbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into()))) - {{/each}} - {{#if (ne benchmark.base_writes "0")}} - .saturating_add(RocksDbWeight::get().writes({{benchmark.base_writes}}_u64)) - {{/if}} - {{#each benchmark.component_writes as |cw|}} - .saturating_add(RocksDbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into()))) - {{/each}} - {{#each benchmark.component_calculated_proof_size as |cp|}} - .saturating_add(Weight::from_parts(0, {{cp.slope}}).saturating_mul({{cp.name}}.into())) - {{/each}} - } - {{/each}} -} diff --git a/Cargo.lock b/Cargo.lock index b71b1f59ddb..a74b4407e8b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -48,12 +48,12 @@ dependencies = [ [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", - "cipher", + "cipher 0.4.4", "cpufeatures", ] @@ -65,31 +65,31 @@ checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" dependencies = [ "aead", "aes", - "cipher", + "cipher 0.4.4", "ctr", "ghash", - "subtle", + "subtle 2.5.0", ] [[package]] name = "ahash" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.14", "once_cell", "version_check", ] [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", - "getrandom 0.2.11", + "getrandom 0.2.14", "once_cell", "version_check", "zerocopy", @@ -97,18 +97,18 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "always-assert" @@ -142,9 +142,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" @@ -171,9 +171,9 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3a318f1f38d2418400f8209655bfd825785afd25aa30bb7ba6cc792e4596748" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ "windows-sys 0.52.0", ] @@ -190,9 +190,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "approx" @@ -205,16 +205,39 @@ dependencies = [ [[package]] name = "aquamarine" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df752953c49ce90719c7bf1fc587bc8227aed04732ea0c0f85e5397d7fdbd1a1" +checksum = "21cc1548309245035eb18aa7f0967da6bc65587005170c56e6ef2788a4cf3f4e" dependencies = [ "include_dir", "itertools 0.10.5", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.60", +] + +[[package]] +name = "ark-bls12-377" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb00293ba84f51ce3bd026bd0de55899c4e68f0a39a5728cebae3a73ffdc0a4f" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-std", +] + +[[package]] +name = "ark-bls12-377-ext" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20c7021f180a0cbea0380eba97c2af3c57074cdaffe0eef7e840e1c9f2841e55" +dependencies = [ + "ark-bls12-377", + "ark-ec", + "ark-models-ext", + "ark-std", ] [[package]] @@ -229,6 +252,45 @@ dependencies = [ "ark-std", ] +[[package]] +name = "ark-bls12-381-ext" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1dc4b3d08f19e8ec06e949712f95b8361e43f1391d94f65e4234df03480631c" +dependencies = [ + "ark-bls12-381", + "ark-ec", + "ark-ff", + "ark-models-ext", + "ark-serialize", + "ark-std", +] + +[[package]] +name = "ark-bw6-761" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e0605daf0cc5aa2034b78d008aaf159f56901d92a52ee4f6ecdfdac4f426700" +dependencies = [ + "ark-bls12-377", + "ark-ec", + "ark-ff", + "ark-std", +] + +[[package]] +name = "ark-bw6-761-ext" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccee5fba47266f460067588ee1bf070a9c760bf2050c1c509982c5719aadb4f2" +dependencies = [ + "ark-bw6-761", + "ark-ec", + "ark-ff", + "ark-models-ext", + "ark-std", +] + [[package]] name = "ark-ec" version = "0.4.2" @@ -243,9 +305,35 @@ dependencies = [ "hashbrown 0.13.2", "itertools 0.10.5", "num-traits", + "rayon", "zeroize", ] +[[package]] +name = "ark-ed-on-bls12-377" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b10d901b9ac4b38f9c32beacedfadcdd64e46f8d7f8e88c1ae1060022cf6f6c6" +dependencies = [ + "ark-bls12-377", + "ark-ec", + "ark-ff", + "ark-std", +] + +[[package]] +name = "ark-ed-on-bls12-377-ext" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524a4fb7540df2e1a8c2e67a83ba1d1e6c3947f4f9342cc2359fc2e789ad731d" +dependencies = [ + "ark-ec", + "ark-ed-on-bls12-377", + "ark-ff", + "ark-models-ext", + "ark-std", +] + [[package]] name = "ark-ed-on-bls12-381-bandersnatch" version = "0.4.0" @@ -258,6 +346,19 @@ dependencies = [ "ark-std", ] +[[package]] +name = "ark-ed-on-bls12-381-bandersnatch-ext" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d15185f1acb49a07ff8cbe5f11a1adc5a93b19e211e325d826ae98e98e124346" +dependencies = [ + "ark-ec", + "ark-ed-on-bls12-381-bandersnatch", + "ark-ff", + "ark-models-ext", + "ark-std", +] + [[package]] name = "ark-ff" version = "0.4.2" @@ -302,29 +403,29 @@ dependencies = [ ] [[package]] -name = "ark-poly" -version = "0.4.2" +name = "ark-models-ext" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" +checksum = "3e9eab5d4b5ff2f228b763d38442adc9b084b0a465409b059fac5c2308835ec2" dependencies = [ + "ark-ec", "ark-ff", "ark-serialize", "ark-std", "derivative", - "hashbrown 0.13.2", ] [[package]] -name = "ark-scale" -version = "0.0.10" +name = "ark-poly" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b08346a3e38e2be792ef53ee168623c9244d968ff00cd70fb9932f6fe36393" +checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" dependencies = [ - "ark-ec", "ark-ff", "ark-serialize", "ark-std", - "parity-scale-codec", + "derivative", + "hashbrown 0.13.2", ] [[package]] @@ -344,7 +445,7 @@ dependencies = [ [[package]] name = "ark-secret-scalar" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e" dependencies = [ "ark-ec", "ark-ff", @@ -352,7 +453,7 @@ dependencies = [ "ark-std", "ark-transcript", "digest 0.10.7", - "rand_core 0.6.4", + "getrandom_or_panic", "zeroize", ] @@ -386,13 +487,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", - "rand 0.8.5", + "rand", + "rayon", ] [[package]] name = "ark-transcript" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e" dependencies = [ "ark-ff", "ark-serialize", @@ -402,6 +504,12 @@ dependencies = [ "sha3", ] +[[package]] +name = "array-bytes" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6" + [[package]] name = "array-bytes" version = "6.2.2" @@ -423,12 +531,6 @@ dependencies = [ "nodrop", ] -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "arrayvec" version = "0.7.4" @@ -493,28 +595,27 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.1.1" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" dependencies = [ "concurrent-queue", - "event-listener 4.0.0", - "event-listener-strategy", + "event-listener 5.3.0", + "event-listener-strategy 0.5.1", "futures-core", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", ] [[package]] name = "async-executor" -version = "1.8.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" dependencies = [ - "async-lock 3.2.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", - "futures-lite 2.1.0", + "fastrand 2.0.2", + "futures-lite 2.3.0", "slab", ] @@ -552,18 +653,18 @@ dependencies = [ [[package]] name = "async-io" -version = "2.2.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6d3b15875ba253d1110c740755e246537483f152fa334f91abd7fe84c88b3ff" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" dependencies = [ - "async-lock 3.2.0", + "async-lock 3.3.0", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.1.0", + "futures-lite 2.3.0", "parking", - "polling 3.3.1", - "rustix 0.38.27", + "polling 3.7.0", + "rustix 0.38.34", "slab", "tracing", "windows-sys 0.52.0", @@ -580,13 +681,13 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ - "event-listener 4.0.0", - "event-listener-strategy", - "pin-project-lite 0.2.13", + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", + "pin-project-lite 0.2.14", ] [[package]] @@ -613,54 +714,43 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.27", + "rustix 0.38.34", "windows-sys 0.48.0", ] -[[package]] -name = "async-recursion" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" dependencies = [ - "async-io 2.2.1", - "async-lock 2.8.0", + "async-io 2.3.2", + "async-lock 3.3.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.27", + "rustix 0.38.34", "signal-hook-registry", "slab", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "async-task" -version = "4.5.0" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] @@ -673,7 +763,7 @@ dependencies = [ "futures-sink", "futures-util", "memchr", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", ] [[package]] @@ -688,34 +778,22 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "auto_impl" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89" +checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.60", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "az" @@ -725,38 +803,39 @@ checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line 0.21.0", "cc", "cfg-if", "libc", "miniz_oxide", - "object 0.32.1", + "object 0.32.2", "rustc-demangle", ] [[package]] name = "bandersnatch_vrfs" -version = "0.0.1" -source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +version = "0.0.4" +source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e" dependencies = [ "ark-bls12-381", "ark-ec", "ark-ed-on-bls12-381-bandersnatch", "ark-ff", - "ark-scale 0.0.12", "ark-serialize", "ark-std", "dleq_vrf", "fflonk", - "merlin 3.0.0", + "merlin", "rand_chacha 0.3.1", "rand_core 0.6.4", "ring 0.1.0", "sha2 0.10.8", + "sp-ark-bls12-381", + "sp-ark-ed-on-bls12-381-bandersnatch", "zeroize", ] @@ -780,9 +859,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -792,7 +871,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "basilisk" -version = "11.1.0" +version = "13.0.0" dependencies = [ "basilisk-runtime", "clap", @@ -824,7 +903,7 @@ dependencies = [ "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-service", - "primitives 6.6.0", + "primitives 6.6.1", "sc-basic-authorship", "sc-block-builder", "sc-chain-spec", @@ -862,22 +941,21 @@ dependencies = [ "sp-runtime", "sp-session", "sp-state-machine", - "sp-storage", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-timestamp", "sp-transaction-pool", "sp-trie", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", "substrate-state-trie-migration-rpc", - "trie-db 0.28.0", + "trie-db", ] [[package]] name = "basilisk-runtime" -version = "112.0.0" +version = "113.0.0" dependencies = [ "cumulus-pallet-aura-ext", - "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", @@ -905,7 +983,7 @@ dependencies = [ "orml-xcm", "orml-xcm-support", "orml-xtokens", - "pallet-asset-registry", + "pallet-asset-registry 2.3.3", "pallet-aura", "pallet-authorship", "pallet-balances", @@ -913,7 +991,7 @@ dependencies = [ "pallet-collator-selection", "pallet-collective", "pallet-currencies", - "pallet-democracy 4.0.0-dev", + "pallet-democracy 28.0.0", "pallet-duster", "pallet-elections-phragmen", "pallet-ema-oracle", @@ -921,6 +999,7 @@ dependencies = [ "pallet-lbp", "pallet-liquidity-mining", "pallet-marketplace", + "pallet-message-queue", "pallet-multisig", "pallet-nft", "pallet-preimage", @@ -940,15 +1019,15 @@ dependencies = [ "pallet-uniques", "pallet-utility", "pallet-xcm", - "pallet-xcm-rate-limiter", "pallet-xyk", "pallet-xyk-liquidity-mining", "pallet-xyk-liquidity-mining-benchmarking", - "parachain-info", + "parachains-common", "parity-scale-codec", "polkadot-parachain-primitives", + "polkadot-runtime-common", "primitive-types", - "primitives 6.6.0", + "primitives 6.6.1", "scale-info", "serde", "smallvec", @@ -956,17 +1035,18 @@ dependencies = [ "sp-block-builder", "sp-consensus-aura", "sp-core", - "sp-externalities 0.19.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-inherents", "sp-io", "sp-offchain", "sp-runtime", "sp-session", "sp-staking", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-transaction-pool", "sp-trie", "sp-version", + "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -984,10 +1064,10 @@ dependencies = [ [[package]] name = "binary-merkle-tree" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "13.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "hash-db 0.16.0", + "hash-db", "log", ] @@ -1012,13 +1092,13 @@ dependencies = [ "lazy_static", "lazycell", "peeking_take_while", - "prettyplease 0.2.15", + "prettyplease 0.2.19", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] @@ -1028,6 +1108,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f" dependencies = [ "bitcoin_hashes", + "rand", + "rand_core 0.6.4", + "serde", + "unicode-normalization", ] [[package]] @@ -1044,9 +1128,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "bitvec" @@ -1056,10 +1140,23 @@ checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ "funty", "radium", + "serde", "tap", "wyz", ] +[[package]] +name = "blake2" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330" +dependencies = [ + "byte-tools", + "crypto-mac 0.7.0", + "digest 0.8.1", + "opaque-debug 0.2.3", +] + [[package]] name = "blake2" version = "0.10.6" @@ -1103,9 +1200,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" dependencies = [ "arrayref", "arrayvec 0.7.4", @@ -1114,18 +1211,6 @@ dependencies = [ "constant_time_eq 0.3.0", ] -[[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding", - "byte-tools", - "byteorder", - "generic-array 0.12.4", -] - [[package]] name = "block-buffer" version = "0.9.0" @@ -1144,36 +1229,27 @@ dependencies = [ "generic-array 0.14.7", ] -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - [[package]] name = "blocking" version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ - "async-channel 2.1.1", - "async-lock 3.2.0", + "async-channel 2.2.1", + "async-lock 3.3.0", "async-task", - "fastrand 2.0.1", + "fastrand 2.0.2", "futures-io", - "futures-lite 2.1.0", + "futures-lite 2.3.0", "piper", "tracing", ] [[package]] name = "bounded-collections" -version = "0.1.9" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca548b6163b872067dc5eb82fd130c56881435e30367d2073594a3d9744120dd" +checksum = "d32385ecb91a31bddaf908e8dcf4a15aef1bcd3913cc03ebfad02ff6d568abc1" dependencies = [ "log", "parity-scale-codec", @@ -1190,6 +1266,17 @@ dependencies = [ "thiserror", ] +[[package]] +name = "bp-xcm-bridge-hub-router" +version = "0.6.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" +dependencies = [ + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-runtime", +] + [[package]] name = "bs58" version = "0.4.0" @@ -1198,23 +1285,13 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bs58" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" dependencies = [ "tinyvec", ] -[[package]] -name = "bstr" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" -dependencies = [ - "memchr", - "serde", -] - [[package]] name = "build-helper" version = "0.1.1" @@ -1226,9 +1303,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byte-slice-cast" @@ -1244,9 +1321,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" [[package]] name = "byteorder" @@ -1256,9 +1333,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "bzip2-sys" @@ -1271,6 +1348,16 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "c2-chacha" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d27dae93fe7b1e0424dc57179ac396908c26b035a87234809f5c4dfd1b47dc80" +dependencies = [ + "cipher 0.2.5", + "ppv-lite86", +] + [[package]] name = "camino" version = "1.1.6" @@ -1286,7 +1373,7 @@ version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72" dependencies = [ - "semver 1.0.20", + "semver 1.0.22", "serde", "toml 0.7.8", "url", @@ -1294,9 +1381,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" dependencies = [ "serde", ] @@ -1309,7 +1396,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.20", + "semver 1.0.22", "serde", "serde_json", "thiserror", @@ -1317,12 +1404,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -1336,9 +1424,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.5" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", ] @@ -1355,6 +1443,16 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "chacha" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf3c081b5fba1e5615640aae998e0fbd10c24cbd897ee39ed754a77601a4862" +dependencies = [ + "byteorder", + "keystream", +] + [[package]] name = "chacha20" version = "0.9.1" @@ -1362,7 +1460,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ "cfg-if", - "cipher", + "cipher 0.4.4", "cpufeatures", ] @@ -1374,23 +1472,23 @@ checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ "aead", "chacha20", - "cipher", + "cipher 0.4.4", "poly1305", "zeroize", ] [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -1401,11 +1499,20 @@ checksum = "b9b68e3193982cd54187d71afdb2a271ad4cf8af157858e9cb911b91321de143" dependencies = [ "core2", "multibase", - "multihash", + "multihash 0.17.0", "serde", "unsigned-varint", ] +[[package]] +name = "cipher" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +dependencies = [ + "generic-array 0.14.7", +] + [[package]] name = "cipher" version = "0.4.4" @@ -1428,9 +1535,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" dependencies = [ "glob", "libc", @@ -1439,9 +1546,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.11" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -1449,43 +1556,43 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.11" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", "clap_lex", "strsim", + "terminal_size", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "coarsetime" -version = "0.1.33" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71367d3385c716342014ad17e3d19f7788ae514885a1f4c24f500260fb365e1a" +checksum = "13b3839cf01bb7960114be3ccf2340f541b6d0c81f8690b007b2b39f750f7e5d" dependencies = [ "libc", - "once_cell", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasix", "wasm-bindgen", ] @@ -1507,19 +1614,19 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "comfy-table" -version = "7.1.0" +version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c64043d6c7b7a4c58e39e7efccfdea7b93d885a795d0c054a69dbbf4dd52686" +checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7" dependencies = [ - "strum 0.25.0", - "strum_macros 0.25.3", + "strum 0.26.2", + "strum_macros 0.26.2", "unicode-width", ] [[package]] name = "common" version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213" +source = "git+https://github.com/w3f/ring-proof#b273d33f9981e2bb3375ab45faeb537f7ee35224" dependencies = [ "ark-ec", "ark-ff", @@ -1527,7 +1634,9 @@ dependencies = [ "ark-serialize", "ark-std", "fflonk", - "merlin 3.0.0", + "getrandom_or_panic", + "merlin", + "rand_chacha 0.3.1", ] [[package]] @@ -1547,28 +1656,28 @@ dependencies = [ [[package]] name = "console" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ "encode_unicode", "lazy_static", "libc", "unicode-width", - "windows-sys 0.45.0", + "windows-sys 0.52.0", ] [[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const-random" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" dependencies = [ "const-random-macro", ] @@ -1579,7 +1688,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.14", "once_cell", "tiny-keccak", ] @@ -1596,6 +1705,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +[[package]] +name = "constcat" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd7e35aee659887cbfb97aaf227ac12cad1a9d7c71e55ff3376839ed4e282d08" + [[package]] name = "convert_case" version = "0.4.0" @@ -1648,9 +1763,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -1755,55 +1870,46 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -1819,7 +1925,7 @@ checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array 0.14.7", "rand_core 0.6.4", - "subtle", + "subtle 2.5.0", "zeroize", ] @@ -1834,6 +1940,16 @@ dependencies = [ "typenum", ] +[[package]] +name = "crypto-mac" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" +dependencies = [ + "generic-array 0.12.4", + "subtle 1.0.0", +] + [[package]] name = "crypto-mac" version = "0.8.0" @@ -1841,17 +1957,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ "generic-array 0.14.7", - "subtle", + "subtle 2.5.0", ] [[package]] name = "crypto-mac" -version = "0.11.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" dependencies = [ "generic-array 0.14.7", - "subtle", + "subtle 2.5.0", ] [[package]] @@ -1860,13 +1976,13 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "cipher", + "cipher 0.4.4", ] [[package]] name = "cumulus-client-cli" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "clap", "parity-scale-codec", @@ -1874,6 +1990,7 @@ dependencies = [ "sc-cli", "sc-client-api", "sc-service", + "sp-blockchain", "sp-core", "sp-runtime", "url", @@ -1881,8 +1998,8 @@ dependencies = [ [[package]] name = "cumulus-client-collator" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", @@ -1904,16 +2021,16 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "cumulus-client-collator", "cumulus-client-consensus-common", "cumulus-client-consensus-proposer", + "cumulus-client-parachain-inherent", "cumulus-primitives-aura", "cumulus-primitives-core", - "cumulus-primitives-parachain-inherent", "cumulus-relay-chain-interface", "futures", "parity-scale-codec", @@ -1946,8 +2063,8 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "cumulus-client-pov-recovery", @@ -1975,8 +2092,8 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-proposer" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "anyhow", "async-trait", @@ -1990,8 +2107,8 @@ dependencies = [ [[package]] name = "cumulus-client-network" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "cumulus-relay-chain-interface", @@ -2012,9 +2129,33 @@ dependencies = [ ] [[package]] -name = "cumulus-client-pov-recovery" +name = "cumulus-client-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" +dependencies = [ + "async-trait", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-relay-chain-interface", + "cumulus-test-relay-sproof-builder", + "parity-scale-codec", + "sc-client-api", + "scale-info", + "sp-api", + "sp-crypto-hashing", + "sp-inherents", + "sp-runtime", + "sp-state-machine", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-trie", + "tracing", +] + +[[package]] +name = "cumulus-client-pov-recovery" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2026,7 +2167,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-overseer", "polkadot-primitives", - "rand 0.8.5", + "rand", "sc-client-api", "sc-consensus", "sp-consensus", @@ -2037,8 +2178,8 @@ dependencies = [ [[package]] name = "cumulus-client-service" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", @@ -2046,6 +2187,7 @@ dependencies = [ "cumulus-client-network", "cumulus-client-pov-recovery", "cumulus-primitives-core", + "cumulus-primitives-proof-size-hostfunction", "cumulus-relay-chain-inprocess-interface", "cumulus-relay-chain-interface", "cumulus-relay-chain-minimal-node", @@ -2072,8 +2214,8 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "cumulus-pallet-parachain-system", "frame-support", @@ -2085,13 +2227,13 @@ dependencies = [ "sp-application-crypto", "sp-consensus-aura", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "cumulus-pallet-dmp-queue" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2101,55 +2243,59 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "staging-xcm", ] [[package]] name = "cumulus-pallet-parachain-system" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "bytes", "cumulus-pallet-parachain-system-proc-macro", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", + "cumulus-primitives-proof-size-hostfunction", "environmental", + "frame-benchmarking", "frame-support", "frame-system", "impl-trait-for-tuples", "log", + "pallet-message-queue", "parity-scale-codec", "polkadot-parachain-primitives", + "polkadot-runtime-parachains", "scale-info", "sp-core", - "sp-externalities 0.19.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-inherents", "sp-io", "sp-runtime", "sp-state-machine", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-trie", "sp-version", "staging-xcm", - "trie-db 0.27.1", + "trie-db", ] [[package]] name = "cumulus-pallet-parachain-system-proc-macro" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.6.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] name = "cumulus-pallet-xcm" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -2158,36 +2304,39 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "staging-xcm", ] [[package]] name = "cumulus-pallet-xcmp-queue" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ + "bounded-collections", + "bp-xcm-bridge-hub-router", "cumulus-primitives-core", "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-message-queue", "parity-scale-codec", "polkadot-runtime-common", - "rand_chacha 0.3.1", + "polkadot-runtime-parachains", "scale-info", "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "staging-xcm", "staging-xcm-executor", ] [[package]] name = "cumulus-primitives-aura" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "parity-scale-codec", "polkadot-core-primitives", @@ -2195,13 +2344,13 @@ dependencies = [ "sp-api", "sp-consensus-aura", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "cumulus-primitives-core" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "parity-scale-codec", "polkadot-core-primitives", @@ -2210,60 +2359,65 @@ dependencies = [ "scale-info", "sp-api", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-trie", "staging-xcm", ] [[package]] name = "cumulus-primitives-parachain-inherent" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "cumulus-primitives-core", - "cumulus-relay-chain-interface", - "cumulus-test-relay-sproof-builder", "parity-scale-codec", - "sc-client-api", "scale-info", - "sp-api", "sp-core", "sp-inherents", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-storage", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-trie", +] + +[[package]] +name = "cumulus-primitives-proof-size-hostfunction" +version = "0.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" +dependencies = [ + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-trie", - "tracing", ] [[package]] name = "cumulus-primitives-timestamp" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "cumulus-primitives-core", "futures", "parity-scale-codec", "sp-inherents", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-timestamp", ] [[package]] name = "cumulus-primitives-utility" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "cumulus-primitives-core", "frame-support", "log", + "pallet-asset-conversion", + "pallet-xcm-benchmarks", "parity-scale-codec", "polkadot-runtime-common", + "polkadot-runtime-parachains", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -2271,8 +2425,8 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-inprocess-interface" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2295,8 +2449,8 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-interface" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2313,43 +2467,49 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-minimal-node" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", "cumulus-relay-chain-rpc-interface", "futures", + "parking_lot 0.12.1", "polkadot-availability-recovery", "polkadot-collator-protocol", "polkadot-core-primitives", "polkadot-network-bridge", "polkadot-node-collation-generation", + "polkadot-node-core-chain-api", + "polkadot-node-core-prospective-parachains", "polkadot-node-core-runtime-api", "polkadot-node-network-protocol", "polkadot-node-subsystem-util", "polkadot-overseer", "polkadot-primitives", "sc-authority-discovery", + "sc-client-api", "sc-network", "sc-network-common", "sc-service", "sc-tracing", "sc-utils", - "schnellru", "sp-api", + "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-runtime", + "substrate-prometheus-endpoint", + "tokio", "tracing", ] [[package]] name = "cumulus-relay-chain-rpc-interface" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -2361,7 +2521,7 @@ dependencies = [ "parity-scale-codec", "pin-project", "polkadot-overseer", - "rand 0.8.5", + "rand", "sc-client-api", "sc-rpc-api", "sc-service", @@ -2376,7 +2536,8 @@ dependencies = [ "sp-core", "sp-runtime", "sp-state-machine", - "sp-storage", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-version", "thiserror", "tokio", "tokio-util", @@ -2386,31 +2547,18 @@ dependencies = [ [[package]] name = "cumulus-test-relay-sproof-builder" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", "polkadot-primitives", "sp-runtime", "sp-state-machine", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-trie", ] -[[package]] -name = "curve25519-dalek" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a9b85542f99a2dfa2a1b8e192662741c9859a846b296bef1c92ef9b58b5a216" -dependencies = [ - "byteorder", - "digest 0.8.1", - "rand_core 0.5.1", - "subtle", - "zeroize", -] - [[package]] name = "curve25519-dalek" version = "3.2.0" @@ -2420,24 +2568,24 @@ dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.5.1", - "subtle", + "subtle 2.5.0", "zeroize", ] [[package]] name = "curve25519-dalek" -version = "4.1.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest 0.10.7", "fiat-crypto", - "platforms 3.2.0", + "platforms 3.4.0", "rustc_version", - "subtle", + "subtle 2.5.0", "zeroize", ] @@ -2449,7 +2597,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] @@ -2467,9 +2615,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.110" +version = "1.0.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7129e341034ecb940c9072817cd9007974ea696844fc4dd582dc1653a7fbe2e8" +checksum = "21db378d04296a84d8b7d047c36bb3954f0b46529db725d7e62fb02f9ba53ccc" dependencies = [ "cc", "cxxbridge-flags", @@ -2479,9 +2627,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.110" +version = "1.0.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a24f3f5f8eed71936f21e570436f024f5c2e25628f7496aa7ccd03b90109d5" +checksum = "3e5262a7fa3f0bae2a55b767c223ba98032d7c328f5c13fa5cdc980b77fc0658" dependencies = [ "cc", "codespan-reporting", @@ -2489,24 +2637,24 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] name = "cxxbridge-flags" -version = "1.0.110" +version = "1.0.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06fdd177fc61050d63f67f5bd6351fac6ab5526694ea8e359cd9cd3b75857f44" +checksum = "be8dcadd2e2fb4a501e1d9e93d6e88e6ea494306d8272069c92d5a9edf8855c0" [[package]] name = "cxxbridge-macro" -version = "1.0.110" +version = "1.0.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "587663dd5fb3d10932c8aecfe7c844db1bcf0aee93eeab08fac13dc1212c2e7f" +checksum = "ad08a837629ad949b73d032c637653d069e909cffe4ee7870b02301939ce39cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] @@ -2537,9 +2685,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "zeroize", @@ -2561,9 +2709,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] @@ -2590,6 +2738,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive-syn-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -2642,14 +2801,14 @@ dependencies = [ "block-buffer 0.10.4", "const-oid", "crypto-common", - "subtle", + "subtle 2.5.0", ] [[package]] name = "directories" -version = "4.0.1" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" dependencies = [ "dirs-sys", ] @@ -2666,13 +2825,14 @@ dependencies = [ [[package]] name = "dirs-sys" -version = "0.3.7" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", + "option-ext", "redox_users", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -2694,50 +2854,49 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] name = "dleq_vrf" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e" dependencies = [ "ark-ec", "ark-ff", - "ark-scale 0.0.10", + "ark-scale", "ark-secret-scalar", "ark-serialize", "ark-std", "ark-transcript", "arrayvec 0.7.4", - "rand_core 0.6.4", "zeroize", ] [[package]] name = "docify" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc4fd38aaa9fb98ac70794c82a00360d1e165a87fbf96a8a91f9dfc602aaee2" +checksum = "43a2f138ad521dc4a2ced1a4576148a6a610b4c5923933b062a263130a6802ce" dependencies = [ "docify_macros", ] [[package]] name = "docify_macros" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63fa215f3a0d40fb2a221b3aa90d8e1fbb8379785a990cb60d62ac71ebdc6460" +checksum = "1a081e51fb188742f5a7a1164ad752121abcb22874b21e2c3b0dd040c515fdad" dependencies = [ "common-path", - "derive-syn-parse", + "derive-syn-parse 0.2.0", "once_cell", "proc-macro2", "quote", "regex", - "syn 2.0.39", + "syn 2.0.60", "termcolor", - "toml 0.8.2", + "toml 0.8.12", "walkdir", ] @@ -2749,9 +2908,9 @@ checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" [[package]] name = "downcast-rs" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "dtoa" @@ -2782,9 +2941,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "ecdsa" @@ -2812,16 +2971,16 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ - "curve25519-dalek 4.1.1", + "curve25519-dalek 4.1.2", "ed25519", "rand_core 0.6.4", "serde", "sha2 0.10.8", - "subtle", + "subtle 2.5.0", "zeroize", ] @@ -2845,7 +3004,7 @@ version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9" dependencies = [ - "curve25519-dalek 4.1.1", + "curve25519-dalek 4.1.2", "ed25519", "hashbrown 0.14.3", "hex", @@ -2856,9 +3015,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "elliptic-curve" @@ -2875,7 +3034,7 @@ dependencies = [ "pkcs8", "rand_core 0.6.4", "sec1", - "subtle", + "subtle 2.5.0", "zeroize", ] @@ -2891,7 +3050,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 1.0.109", @@ -2899,53 +3058,40 @@ dependencies = [ [[package]] name = "enumflags2" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" dependencies = [ "enumflags2_derive", ] [[package]] name = "enumflags2_derive" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] name = "enumn" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" +checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", -] - -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", + "syn 2.0.60", ] [[package]] name = "env_logger" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ "humantime", "is-terminal", @@ -2993,20 +3139,20 @@ dependencies = [ [[package]] name = "ethereum" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a89fb87a9e103f71b903b80b670200b54cc67a07578f070681f1fffb7396fb7" +checksum = "2e04d24d20b8ff2235cffbf242d5092de3aa45f77c5270ddbfadd2778ca13fea" dependencies = [ "bytes", "ethereum-types", - "hash-db 0.15.2", + "hash-db", "hash256-std-hasher", "parity-scale-codec", "rlp", "scale-info", "serde", "sha3", - "triehash", + "trie-root", ] [[package]] @@ -3039,18 +3185,29 @@ checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" dependencies = [ "concurrent-queue", "parking", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", ] [[package]] name = "event-listener" -version = "4.0.0" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite 0.2.14", +] + +[[package]] +name = "event-listener" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" dependencies = [ "concurrent-queue", "parking", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", ] [[package]] @@ -3059,14 +3216,24 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 4.0.0", - "pin-project-lite 0.2.13", + "event-listener 4.0.3", + "pin-project-lite 0.2.14", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +dependencies = [ + "event-listener 5.3.0", + "pin-project-lite 0.2.14", ] [[package]] name = "evm" -version = "0.39.1" -source = "git+https://github.com/moonbeam-foundation/evm?rev=a33ac87ad7462b7e7029d12c385492b2a8311d1c#a33ac87ad7462b7e7029d12c385492b2a8311d1c" +version = "0.41.1" +source = "git+https://github.com/moonbeam-foundation/evm?branch=moonbeam-polkadot-v1.7.2#d8991ec727ad0fb64fe9957a3cd307387a6701e4" dependencies = [ "auto_impl", "environmental", @@ -3085,8 +3252,8 @@ dependencies = [ [[package]] name = "evm-core" -version = "0.39.0" -source = "git+https://github.com/moonbeam-foundation/evm?rev=a33ac87ad7462b7e7029d12c385492b2a8311d1c#a33ac87ad7462b7e7029d12c385492b2a8311d1c" +version = "0.41.0" +source = "git+https://github.com/moonbeam-foundation/evm?branch=moonbeam-polkadot-v1.7.2#d8991ec727ad0fb64fe9957a3cd307387a6701e4" dependencies = [ "parity-scale-codec", "primitive-types", @@ -3096,8 +3263,8 @@ dependencies = [ [[package]] name = "evm-gasometer" -version = "0.39.0" -source = "git+https://github.com/moonbeam-foundation/evm?rev=a33ac87ad7462b7e7029d12c385492b2a8311d1c#a33ac87ad7462b7e7029d12c385492b2a8311d1c" +version = "0.41.0" +source = "git+https://github.com/moonbeam-foundation/evm?branch=moonbeam-polkadot-v1.7.2#d8991ec727ad0fb64fe9957a3cd307387a6701e4" dependencies = [ "environmental", "evm-core", @@ -3107,8 +3274,8 @@ dependencies = [ [[package]] name = "evm-runtime" -version = "0.39.0" -source = "git+https://github.com/moonbeam-foundation/evm?rev=a33ac87ad7462b7e7029d12c385492b2a8311d1c#a33ac87ad7462b7e7029d12c385492b2a8311d1c" +version = "0.41.0" +source = "git+https://github.com/moonbeam-foundation/evm?branch=moonbeam-polkadot-v1.7.2#d8991ec727ad0fb64fe9957a3cd307387a6701e4" dependencies = [ "auto_impl", "environmental", @@ -3140,35 +3307,18 @@ dependencies = [ [[package]] name = "expander" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3774182a5df13c3d1690311ad32fbe913feef26baba609fa2dd5f72042bd2ab6" -dependencies = [ - "blake2", - "fs-err", - "proc-macro2", - "quote", -] - -[[package]] -name = "expander" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f86a749cf851891866c10515ef6c299b5c69661465e9c3bbe7e07a2b77fb0f7" +checksum = "00e83c02035136f1592a47964ea60c05a50e4ed8b5892cfac197063850898d4d" dependencies = [ - "blake2", + "blake2 0.10.6", "fs-err", + "prettier-please", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - [[package]] name = "fallible-iterator" version = "0.2.0" @@ -3186,9 +3336,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "fatality" @@ -3217,11 +3367,12 @@ dependencies = [ [[package]] name = "fdlimit" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4c9e43643f5a3be4ca5b67d26b98031ff9db6806c3440ae32e02e3ceac3f1b" +checksum = "e182f7dbc2ef73d9ef67351c5fbbea084729c48362d3ce9dd44c28e32e277fe5" dependencies = [ "libc", + "thiserror", ] [[package]] @@ -3231,7 +3382,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ "rand_core 0.6.4", - "subtle", + "subtle 2.5.0", ] [[package]] @@ -3244,14 +3395,14 @@ dependencies = [ "ark-poly", "ark-serialize", "ark-std", - "merlin 3.0.0", + "merlin", ] [[package]] name = "fiat-crypto" -version = "0.2.5" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" +checksum = "38793c55593b33412e3ae40c2c9781ffaa6f438f6f8c10f24e71846fbd7ae01e" [[package]] name = "file-per-thread-logger" @@ -3259,7 +3410,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866" dependencies = [ - "env_logger 0.10.1", + "env_logger", "log", ] @@ -3311,7 +3462,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", - "rand 0.8.5", + "rand", "rustc-hex", "static_assertions", ] @@ -3350,8 +3501,8 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" -version = "3.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "12.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "parity-scale-codec", ] @@ -3368,7 +3519,7 @@ dependencies = [ [[package]] name = "fp-account" version = "1.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#bf5885a982041cc744ecbb62a2afc13d56d464dc" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#2c05f9d4d951efacf504d610286da6ac908b1302" dependencies = [ "hex", "impl-serde", @@ -3380,23 +3531,24 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-runtime-interface 17.0.0 (git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0)", - "sp-std", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "fp-evm" version = "3.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#bf5885a982041cc744ecbb62a2afc13d56d464dc" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#2c05f9d4d951efacf504d610286da6ac908b1302" dependencies = [ "evm", "frame-support", + "num_enum", "parity-scale-codec", "scale-info", "serde", "sp-core", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] @@ -3407,8 +3559,8 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-support", "frame-support-procedural", @@ -3424,19 +3576,19 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-runtime-interface 17.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", - "sp-std", - "sp-storage", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "static_assertions", ] [[package]] name = "frame-benchmarking-cli" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "32.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "Inflector", - "array-bytes", + "array-bytes 6.2.2", "chrono", "clap", "comfy-table", @@ -3450,7 +3602,7 @@ dependencies = [ "linked-hash-map", "log", "parity-scale-codec", - "rand 0.8.5", + "rand", "rand_pcg", "sc-block-builder", "sc-cli", @@ -3465,34 +3617,34 @@ dependencies = [ "sp-blockchain", "sp-core", "sp-database", - "sp-externalities 0.19.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-inherents", "sp-io", "sp-keystore", "sp-runtime", "sp-state-machine", - "sp-storage", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-trie", - "sp-wasm-interface 14.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "thiserror", "thousands", ] [[package]] name = "frame-election-provider-solution-type" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "13.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] name = "frame-election-provider-support" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -3503,13 +3655,13 @@ dependencies = [ "sp-core", "sp-npos-elections", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "frame-executive" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-support", "frame-system", @@ -3520,8 +3672,8 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", - "sp-tracing 10.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] @@ -3538,10 +3690,9 @@ dependencies = [ [[package]] name = "frame-remote-externalities" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.35.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "async-recursion", "futures", "indicatif", "jsonrpsee", @@ -3549,6 +3700,7 @@ dependencies = [ "parity-scale-codec", "serde", "sp-core", + "sp-crypto-hashing", "sp-io", "sp-runtime", "sp-state-machine", @@ -3560,10 +3712,11 @@ dependencies = [ [[package]] name = "frame-support" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "aquamarine", + "array-bytes 6.2.2", "bitflags 1.3.2", "docify", "environmental", @@ -3582,8 +3735,8 @@ dependencies = [ "sp-api", "sp-arithmetic", "sp-core", - "sp-core-hashing-proc-macro", - "sp-debug-derive", + "sp-crypto-hashing-proc-macro", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-genesis-builder", "sp-inherents", "sp-io", @@ -3591,8 +3744,8 @@ dependencies = [ "sp-runtime", "sp-staking", "sp-state-machine", - "sp-std", - "sp-tracing 10.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-weights", "static_assertions", "tt-call", @@ -3600,50 +3753,52 @@ dependencies = [ [[package]] name = "frame-support-procedural" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "Inflector", "cfg-expr", - "derive-syn-parse", - "expander 2.0.0", + "derive-syn-parse 0.1.5", + "expander 2.1.0", "frame-support-procedural-tools", "itertools 0.10.5", "macro_magic", "proc-macro-warning", "proc-macro2", "quote", - "syn 2.0.39", + "sp-crypto-hashing", + "syn 2.0.60", ] [[package]] name = "frame-support-procedural-tools" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "10.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-support-procedural-tools-derive", - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] name = "frame-support-procedural-tools-derive" -version = "3.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "11.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] name = "frame-system" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "cfg-if", + "docify", "frame-support", "log", "parity-scale-codec", @@ -3652,15 +3807,15 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-version", "sp-weights", ] [[package]] name = "frame-system-benchmarking" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -3669,13 +3824,13 @@ dependencies = [ "scale-info", "sp-core", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "frame-system-rpc-runtime-api" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "parity-scale-codec", "sp-api", @@ -3683,14 +3838,14 @@ dependencies = [ [[package]] name = "frame-try-runtime" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.34.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-support", "parity-scale-codec", "sp-api", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] @@ -3714,11 +3869,11 @@ dependencies = [ [[package]] name = "fs4" -version = "0.6.6" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" +checksum = "29f9df8a11882c4e3335eb2d18a0137c505d9ca927470b0cac9c6f0ae07d28f7" dependencies = [ - "rustix 0.38.27", + "rustix 0.38.34", "windows-sys 0.48.0", ] @@ -3730,9 +3885,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -3745,9 +3900,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -3755,15 +3910,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -3773,9 +3928,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -3788,32 +3943,32 @@ dependencies = [ "futures-io", "memchr", "parking", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", "waker-fn", ] [[package]] name = "futures-lite" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.0.1", + "fastrand 2.0.2", "futures-core", "futures-io", "parking", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", ] [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] @@ -3829,27 +3984,27 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -3858,7 +4013,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", "pin-utils", "slab", ] @@ -3915,22 +4070,32 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "libc", "wasi 0.11.0+wasi-snapshot-preview1", ] +[[package]] +name = "getrandom_or_panic" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9" +dependencies = [ + "rand", + "rand_core 0.6.4", +] + [[package]] name = "ghash" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" dependencies = [ - "opaque-debug 0.3.0", + "opaque-debug 0.3.1", "polyval", ] @@ -3958,34 +4123,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] -name = "globset" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" -dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", -] - -[[package]] -name = "group" -version = "0.13.0" +name = "group" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", "rand_core 0.6.4", - "subtle", + "subtle 2.5.0", ] [[package]] name = "h2" -version = "0.3.22" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -3993,7 +4145,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.1.0", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -4002,9 +4154,9 @@ dependencies = [ [[package]] name = "half" -version = "1.8.2" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" [[package]] name = "handlebars" @@ -4020,12 +4172,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "hash-db" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23bd4e7b5eda0d0f3a307e8b381fdc8ba9000f26fbe912250c0a4cc3956364a" - [[package]] name = "hash-db" version = "0.16.0" @@ -4047,7 +4193,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.7", + "ahash 0.7.8", ] [[package]] @@ -4056,7 +4202,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.11", ] [[package]] @@ -4065,11 +4211,20 @@ version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.11", "allocator-api2", "serde", ] +[[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown 0.14.3", +] + [[package]] name = "heck" version = "0.4.1" @@ -4077,19 +4232,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] -name = "hermit-abi" -version = "0.1.19" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -4111,9 +4263,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "hkdf" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ "hmac 0.12.1", ] @@ -4134,7 +4286,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" dependencies = [ - "crypto-mac 0.11.1", + "crypto-mac 0.11.0", "digest 0.9.0", ] @@ -4160,11 +4312,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -4180,9 +4332,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -4191,13 +4343,13 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", ] [[package]] @@ -4227,7 +4379,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hydra-dx-build-script-utils" version = "1.0.3" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" dependencies = [ "cargo-lock", "platforms 1.1.0", @@ -4235,8 +4387,8 @@ dependencies = [ [[package]] name = "hydra-dx-math" -version = "7.6.4" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" +version = "8.0.1" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" dependencies = [ "fixed", "num-traits", @@ -4245,13 +4397,13 @@ dependencies = [ "scale-info", "serde", "sp-arithmetic", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "hydradx-adapters" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" +version = "1.3.0" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" dependencies = [ "cumulus-pallet-parachain-system", "cumulus-primitives-core", @@ -4265,17 +4417,21 @@ dependencies = [ "orml-utilities", "orml-vesting", "orml-xcm-support", + "pallet-asset-registry 3.2.1", "pallet-balances", + "pallet-bonds", "pallet-circuit-breaker", "pallet-currencies", "pallet-dynamic-fees", "pallet-ema-oracle", + "pallet-lbp", "pallet-liquidity-mining", "pallet-omnipool", "pallet-omnipool-liquidity-mining", + "pallet-referrals", "pallet-route-executor", "pallet-stableswap", - "pallet-staking 2.1.1", + "pallet-staking 3.0.0", "pallet-transaction-multi-payment", "pallet-uniques", "parity-scale-codec", @@ -4286,7 +4442,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -4294,8 +4450,8 @@ dependencies = [ [[package]] name = "hydradx-traits" -version = "2.8.2" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" +version = "3.2.0" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -4303,14 +4459,14 @@ dependencies = [ "scale-info", "serde", "sp-arithmetic", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -4322,8 +4478,8 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project-lite 0.2.13", - "socket2 0.4.10", + "pin-project-lite 0.2.14", + "socket2 0.5.6", "tokio", "tower-service", "tracing", @@ -4340,18 +4496,17 @@ dependencies = [ "http", "hyper", "log", - "rustls 0.21.10", + "rustls 0.21.11", "rustls-native-certs", "tokio", "tokio-rustls", - "webpki-roots 0.25.3", ] [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -4407,7 +4562,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6b0422c86d7ce0e97169cc42e04ae643caf278874a7a3c87b8150a220dc7e1e" dependencies = [ - "async-io 2.2.1", + "async-io 2.3.2", "core-foundation", "fnv", "futures", @@ -4490,9 +4645,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -4506,9 +4661,9 @@ checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" [[package]] name = "indicatif" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" dependencies = [ "console", "instant", @@ -4556,7 +4711,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi", "libc", "windows-sys 0.48.0", ] @@ -4573,7 +4728,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.5", + "socket2 0.5.6", "widestring", "windows-sys 0.48.0", "winreg", @@ -4587,13 +4742,13 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "hermit-abi 0.3.3", - "rustix 0.38.27", - "windows-sys 0.48.0", + "hermit-abi", + "libc", + "windows-sys 0.52.0", ] [[package]] @@ -4623,35 +4778,44 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] name = "jsonrpsee" -version = "0.16.3" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "367a292944c07385839818bb71c8d76611138e2dedb0677d035b8da21d29c78b" +checksum = "affdc52f7596ccb2d7645231fc6163bb314630c989b64998f3699a28b4d5d4dc" dependencies = [ "jsonrpsee-core", "jsonrpsee-http-client", @@ -4659,19 +4823,19 @@ dependencies = [ "jsonrpsee-server", "jsonrpsee-types", "jsonrpsee-ws-client", + "tokio", "tracing", ] [[package]] name = "jsonrpsee-client-transport" -version = "0.16.3" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8b3815d9f5d5de348e5f162b316dc9cdf4548305ebb15b4eb9328e66cf27d7a" +checksum = "b5b005c793122d03217da09af68ba9383363caa950b90d3436106df8cabce935" dependencies = [ "futures-util", "http", "jsonrpsee-core", - "jsonrpsee-types", "pin-project", "rustls-native-certs", "soketto", @@ -4680,28 +4844,25 @@ dependencies = [ "tokio-rustls", "tokio-util", "tracing", - "webpki-roots 0.25.3", + "url", ] [[package]] name = "jsonrpsee-core" -version = "0.16.3" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5dde66c53d6dcdc8caea1874a45632ec0fcf5b437789f1e45766a1512ce803" +checksum = "da2327ba8df2fdbd5e897e2b5ed25ce7f299d345b9736b6828814c3dbd1fd47b" dependencies = [ "anyhow", - "arrayvec 0.7.4", "async-lock 2.8.0", "async-trait", "beef", - "futures-channel", "futures-timer", "futures-util", - "globset", "hyper", "jsonrpsee-types", "parking_lot 0.12.1", - "rand 0.8.5", + "rand", "rustc-hash", "serde", "serde_json", @@ -4713,30 +4874,31 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.16.3" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e5f9fabdd5d79344728521bb65e3106b49ec405a78b66fbff073b72b389fa43" +checksum = "5f80c17f62c7653ce767e3d7288b793dfec920f97067ceb189ebdd3570f2bc20" dependencies = [ "async-trait", "hyper", "hyper-rustls", "jsonrpsee-core", "jsonrpsee-types", - "rustc-hash", "serde", "serde_json", "thiserror", "tokio", + "tower", "tracing", + "url", ] [[package]] name = "jsonrpsee-proc-macros" -version = "0.16.3" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44e8ab85614a08792b9bff6c8feee23be78c98d0182d4c622c05256ab553892a" +checksum = "29110019693a4fa2dbda04876499d098fa16d70eba06b1e6e2b3f1b251419515" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro-crate 1.3.1", "proc-macro2", "quote", @@ -4745,19 +4907,20 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.16.3" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4d945a6008c9b03db3354fb3c83ee02d2faa9f2e755ec1dfb69c3551b8f4ba" +checksum = "82c39a00449c9ef3f50b84fc00fc4acba20ef8f559f07902244abf4c15c5ab9c" dependencies = [ - "futures-channel", "futures-util", "http", "hyper", "jsonrpsee-core", "jsonrpsee-types", + "route-recognizer", "serde", "serde_json", "soketto", + "thiserror", "tokio", "tokio-stream", "tokio-util", @@ -4767,9 +4930,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.16.3" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245ba8e5aa633dd1c1e4fae72bce06e71f42d34c14a2767c6b4d173b57bee5e5" +checksum = "5be0be325642e850ed0bdff426674d2e66b2b7117c9be23a7caef68a2902b7d9" dependencies = [ "anyhow", "beef", @@ -4781,21 +4944,22 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.16.3" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e1b3975ed5d73f456478681a417128597acd6a2487855fdb7b4a3d4d195bf5e" +checksum = "bca9cb3933ccae417eb6b08c3448eb1cb46e39834e5b503e395e5e5bd08546c0" dependencies = [ "http", "jsonrpsee-client-transport", "jsonrpsee-core", "jsonrpsee-types", + "url", ] [[package]] name = "k256" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f01b677d82ef7a676aa37e099defd83a28e15687112cafdd112d60236b6115b" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" dependencies = [ "cfg-if", "ecdsa", @@ -4806,26 +4970,18 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" dependencies = [ "cpufeatures", ] [[package]] -name = "kusama-runtime-constants" +name = "keystream" version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" -dependencies = [ - "frame-support", - "polkadot-primitives", - "polkadot-runtime-common", - "smallvec", - "sp-core", - "sp-runtime", - "sp-weights", -] +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c33070833c9ee02266356de0c43f723152bd38bd96ddf52c82b3af10c9138b28" [[package]] name = "kvdb" @@ -4862,9 +5018,9 @@ dependencies = [ [[package]] name = "landlock" -version = "0.2.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520baa32708c4e957d2fc3a186bc5bd8d26637c33137f399ddfc202adb240068" +checksum = "9baa9eeb6e315942429397e617a190f4fdc696ef1ee0342939d641029cbb4ea7" dependencies = [ "enumflags2", "libc", @@ -4885,18 +5041,18 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "winapi", + "windows-targets 0.52.5", ] [[package]] @@ -4914,7 +5070,7 @@ dependencies = [ "bytes", "futures", "futures-timer", - "getrandom 0.2.11", + "getrandom 0.2.14", "instant", "libp2p-allow-block-list", "libp2p-connection-limits", @@ -4976,13 +5132,13 @@ dependencies = [ "libp2p-identity", "log", "multiaddr", - "multihash", + "multihash 0.17.0", "multistream-select", "once_cell", "parking_lot 0.12.1", "pin-project", "quick-protobuf", - "rand 0.8.5", + "rand", "rw-stream-sink", "smallvec", "thiserror", @@ -5036,9 +5192,9 @@ dependencies = [ "ed25519-dalek", "log", "multiaddr", - "multihash", + "multihash 0.17.0", "quick-protobuf", - "rand 0.8.5", + "rand", "sha2 0.10.8", "thiserror", "zeroize", @@ -5063,7 +5219,7 @@ dependencies = [ "libp2p-swarm", "log", "quick-protobuf", - "rand 0.8.5", + "rand", "sha2 0.10.8", "smallvec", "thiserror", @@ -5085,7 +5241,7 @@ dependencies = [ "libp2p-identity", "libp2p-swarm", "log", - "rand 0.8.5", + "rand", "smallvec", "socket2 0.4.10", "tokio", @@ -5121,7 +5277,7 @@ dependencies = [ "log", "once_cell", "quick-protobuf", - "rand 0.8.5", + "rand", "sha2 0.10.8", "snow", "static_assertions", @@ -5143,7 +5299,7 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "rand 0.8.5", + "rand", "void", ] @@ -5163,7 +5319,7 @@ dependencies = [ "log", "parking_lot 0.12.1", "quinn-proto", - "rand 0.8.5", + "rand", "rustls 0.20.9", "thiserror", "tokio", @@ -5181,7 +5337,7 @@ dependencies = [ "libp2p-core", "libp2p-identity", "libp2p-swarm", - "rand 0.8.5", + "rand", "smallvec", ] @@ -5200,7 +5356,7 @@ dependencies = [ "libp2p-identity", "libp2p-swarm-derive", "log", - "rand 0.8.5", + "rand", "smallvec", "tokio", "void", @@ -5212,7 +5368,7 @@ version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fba456131824ab6acd4c7bf61e9c0f0a3014b5fc9868ccb8e10d344594cdc4f" dependencies = [ - "heck", + "heck 0.4.1", "quote", "syn 1.0.109", ] @@ -5282,7 +5438,7 @@ dependencies = [ "rw-stream-sink", "soketto", "url", - "webpki-roots 0.22.6", + "webpki-roots", ] [[package]] @@ -5300,13 +5456,12 @@ dependencies = [ [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "libc", - "redox_syscall 0.4.1", ] [[package]] @@ -5337,7 +5492,7 @@ dependencies = [ "libsecp256k1-core", "libsecp256k1-gen-ecmult", "libsecp256k1-gen-genmult", - "rand 0.8.5", + "rand", "serde", "sha2 0.9.9", "typenum", @@ -5351,7 +5506,7 @@ checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451" dependencies = [ "crunchy", "digest 0.9.0", - "subtle", + "subtle 2.5.0", ] [[package]] @@ -5374,9 +5529,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.12" +version = "1.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" +checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" dependencies = [ "cc", "pkg-config", @@ -5430,9 +5585,21 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "lioness" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "4ae926706ba42c425c9457121178330d75e273df2e82e28b758faf3de3a9acb9" +dependencies = [ + "arrayref", + "blake2 0.8.1", + "chacha", + "keystream", +] [[package]] name = "lock_api" @@ -5446,9 +5613,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "lru" @@ -5505,50 +5672,50 @@ dependencies = [ [[package]] name = "macro_magic" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aee866bfee30d2d7e83835a4574aad5b45adba4cc807f2a3bbba974e5d4383c9" +checksum = "e03844fc635e92f3a0067e25fa4bf3e3dbf3f2927bf3aa01bb7bc8f1c428949d" dependencies = [ "macro_magic_core", "macro_magic_macros", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] name = "macro_magic_core" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e766a20fd9c72bab3e1e64ed63f36bd08410e75803813df210d1ce297d7ad00" +checksum = "468155613a44cfd825f1fb0ffa532b018253920d404e6fca1e8d43155198a46d" dependencies = [ "const-random", - "derive-syn-parse", + "derive-syn-parse 0.1.5", "macro_magic_core_macros", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] name = "macro_magic_core_macros" -version = "0.4.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d710e1214dffbab3b5dacb21475dde7d6ed84c69ff722b3a47a782668d44fbac" +checksum = "9ea73aa640dc01d62a590d48c0c3521ed739d53b27f919b25c3551e233481654" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] name = "macro_magic_macros" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fb85ec1620619edf2984a7693497d4ec88a9665d8b87e942856884c92dbf2a" +checksum = "ef9d79ae96aaba821963320eb2b6e34d17df1e5a83d8a1985c29cc5be59577b3" dependencies = [ "macro_magic_core", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] @@ -5572,6 +5739,15 @@ dependencies = [ "regex-automata 0.1.10", ] +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + [[package]] name = "matches" version = "0.1.10" @@ -5590,9 +5766,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memfd" @@ -5600,7 +5776,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ - "rustix 0.38.27", + "rustix 0.38.34", ] [[package]] @@ -5613,19 +5789,19 @@ dependencies = [ ] [[package]] -name = "memoffset" -version = "0.8.0" +name = "memmap2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ - "autocfg", + "libc", ] [[package]] name = "memoffset" -version = "0.9.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ "autocfg", ] @@ -5636,19 +5812,7 @@ version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "808b50db46293432a45e63bc15ea51e0ab4c0a1647b8eb114e31a3e698dd6fbe" dependencies = [ - "hash-db 0.16.0", -] - -[[package]] -name = "merlin" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e261cf0f8b3c42ded9f7d2bb59dea03aa52bc8a1cbc7482f9fc3fd1229d3b42" -dependencies = [ - "byteorder", - "keccak", - "rand_core 0.5.1", - "zeroize", + "hash-db", ] [[package]] @@ -5670,7 +5834,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69672161530e8aeca1d1400fbf3f1a1747ff60ea604265a4e906c2442df20532" dependencies = [ "futures", - "rand 0.8.5", + "rand", "thrift", ] @@ -5682,28 +5846,53 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.48.0", ] +[[package]] +name = "mixnet" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daa3eb39495d8e2e2947a1d862852c90cc6a4a8845f8b41c8829cb9fcc047f4a" +dependencies = [ + "arrayref", + "arrayvec 0.7.4", + "bitflags 1.3.2", + "blake2 0.10.6", + "c2-chacha", + "curve25519-dalek 4.1.2", + "either", + "hashlink", + "lioness", + "log", + "parking_lot 0.12.1", + "rand", + "rand_chacha 0.3.1", + "rand_distr", + "subtle 2.5.0", + "thiserror", + "zeroize", +] + [[package]] name = "mmr-gadget" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "29.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "futures", "log", @@ -5721,10 +5910,9 @@ dependencies = [ [[package]] name = "mmr-rpc" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "anyhow", "jsonrpsee", "parity-scale-codec", "serde", @@ -5773,7 +5961,7 @@ dependencies = [ "data-encoding", "log", "multibase", - "multihash", + "multihash 0.17.0", "percent-encoding", "serde", "static_assertions", @@ -5803,12 +5991,55 @@ dependencies = [ "blake3", "core2", "digest 0.10.7", - "multihash-derive", + "multihash-derive 0.8.0", "sha2 0.10.8", "sha3", "unsigned-varint", ] +[[package]] +name = "multihash" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815" +dependencies = [ + "core2", + "digest 0.10.7", + "multihash-derive 0.8.0", + "sha2 0.10.8", + "unsigned-varint", +] + +[[package]] +name = "multihash" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "076d548d76a0e2a0d4ab471d0b1c36c577786dfc4471242035d97a12a735c492" +dependencies = [ + "core2", + "unsigned-varint", +] + +[[package]] +name = "multihash-codetable" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6d815ecb3c8238d00647f8630ede7060a642c9f704761cd6082cb4028af6935" +dependencies = [ + "blake2b_simd", + "blake2s_simd", + "blake3", + "core2", + "digest 0.10.7", + "multihash-derive 0.9.0", + "ripemd", + "serde", + "sha1", + "sha2 0.10.8", + "sha3", + "strobe-rs", +] + [[package]] name = "multihash-derive" version = "0.8.0" @@ -5823,6 +6054,31 @@ dependencies = [ "synstructure", ] +[[package]] +name = "multihash-derive" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "890e72cb7396cb99ed98c1246a97b243cc16394470d94e0bc8b0c2c11d84290e" +dependencies = [ + "core2", + "multihash 0.19.1", + "multihash-derive-impl", +] + +[[package]] +name = "multihash-derive-impl" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38685e08adb338659871ecfc6ee47ba9b22dcc8abcf6975d379cc49145c3040" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", + "synstructure", +] + [[package]] name = "multimap" version = "0.8.3" @@ -5845,9 +6101,9 @@ dependencies = [ [[package]] name = "nalgebra" -version = "0.32.3" +version = "0.32.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa" +checksum = "3ea4908d4f23254adda3daa60ffef0f1ac7b8c3e9a864cf3cc154b251908a2ef" dependencies = [ "approx", "matrixmultiply", @@ -5872,11 +6128,11 @@ dependencies = [ [[package]] name = "names" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d66043b25d4a6cccb23619d10c19c25304b355a7dccd4a8e11423dd2382146" +checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc" dependencies = [ - "rand 0.8.5", + "rand", ] [[package]] @@ -5940,9 +6196,9 @@ dependencies = [ [[package]] name = "netlink-sys" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" +checksum = "416060d346fbaf1f23f9512963e3e878f1a78e707cb699ba9215761754244307" dependencies = [ "bytes", "futures", @@ -5962,6 +6218,17 @@ dependencies = [ "libc", ] +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "libc", +] + [[package]] name = "no-std-net" version = "0.6.0" @@ -5996,6 +6263,16 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num-bigint" version = "0.4.4" @@ -6009,13 +6286,19 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-format" version = "0.4.4" @@ -6028,11 +6311,10 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] @@ -6050,11 +6332,12 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -6063,10 +6346,31 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi", "libc", ] +[[package]] +name = "num_enum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.60", +] + [[package]] name = "number_prefix" version = "0.4.0" @@ -6087,9 +6391,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -6117,9 +6421,9 @@ checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl-probe" @@ -6128,10 +6432,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] -name = "orchestra" -version = "0.0.5" +name = "option-ext" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "227585216d05ba65c7ab0a0450a3cf2cbd81a98862a54c4df8e14d5ac6adb015" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "orchestra" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2356622ffdfe72362a45a1e5e87bb113b8327e596e39b91f11f0ef4395c8da79" dependencies = [ "async-trait", "dyn-clonable", @@ -6146,12 +6456,13 @@ dependencies = [ [[package]] name = "orchestra-proc-macro" -version = "0.0.5" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2871aadd82a2c216ee68a69837a526dfe788ecbe74c4c5038a6acdbff6653066" +checksum = "eedb646674596266dc9bb2b5c7eea7c36b32ecc7777eba0d510196972d72c4fd" dependencies = [ - "expander 0.0.6", - "itertools 0.10.5", + "expander 2.1.0", + "indexmap 2.2.6", + "itertools 0.11.0", "petgraph", "proc-macro-crate 1.3.1", "proc-macro2", @@ -6170,8 +6481,8 @@ dependencies = [ [[package]] name = "orml-benchmarking" -version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=b3694e631df7f1ca16b1973122937753fcdee9d4#b3694e631df7f1ca16b1973122937753fcdee9d4" +version = "0.8.0" +source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#c1fbd5a34168830e3614a1cd4724135e7a3c1236" dependencies = [ "frame-benchmarking", "frame-support", @@ -6183,15 +6494,15 @@ dependencies = [ "sp-api", "sp-io", "sp-runtime", - "sp-runtime-interface 17.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", - "sp-std", - "sp-storage", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "orml-tokens" -version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=b3694e631df7f1ca16b1973122937753fcdee9d4#b3694e631df7f1ca16b1973122937753fcdee9d4" +version = "0.8.0" +source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#c1fbd5a34168830e3614a1cd4724135e7a3c1236" dependencies = [ "frame-support", "frame-system", @@ -6202,13 +6513,13 @@ dependencies = [ "serde", "sp-arithmetic", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "orml-traits" -version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=b3694e631df7f1ca16b1973122937753fcdee9d4#b3694e631df7f1ca16b1973122937753fcdee9d4" +version = "0.8.0" +source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#c1fbd5a34168830e3614a1cd4724135e7a3c1236" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -6221,14 +6532,14 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "staging-xcm", ] [[package]] name = "orml-unknown-tokens" -version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=b3694e631df7f1ca16b1973122937753fcdee9d4#b3694e631df7f1ca16b1973122937753fcdee9d4" +version = "0.8.0" +source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#c1fbd5a34168830e3614a1cd4724135e7a3c1236" dependencies = [ "frame-support", "frame-system", @@ -6236,14 +6547,14 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "staging-xcm", ] [[package]] name = "orml-utilities" -version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=b3694e631df7f1ca16b1973122937753fcdee9d4#b3694e631df7f1ca16b1973122937753fcdee9d4" +version = "0.8.0" +source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#c1fbd5a34168830e3614a1cd4724135e7a3c1236" dependencies = [ "frame-support", "parity-scale-codec", @@ -6252,13 +6563,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "orml-vesting" -version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=b3694e631df7f1ca16b1973122937753fcdee9d4#b3694e631df7f1ca16b1973122937753fcdee9d4" +version = "0.8.0" +source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#c1fbd5a34168830e3614a1cd4724135e7a3c1236" dependencies = [ "frame-support", "frame-system", @@ -6267,43 +6578,42 @@ dependencies = [ "serde", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "orml-xcm" -version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=b3694e631df7f1ca16b1973122937753fcdee9d4#b3694e631df7f1ca16b1973122937753fcdee9d4" +version = "0.8.0" +source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#c1fbd5a34168830e3614a1cd4724135e7a3c1236" dependencies = [ "frame-support", "frame-system", "pallet-xcm", "parity-scale-codec", "scale-info", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "staging-xcm", ] [[package]] name = "orml-xcm-support" -version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=b3694e631df7f1ca16b1973122937753fcdee9d4#b3694e631df7f1ca16b1973122937753fcdee9d4" +version = "0.8.0" +source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#c1fbd5a34168830e3614a1cd4724135e7a3c1236" dependencies = [ "frame-support", "orml-traits", "parity-scale-codec", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "staging-xcm", "staging-xcm-executor", ] [[package]] name = "orml-xtokens" -version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library?rev=b3694e631df7f1ca16b1973122937753fcdee9d4#b3694e631df7f1ca16b1973122937753fcdee9d4" +version = "0.8.0" +source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#c1fbd5a34168830e3614a1cd4724135e7a3c1236" dependencies = [ - "cumulus-primitives-core", "frame-support", "frame-system", "log", @@ -6315,15 +6625,79 @@ dependencies = [ "serde", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "staging-xcm", "staging-xcm-executor", ] +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "pallet-asset-conversion" +version = "10.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", +] + +[[package]] +name = "pallet-asset-rate" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-runtime", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", +] + [[package]] name = "pallet-asset-registry" version = "2.3.3" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "hydradx-traits", + "log", + "orml-traits", + "parity-scale-codec", + "primitive-types", + "scale-info", + "serde", + "sp-api", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "staging-xcm", + "substrate-wasm-builder", + "test-utils", +] + +[[package]] +name = "pallet-asset-registry" +version = "3.2.1" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -6339,14 +6713,14 @@ dependencies = [ "sp-arithmetic", "sp-core", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "substrate-wasm-builder", ] [[package]] name = "pallet-asset-tx-payment" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -6358,13 +6732,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-assets" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "29.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -6374,13 +6748,13 @@ dependencies = [ "scale-info", "sp-core", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-aura" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "27.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-support", "frame-system", @@ -6391,13 +6765,13 @@ dependencies = [ "sp-application-crypto", "sp-consensus-aura", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-authority-discovery" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-support", "frame-system", @@ -6407,13 +6781,13 @@ dependencies = [ "sp-application-crypto", "sp-authority-discovery", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-authorship" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-support", "frame-system", @@ -6421,13 +6795,13 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-babe" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -6445,13 +6819,13 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-bags-list" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "27.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "aquamarine", "docify", @@ -6466,15 +6840,16 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", - "sp-tracing 10.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-balances" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -6482,13 +6857,13 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-beefy" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-support", "frame-system", @@ -6502,15 +6877,15 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-beefy-mmr" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", "binary-merkle-tree", "frame-support", "frame-system", @@ -6527,13 +6902,35 @@ dependencies = [ "sp-io", "sp-runtime", "sp-state-machine", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", +] + +[[package]] +name = "pallet-bonds" +version = "2.2.1" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "hydradx-traits", + "log", + "orml-traits", + "pallet-timestamp", + "parity-scale-codec", + "primitive-types", + "primitives 6.0.2", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-bounties" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "27.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -6545,13 +6942,30 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", +] + +[[package]] +name = "pallet-broker" +version = "0.6.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" +dependencies = [ + "bitvec", + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-arithmetic", + "sp-core", + "sp-runtime", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-child-bounties" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "27.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -6564,13 +6978,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-circuit-breaker" -version = "1.1.18" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" +version = "1.1.21" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" dependencies = [ "frame-support", "frame-system", @@ -6580,13 +6994,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-collator-rewards" version = "1.0.6" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" dependencies = [ "frame-support", "frame-system", @@ -6598,14 +7012,14 @@ dependencies = [ "sp-arithmetic", "sp-runtime", "sp-staking", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "substrate-wasm-builder", ] [[package]] name = "pallet-collator-selection" -version = "3.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "9.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -6614,17 +7028,17 @@ dependencies = [ "pallet-authorship", "pallet-session", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "sp-runtime", "sp-staking", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-collective" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -6635,13 +7049,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-conviction-voting" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "assert_matches", "frame-benchmarking", @@ -6652,13 +7066,13 @@ dependencies = [ "serde", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-currencies" -version = "2.0.0" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" +version = "2.1.0" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" dependencies = [ "frame-support", "frame-system", @@ -6669,47 +7083,47 @@ dependencies = [ "serde", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-democracy" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "4.1.0" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" dependencies = [ - "frame-benchmarking", "frame-support", "frame-system", "log", "parity-scale-codec", "scale-info", - "serde", "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-democracy" -version = "4.1.0" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", "log", "parity-scale-codec", "scale-info", + "serde", "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-duster" version = "3.2.4" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -6721,14 +7135,14 @@ dependencies = [ "scale-info", "serde", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "substrate-wasm-builder", ] [[package]] name = "pallet-dynamic-fees" version = "1.0.2" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" dependencies = [ "frame-support", "frame-system", @@ -6738,13 +7152,13 @@ dependencies = [ "scale-info", "sp-core", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-election-provider-multi-phase" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "27.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6753,21 +7167,21 @@ dependencies = [ "log", "pallet-election-provider-support-benchmarking", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "sp-arithmetic", "sp-core", "sp-io", "sp-npos-elections", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "strum 0.24.1", ] [[package]] name = "pallet-election-provider-support-benchmarking" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "27.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6775,13 +7189,13 @@ dependencies = [ "parity-scale-codec", "sp-npos-elections", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-elections-phragmen" -version = "5.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "29.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -6794,13 +7208,13 @@ dependencies = [ "sp-npos-elections", "sp-runtime", "sp-staking", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-ema-oracle" -version = "1.1.3" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" +version = "1.3.0" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -6814,13 +7228,13 @@ dependencies = [ "sp-arithmetic", "sp-core", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-evm" version = "6.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.1.0#bf5885a982041cc744ecbb62a2afc13d56d464dc" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#2c05f9d4d951efacf504d610286da6ac908b1302" dependencies = [ "environmental", "evm", @@ -6829,6 +7243,8 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "hash-db", + "hex", "hex-literal 0.4.1", "impl-trait-for-tuples", "log", @@ -6838,13 +7254,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-fast-unstake" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "27.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "docify", "frame-benchmarking", @@ -6857,13 +7273,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-grandpa" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -6880,29 +7296,30 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-identity" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "enumflags2", "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-im-online" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "27.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -6916,13 +7333,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-indices" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -6933,13 +7350,13 @@ dependencies = [ "sp-io", "sp-keyring", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-lbp" -version = "4.7.3" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" +version = "4.7.4" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -6954,14 +7371,14 @@ dependencies = [ "serde", "sp-core", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "substrate-wasm-builder", ] [[package]] name = "pallet-liquidity-mining" -version = "4.2.5" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" +version = "4.3.1" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" dependencies = [ "frame-support", "frame-system", @@ -6972,12 +7389,12 @@ dependencies = [ "scale-info", "sp-arithmetic", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-marketplace" -version = "5.0.17" +version = "5.0.18" dependencies = [ "frame-benchmarking", "frame-support", @@ -6987,20 +7404,20 @@ dependencies = [ "pallet-uniques", "parity-scale-codec", "pretty_assertions", - "primitives 6.6.0", + "primitives 6.6.1", "scale-info", "serde", "sp-arithmetic", "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-membership" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -7011,14 +7428,15 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-message-queue" -version = "7.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "31.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ + "environmental", "frame-benchmarking", "frame-support", "frame-system", @@ -7029,14 +7447,14 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-weights", ] [[package]] name = "pallet-mmr" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "27.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -7048,13 +7466,13 @@ dependencies = [ "sp-io", "sp-mmr-primitives", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-multisig" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -7064,13 +7482,13 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-nft" version = "7.1.2" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -7083,13 +7501,13 @@ dependencies = [ "serde", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-nis" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -7099,13 +7517,13 @@ dependencies = [ "sp-arithmetic", "sp-core", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-nomination-pools" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "25.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-support", "frame-system", @@ -7117,14 +7535,14 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std", - "sp-tracing 10.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-nomination-pools-benchmarking" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7132,30 +7550,30 @@ dependencies = [ "frame-system", "pallet-bags-list", "pallet-nomination-pools", - "pallet-staking 4.0.0-dev", + "pallet-staking 28.0.0", "parity-scale-codec", "scale-info", "sp-runtime", - "sp-runtime-interface 17.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-staking", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-nomination-pools-runtime-api" -version = "1.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "pallet-nomination-pools", "parity-scale-codec", "sp-api", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-offences" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "27.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-support", "frame-system", @@ -7166,13 +7584,13 @@ dependencies = [ "serde", "sp-runtime", "sp-staking", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-offences-benchmarking" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7185,20 +7603,21 @@ dependencies = [ "pallet-im-online", "pallet-offences", "pallet-session", - "pallet-staking 4.0.0-dev", + "pallet-staking 28.0.0", "parity-scale-codec", "scale-info", "sp-runtime", "sp-staking", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-omnipool" -version = "4.0.2" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" +version = "4.1.5" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" dependencies = [ "bitflags 1.3.2", + "frame-benchmarking", "frame-support", "frame-system", "hydra-dx-math", @@ -7206,25 +7625,28 @@ dependencies = [ "impl-trait-for-tuples", "log", "orml-traits", + "pallet-balances", "parity-scale-codec", "primitive-types", "scale-info", + "sp-core", + "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-omnipool-liquidity-mining" -version = "2.0.13" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" +version = "2.1.4" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" dependencies = [ - "bitflags 1.3.2", "frame-support", "frame-system", "hydra-dx-math", "hydradx-traits", "log", "orml-traits", + "pallet-balances", "pallet-ema-oracle", "pallet-liquidity-mining", "pallet-omnipool", @@ -7232,14 +7654,16 @@ dependencies = [ "primitive-types", "primitives 6.0.2", "scale-info", + "sp-core", + "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-preimage" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -7250,13 +7674,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-proxy" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -7265,17 +7689,18 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-ranked-collective" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "impl-trait-for-tuples", "log", "parity-scale-codec", "scale-info", @@ -7283,13 +7708,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-recovery" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -7298,13 +7723,13 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-referenda" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "assert_matches", "frame-benchmarking", @@ -7317,13 +7742,31 @@ dependencies = [ "sp-arithmetic", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", +] + +[[package]] +name = "pallet-referrals" +version = "1.2.3" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" +dependencies = [ + "frame-support", + "frame-system", + "hex-literal 0.3.4", + "hydra-dx-math", + "hydradx-traits", + "orml-traits", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-runtime", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-relaychain-info" version = "0.3.4" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" dependencies = [ "cumulus-pallet-parachain-system", "cumulus-primitives-core", @@ -7332,13 +7775,28 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", +] + +[[package]] +name = "pallet-root-testing" +version = "4.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" +dependencies = [ + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-route-executor" -version = "1.3.1" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" +version = "2.2.1" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" dependencies = [ "frame-support", "frame-system", @@ -7349,13 +7807,13 @@ dependencies = [ "scale-info", "sp-core", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-scheduler" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "29.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "docify", "frame-benchmarking", @@ -7366,14 +7824,14 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-weights", ] [[package]] name = "pallet-session" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-support", "frame-system", @@ -7388,31 +7846,31 @@ dependencies = [ "sp-session", "sp-staking", "sp-state-machine", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-trie", ] [[package]] name = "pallet-session-benchmarking" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "pallet-session", - "pallet-staking 4.0.0-dev", + "pallet-staking 28.0.0", "parity-scale-codec", - "rand 0.8.5", + "rand", "sp-runtime", "sp-session", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-society" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -7424,13 +7882,13 @@ dependencies = [ "sp-arithmetic", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-stableswap" -version = "3.4.2" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" +version = "3.5.1" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" dependencies = [ "bitflags 1.3.2", "frame-support", @@ -7443,13 +7901,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-staking" -version = "2.1.1" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" +version = "3.0.0" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" dependencies = [ "frame-support", "frame-system", @@ -7462,13 +7920,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-staking" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7485,24 +7943,24 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-staking-reward-curve" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "11.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] name = "pallet-staking-reward-fn" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "19.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "log", "sp-arithmetic", @@ -7510,17 +7968,18 @@ dependencies = [ [[package]] name = "pallet-staking-runtime-api" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "14.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "parity-scale-codec", "sp-api", + "sp-staking", ] [[package]] name = "pallet-state-trie-migration" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "29.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -7531,14 +7990,15 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-sudo" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -7546,14 +8006,15 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-timestamp" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "27.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -7563,15 +8024,15 @@ dependencies = [ "sp-inherents", "sp-io", "sp-runtime", - "sp-std", - "sp-storage", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-timestamp", ] [[package]] name = "pallet-tips" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "27.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -7584,13 +8045,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-transaction-multi-payment" -version = "9.1.1" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" +version = "9.5.0" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" dependencies = [ "frame-support", "frame-system", @@ -7599,19 +8060,20 @@ dependencies = [ "orml-traits", "pallet-evm", "pallet-transaction-payment", + "pallet-utility", "parity-scale-codec", "primitives 6.0.2", "scale-info", "sp-api", "sp-core", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-transaction-pause" version = "1.0.1" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -7620,13 +8082,13 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-transaction-payment" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-support", "frame-system", @@ -7636,13 +8098,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-transaction-payment-rpc" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "30.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -7657,8 +8119,8 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -7669,9 +8131,10 @@ dependencies = [ [[package]] name = "pallet-treasury" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "27.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -7680,14 +8143,15 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", + "sp-core", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-uniques" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -7696,13 +8160,13 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-utility" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -7712,13 +8176,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-vesting" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -7727,13 +8191,13 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-whitelist" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "27.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -7742,34 +8206,36 @@ dependencies = [ "scale-info", "sp-api", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-xcm" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "bounded-collections", "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-balances", "parity-scale-codec", "scale-info", "serde", "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "staging-xcm", + "staging-xcm-builder", "staging-xcm-executor", ] [[package]] name = "pallet-xcm-benchmarks" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-benchmarking", "frame-support", @@ -7779,40 +8245,16 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", ] -[[package]] -name = "pallet-xcm-rate-limiter" -version = "0.1.3" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" -dependencies = [ - "cumulus-pallet-xcmp-queue", - "frame-benchmarking", - "frame-support", - "frame-system", - "hydra-dx-math", - "hydradx-traits", - "orml-traits", - "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain-primitives", - "scale-info", - "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "staging-xcm", -] - [[package]] name = "pallet-xyk" -version = "6.3.4" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" +version = "6.4.1" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" dependencies = [ "frame-benchmarking", "frame-support", @@ -7828,13 +8270,13 @@ dependencies = [ "serde", "sp-core", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "substrate-wasm-builder", ] [[package]] name = "pallet-xyk-liquidity-mining" -version = "1.1.10" +version = "1.1.11" dependencies = [ "frame-support", "frame-system", @@ -7849,18 +8291,18 @@ dependencies = [ "pallet-xyk", "parity-scale-codec", "pretty_assertions", - "primitives 6.6.0", + "primitives 6.6.1", "scale-info", "sp-arithmetic", "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "pallet-xyk-liquidity-mining-benchmarking" -version = "1.0.16" +version = "1.0.17" dependencies = [ "frame-benchmarking", "frame-support", @@ -7868,7 +8310,7 @@ dependencies = [ "hydradx-traits", "orml-tokens", "orml-traits", - "pallet-asset-registry", + "pallet-asset-registry 2.3.3", "pallet-balances", "pallet-duster", "pallet-liquidity-mining", @@ -7877,83 +8319,65 @@ dependencies = [ "pallet-xyk", "pallet-xyk-liquidity-mining", "parity-scale-codec", - "primitives 6.6.0", + "primitives 6.6.1", "scale-info", "sp-arithmetic", "sp-core", "sp-io", "sp-runtime", - "sp-std", -] - -[[package]] -name = "parachain-info" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" -dependencies = [ - "cumulus-primitives-core", - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "parachains-common" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "cumulus-primitives-core", "cumulus-primitives-utility", "frame-support", "frame-system", - "kusama-runtime-constants", "log", - "num-traits", "pallet-asset-tx-payment", "pallet-assets", "pallet-authorship", "pallet-balances", "pallet-collator-selection", + "pallet-message-queue", + "pallet-xcm", "parity-scale-codec", - "polkadot-core-primitives", "polkadot-primitives", - "polkadot-runtime-constants", - "rococo-runtime-constants", "scale-info", - "smallvec", "sp-consensus-aura", "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "staging-parachain-info", "staging-xcm", - "staging-xcm-builder", "staging-xcm-executor", "substrate-wasm-builder", - "westend-runtime-constants", ] [[package]] name = "parity-db" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e9ab494af9e6e813c72170f0d3c1de1500990d62c97cc05cc7576f91aa402f" +checksum = "592a28a24b09c9dc20ac8afaa6839abc417c720afe42c12e1e4a9d6aa2508d2e" dependencies = [ - "blake2", + "blake2 0.10.6", "crc32fast", "fs2", "hex", "libc", "log", "lz4", - "memmap2", + "memmap2 0.5.10", "parking_lot 0.12.1", - "rand 0.8.5", + "rand", "siphasher", "snap", + "winapi", ] [[package]] @@ -7977,7 +8401,7 @@ version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" dependencies = [ - "proc-macro-crate 2.0.1", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "syn 1.0.109", @@ -8067,16 +8491,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" dependencies = [ - "crypto-mac 0.11.1", -] - -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest 0.10.7", + "crypto-mac 0.11.0", ] [[package]] @@ -8111,9 +8526,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.5" +version = "2.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" +checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95" dependencies = [ "memchr", "thiserror", @@ -8122,9 +8537,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.5" +version = "2.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" +checksum = "f73541b156d32197eecda1a4014d7f868fd2bcb3c550d5386087cfba442bf69c" dependencies = [ "pest", "pest_generator", @@ -8132,22 +8547,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.5" +version = "2.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" +checksum = "c35eeed0a3fab112f75165fdc026b3913f4183133f19b49be773ac9ea966e8bd" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] name = "pest_meta" -version = "2.7.5" +version = "2.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" +checksum = "2adbf29bb9776f28caece835398781ab24435585fe0d4dc1374a61db5accedca" dependencies = [ "once_cell", "pest", @@ -8161,27 +8576,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.1.0", + "indexmap 2.2.6", ] [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] @@ -8192,9 +8607,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -8209,7 +8624,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand 2.0.2", "futures-io", ] @@ -8225,9 +8640,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "platforms" @@ -8237,17 +8652,19 @@ checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325" [[package]] name = "platforms" -version = "3.2.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" +checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" [[package]] name = "polkadot-approval-distribution" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ + "bitvec", "futures", "futures-timer", + "itertools 0.10.5", "polkadot-node-jaeger", "polkadot-node-metrics", "polkadot-node-network-protocol", @@ -8255,14 +8672,14 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand 0.8.5", + "rand", "tracing-gum", ] [[package]] name = "polkadot-availability-bitfield-distribution" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "always-assert", "futures", @@ -8271,14 +8688,14 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand 0.8.5", + "rand", "tracing-gum", ] [[package]] name = "polkadot-availability-distribution" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "derive_more", "fatality", @@ -8290,7 +8707,7 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand 0.8.5", + "rand", "schnellru", "sp-core", "sp-keystore", @@ -8300,9 +8717,10 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ + "async-trait", "fatality", "futures", "parity-scale-codec", @@ -8312,24 +8730,26 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand 0.8.5", + "rand", "sc-network", "schnellru", "thiserror", + "tokio", "tracing-gum", ] [[package]] name = "polkadot-cli" -version = "1.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ + "cfg-if", "clap", "frame-benchmarking-cli", "futures", "log", "polkadot-node-metrics", - "polkadot-performance-test", + "polkadot-node-primitives", "polkadot-service", "sc-cli", "sc-executor", @@ -8348,8 +8768,8 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "bitvec", "fatality", @@ -8370,26 +8790,26 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "parity-scale-codec", "scale-info", "sp-core", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "polkadot-dispute-distribution" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "derive_more", "fatality", "futures", "futures-timer", - "indexmap 1.9.3", + "indexmap 2.2.6", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -8407,8 +8827,8 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -8421,8 +8841,8 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "futures", "futures-timer", @@ -8430,20 +8850,21 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand 0.8.5", + "rand", "rand_chacha 0.3.1", "sc-network", "sc-network-common", "sp-application-crypto", "sp-core", + "sp-crypto-hashing", "sp-keystore", "tracing-gum", ] [[package]] name = "polkadot-network-bridge" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "always-assert", "async-trait", @@ -8465,8 +8886,8 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "futures", "parity-scale-codec", @@ -8483,15 +8904,16 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "bitvec", "derive_more", "futures", "futures-timer", + "itertools 0.10.5", "kvdb", - "merlin 2.0.1", + "merlin", "parity-scale-codec", "polkadot-node-jaeger", "polkadot-node-primitives", @@ -8499,9 +8921,12 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-overseer", "polkadot-primitives", + "rand", + "rand_chacha 0.3.1", + "rand_core 0.6.4", "sc-keystore", "schnellru", - "schnorrkel 0.9.1", + "schnorrkel 0.11.4", "sp-application-crypto", "sp-consensus", "sp-consensus-slots", @@ -8512,8 +8937,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "bitvec", "futures", @@ -8534,8 +8959,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "bitvec", "fatality", @@ -8546,6 +8971,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-statement-table", + "schnellru", "sp-keystore", "thiserror", "tracing-gum", @@ -8553,8 +8979,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "futures", "polkadot-node-subsystem", @@ -8568,8 +8994,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "futures", @@ -8589,23 +9015,22 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "futures", "polkadot-node-metrics", "polkadot-node-subsystem", - "polkadot-primitives", + "polkadot-node-subsystem-types", "sc-client-api", "sc-consensus-babe", - "sp-blockchain", "tracing-gum", ] [[package]] name = "polkadot-node-core-chain-selection" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "futures", "futures-timer", @@ -8621,8 +9046,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "fatality", "futures", @@ -8640,8 +9065,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "futures", @@ -8657,8 +9082,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-prospective-parachains" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "6.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "bitvec", "fatality", @@ -8674,8 +9099,8 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "bitvec", "fatality", @@ -8691,12 +9116,16 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "always-assert", + "array-bytes 6.2.2", + "blake3", + "cfg-if", "futures", "futures-timer", + "is_executable", "libc", "parity-scale-codec", "pin-project", @@ -8704,23 +9133,24 @@ dependencies = [ "polkadot-node-core-pvf-common", "polkadot-node-metrics", "polkadot-node-primitives", + "polkadot-node-subsystem", "polkadot-parachain-primitives", "polkadot-primitives", - "rand 0.8.5", + "rand", "slotmap", "sp-core", "sp-maybe-compressed-blob", - "sp-wasm-interface 14.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", - "substrate-build-script-utils", + "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "tempfile", + "thiserror", "tokio", "tracing-gum", ] [[package]] name = "polkadot-node-core-pvf-checker" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "futures", "polkadot-node-primitives", @@ -8735,54 +9165,35 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-common" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ + "cfg-if", "cpu-time", "futures", "landlock", "libc", + "nix 0.27.1", "parity-scale-codec", "polkadot-parachain-primitives", "polkadot-primitives", "sc-executor", "sc-executor-common", "sc-executor-wasmtime", + "seccompiler", "sp-core", - "sp-externalities 0.19.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", - "sp-io", - "sp-tracing 10.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", - "tokio", - "tracing-gum", -] - -[[package]] -name = "polkadot-node-core-pvf-prepare-worker" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" -dependencies = [ - "futures", - "libc", - "parity-scale-codec", - "polkadot-node-core-pvf-common", - "polkadot-parachain-primitives", - "polkadot-primitives", - "rayon", - "sc-executor", - "sc-executor-common", - "sc-executor-wasmtime", + "sp-crypto-hashing", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-io", - "sp-maybe-compressed-blob", - "sp-tracing 10.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", - "tikv-jemalloc-ctl", - "tokio", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-runtime-api" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "futures", "polkadot-node-metrics", @@ -8796,8 +9207,8 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "lazy_static", "log", @@ -8814,10 +9225,10 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "bs58 0.5.0", + "bs58 0.5.1", "futures", "futures-timer", "log", @@ -8833,8 +9244,8 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-channel 1.9.0", "async-trait", @@ -8847,7 +9258,7 @@ dependencies = [ "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-primitives", - "rand 0.8.5", + "rand", "sc-authority-discovery", "sc-network", "strum 0.24.1", @@ -8857,15 +9268,16 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ + "bitvec", "bounded-vec", "futures", "parity-scale-codec", "polkadot-parachain-primitives", "polkadot-primitives", - "schnorrkel 0.9.1", + "schnorrkel 0.11.4", "serde", "sp-application-crypto", "sp-consensus-babe", @@ -8879,8 +9291,8 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -8889,10 +9301,11 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", + "bitvec", "derive_more", "futures", "orchestra", @@ -8901,20 +9314,23 @@ dependencies = [ "polkadot-node-primitives", "polkadot-primitives", "polkadot-statement-table", + "sc-client-api", "sc-network", "sc-transaction-pool-api", "smallvec", "sp-api", "sp-authority-discovery", + "sp-blockchain", "sp-consensus-babe", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", ] [[package]] name = "polkadot-node-subsystem-util" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "derive_more", @@ -8925,17 +9341,19 @@ dependencies = [ "kvdb", "parity-db", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "pin-project", "polkadot-node-jaeger", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", + "polkadot-node-subsystem-types", "polkadot-overseer", "polkadot-primitives", "prioritized-metered-channel", - "rand 0.8.5", + "rand", + "sc-client-api", "schnellru", "sp-application-crypto", "sp-core", @@ -8946,8 +9364,8 @@ dependencies = [ [[package]] name = "polkadot-overseer" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "futures", @@ -8960,7 +9378,6 @@ dependencies = [ "polkadot-node-subsystem-types", "polkadot-primitives", "sc-client-api", - "schnellru", "sp-api", "sp-core", "tikv-jemalloc-ctl", @@ -8969,46 +9386,29 @@ dependencies = [ [[package]] name = "polkadot-parachain-primitives" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "6.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "bounded-collections", "derive_more", - "frame-support", "parity-scale-codec", "polkadot-core-primitives", "scale-info", "serde", "sp-core", "sp-runtime", - "sp-std", -] - -[[package]] -name = "polkadot-performance-test" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" -dependencies = [ - "env_logger 0.9.3", - "log", - "polkadot-erasure-coding", - "polkadot-node-core-pvf-prepare-worker", - "polkadot-node-primitives", - "polkadot-primitives", - "quote", - "sc-executor-common", - "sp-maybe-compressed-blob", - "staging-kusama-runtime", - "thiserror", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-weights", ] [[package]] name = "polkadot-primitives" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "bitvec", "hex-literal 0.4.1", + "log", "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain-primitives", @@ -9025,13 +9425,13 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-staking", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "polkadot-rpc" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "jsonrpsee", "mmr-rpc", @@ -9047,6 +9447,7 @@ dependencies = [ "sc-consensus-grandpa", "sc-consensus-grandpa-rpc", "sc-rpc", + "sc-rpc-spec-v2", "sc-sync-state-rpc", "sc-transaction-pool-api", "sp-api", @@ -9060,107 +9461,10 @@ dependencies = [ "substrate-state-trie-migration-rpc", ] -[[package]] -name = "polkadot-runtime" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" -dependencies = [ - "bitvec", - "frame-benchmarking", - "frame-election-provider-support", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "frame-try-runtime", - "hex-literal 0.4.1", - "log", - "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", - "pallet-bags-list", - "pallet-balances", - "pallet-bounties", - "pallet-child-bounties", - "pallet-collective", - "pallet-conviction-voting", - "pallet-democracy 4.0.0-dev", - "pallet-election-provider-multi-phase", - "pallet-election-provider-support-benchmarking", - "pallet-elections-phragmen", - "pallet-fast-unstake", - "pallet-grandpa", - "pallet-identity", - "pallet-im-online", - "pallet-indices", - "pallet-membership", - "pallet-message-queue", - "pallet-multisig", - "pallet-nomination-pools", - "pallet-nomination-pools-benchmarking", - "pallet-nomination-pools-runtime-api", - "pallet-offences", - "pallet-offences-benchmarking", - "pallet-preimage", - "pallet-proxy", - "pallet-referenda", - "pallet-scheduler", - "pallet-session", - "pallet-session-benchmarking", - "pallet-staking 4.0.0-dev", - "pallet-staking-reward-curve", - "pallet-staking-runtime-api", - "pallet-timestamp", - "pallet-tips", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-treasury", - "pallet-utility", - "pallet-vesting", - "pallet-whitelist", - "pallet-xcm", - "pallet-xcm-benchmarks", - "parity-scale-codec", - "polkadot-primitives", - "polkadot-runtime-common", - "polkadot-runtime-constants", - "polkadot-runtime-parachains", - "rustc-hex", - "scale-info", - "serde", - "serde_derive", - "smallvec", - "sp-api", - "sp-arithmetic", - "sp-authority-discovery", - "sp-block-builder", - "sp-consensus-babe", - "sp-consensus-beefy", - "sp-core", - "sp-inherents", - "sp-io", - "sp-mmr-primitives", - "sp-npos-elections", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "sp-storage", - "sp-transaction-pool", - "sp-version", - "staging-xcm", - "staging-xcm-builder", - "staging-xcm-executor", - "static_assertions", - "substrate-wasm-builder", -] - [[package]] name = "polkadot-runtime-common" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "bitvec", "frame-benchmarking", @@ -9170,18 +9474,22 @@ dependencies = [ "impl-trait-for-tuples", "libsecp256k1", "log", + "pallet-asset-rate", "pallet-authorship", "pallet-babe", "pallet-balances", + "pallet-broker", "pallet-election-provider-multi-phase", "pallet-fast-unstake", + "pallet-identity", "pallet-session", - "pallet-staking 4.0.0-dev", + "pallet-staking 28.0.0", "pallet-staking-reward-fn", "pallet-timestamp", "pallet-transaction-payment", "pallet-treasury", "pallet-vesting", + "pallet-xcm-benchmarks", "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-parachains", @@ -9198,42 +9506,30 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "static_assertions", ] -[[package]] -name = "polkadot-runtime-constants" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" -dependencies = [ - "frame-support", - "polkadot-primitives", - "polkadot-runtime-common", - "smallvec", - "sp-core", - "sp-runtime", - "sp-weights", -] - [[package]] name = "polkadot-runtime-metrics" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "bs58 0.5.0", + "bs58 0.5.1", "frame-benchmarking", "parity-scale-codec", "polkadot-primitives", - "sp-std", - "sp-tracing 10.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "polkadot-runtime-parachains" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "bitflags 1.3.2", "bitvec", @@ -9247,22 +9543,25 @@ dependencies = [ "pallet-authorship", "pallet-babe", "pallet-balances", + "pallet-broker", "pallet-message-queue", "pallet-session", - "pallet-staking 4.0.0-dev", + "pallet-staking 28.0.0", "pallet-timestamp", "pallet-vesting", "parity-scale-codec", + "polkadot-core-primitives", "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-metrics", - "rand 0.8.5", + "rand", "rand_chacha 0.3.1", "rustc-hex", "scale-info", "serde", "sp-api", "sp-application-crypto", + "sp-arithmetic", "sp-core", "sp-inherents", "sp-io", @@ -9270,7 +9569,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "staging-xcm", "staging-xcm-executor", "static_assertions", @@ -9278,8 +9577,8 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "frame-benchmarking", @@ -9296,11 +9595,12 @@ dependencies = [ "mmr-gadget", "pallet-babe", "pallet-im-online", - "pallet-staking 4.0.0-dev", + "pallet-staking 28.0.0", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "parity-db", "parity-scale-codec", + "parking_lot 0.12.1", "polkadot-approval-distribution", "polkadot-availability-bitfield-distribution", "polkadot-availability-distribution", @@ -9334,8 +9634,6 @@ dependencies = [ "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-rpc", - "polkadot-runtime", - "polkadot-runtime-common", "polkadot-runtime-parachains", "polkadot-statement-distribution", "rococo-runtime", @@ -9383,12 +9681,11 @@ dependencies = [ "sp-runtime", "sp-session", "sp-state-machine", - "sp-storage", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-timestamp", "sp-transaction-pool", "sp-version", "sp-weights", - "staging-kusama-runtime", "substrate-prometheus-endpoint", "thiserror", "tracing-gum", @@ -9397,20 +9694,19 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "arrayvec 0.7.4", "bitvec", "fatality", "futures", "futures-timer", - "indexmap 1.9.3", + "indexmap 2.2.6", "parity-scale-codec", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", - "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-primitives", "sp-keystore", @@ -9421,12 +9717,50 @@ dependencies = [ [[package]] name = "polkadot-statement-table" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "parity-scale-codec", "polkadot-primitives", "sp-core", + "tracing-gum", +] + +[[package]] +name = "polkavm-common" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d9428a5cfcc85c5d7b9fc4b6a18c4b802d0173d768182a51cc7751640f08b92" + +[[package]] +name = "polkavm-derive" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8c4bea6f3e11cd89bb18bcdddac10bd9a24015399bd1c485ad68a985a19606" +dependencies = [ + "polkavm-derive-impl-macro", +] + +[[package]] +name = "polkavm-derive-impl" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c4fdfc49717fb9a196e74a5d28e0bc764eb394a2c803eb11133a31ac996c60c" +dependencies = [ + "polkavm-common", + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "polkavm-derive-impl-macro" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ba81f7b5faac81e528eb6158a6f3c9e0bb1008e0ffa19653bc8dea925ecb429" +dependencies = [ + "polkavm-derive-impl", + "syn 2.0.60", ] [[package]] @@ -9441,20 +9775,21 @@ dependencies = [ "concurrent-queue", "libc", "log", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", "windows-sys 0.48.0", ] [[package]] name = "polling" -version = "3.3.1" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" dependencies = [ "cfg-if", "concurrent-queue", - "pin-project-lite 0.2.13", - "rustix 0.38.27", + "hermit-abi", + "pin-project-lite 0.2.14", + "rustix 0.38.34", "tracing", "windows-sys 0.52.0", ] @@ -9466,19 +9801,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ "cpufeatures", - "opaque-debug 0.3.0", + "opaque-debug 0.3.1", "universal-hash", ] [[package]] name = "polyval" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if", "cpufeatures", - "opaque-debug 0.3.0", + "opaque-debug 0.3.1", "universal-hash", ] @@ -9530,6 +9865,16 @@ dependencies = [ "termtree", ] +[[package]] +name = "prettier-please" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22020dfcf177fcc7bf5deaf7440af371400c67c0de14c399938d8ed4fb4645d3" +dependencies = [ + "proc-macro2", + "syn 2.0.60", +] + [[package]] name = "pretty_assertions" version = "1.4.0" @@ -9542,9 +9887,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.1.25" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +checksum = "f28f53e8b192565862cf99343194579a022eb9c7dd3a8d03134734803c7b3125" dependencies = [ "proc-macro2", "syn 1.0.109", @@ -9552,12 +9897,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.15" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550" dependencies = [ "proc-macro2", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] @@ -9577,7 +9922,7 @@ dependencies = [ [[package]] name = "primitives" version = "6.0.2" -source = "git+https://github.com/galacticcouncil/HydraDX-node?rev=7e997371d7f2110f7719d2f279a153feb973b994#7e997371d7f2110f7719d2f279a153feb973b994" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" dependencies = [ "frame-support", "hex-literal 0.3.4", @@ -9586,13 +9931,13 @@ dependencies = [ "scale-info", "serde", "sp-core", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "static_assertions", ] [[package]] name = "primitives" -version = "6.6.0" +version = "6.6.1" dependencies = [ "frame-support", "parity-scale-codec", @@ -9603,16 +9948,16 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "static_assertions", "substrate-wasm-builder", ] [[package]] name = "prioritized-metered-channel" -version = "0.2.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382698e48a268c832d0b181ed438374a6bb708a82a8ca273bb0f61c74cf209c4" +checksum = "a172e6cc603231f2cf004232eabcecccc0da53ba576ab286ef7baa0cfc7927ad" dependencies = [ "coarsetime", "crossbeam-queue", @@ -9636,12 +9981,20 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" dependencies = [ - "toml_datetime", - "toml_edit 0.20.2", + "toml_edit 0.20.7", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", ] [[package]] @@ -9670,20 +10023,20 @@ dependencies = [ [[package]] name = "proc-macro-warning" -version = "0.4.2" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e" +checksum = "834da187cfe638ae8abb0203f0b33e5ccdb02a28e7199f2f47b3e2754f50edca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -9722,7 +10075,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] @@ -9732,7 +10085,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.11.9", +] + +[[package]] +name = "prost" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" +dependencies = [ + "bytes", + "prost-derive 0.12.4", ] [[package]] @@ -9742,14 +10105,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", - "heck", + "heck 0.4.1", "itertools 0.10.5", "lazy_static", "log", "multimap", "petgraph", - "prettyplease 0.1.25", - "prost", + "prettyplease 0.1.11", + "prost 0.11.9", "prost-types", "regex", "syn 1.0.109", @@ -9770,13 +10133,26 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "prost-derive" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" +dependencies = [ + "anyhow", + "itertools 0.12.1", + "proc-macro2", + "quote", + "syn 2.0.60", +] + [[package]] name = "prost-types" version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ - "prost", + "prost 0.11.9", ] [[package]] @@ -9834,7 +10210,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863" dependencies = [ "bytes", - "rand 0.8.5", + "rand", "ring 0.16.20", "rustc-hash", "rustls 0.20.9", @@ -9847,9 +10223,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -9860,19 +10236,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -9919,16 +10282,17 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.14", ] [[package]] -name = "rand_hc" -version = "0.2.0" +name = "rand_distr" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" dependencies = [ - "rand_core 0.5.1", + "num-traits", + "rand", ] [[package]] @@ -9948,9 +10312,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -9958,9 +10322,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -9998,46 +10362,45 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.14", "libredox", "thiserror", ] [[package]] name = "reed-solomon-novelpoly" -version = "1.0.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58130877ca403ab42c864fbac74bb319a0746c07a634a92a5cfc7f54af272582" +checksum = "87413ebb313323d431e85d0afc5a68222aaed972843537cbfe5f061cf1b4bcab" dependencies = [ "derive_more", "fs-err", - "itertools 0.11.0", "static_init", "thiserror", ] [[package]] name = "ref-cast" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acde58d073e9c79da00f2b5b84eed919c8326832648a5b109b3fce1bb1175280" +checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" +checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] @@ -10054,14 +10417,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", ] [[package]] @@ -10075,13 +10438,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -10092,9 +10455,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "resolv-conf" @@ -10113,22 +10476,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ "hmac 0.12.1", - "subtle", + "subtle 2.5.0", ] [[package]] name = "ring" version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213" +source = "git+https://github.com/w3f/ring-proof#b273d33f9981e2bb3375ab45faeb537f7ee35224" dependencies = [ "ark-ec", "ark-ff", "ark-poly", "ark-serialize", "ark-std", + "blake2 0.10.6", "common", "fflonk", - "merlin 3.0.0", + "merlin", ] [[package]] @@ -10148,16 +10512,26 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", - "getrandom 0.2.11", + "cfg-if", + "getrandom 0.2.14", "libc", "spin 0.9.8", "untrusted 0.9.0", - "windows-sys 0.48.0", + "windows-sys 0.52.0", +] + +[[package]] +name = "ripemd" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" +dependencies = [ + "digest 0.10.7", ] [[package]] @@ -10194,8 +10568,8 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "binary-merkle-tree", "frame-benchmarking", @@ -10207,6 +10581,7 @@ dependencies = [ "frame-try-runtime", "hex-literal 0.4.1", "log", + "pallet-asset-rate", "pallet-authority-discovery", "pallet-authorship", "pallet-babe", @@ -10216,7 +10591,8 @@ dependencies = [ "pallet-bounties", "pallet-child-bounties", "pallet-collective", - "pallet-democracy 4.0.0-dev", + "pallet-conviction-voting", + "pallet-democracy 28.0.0", "pallet-elections-phragmen", "pallet-grandpa", "pallet-identity", @@ -10230,11 +10606,14 @@ dependencies = [ "pallet-offences", "pallet-preimage", "pallet-proxy", + "pallet-ranked-collective", "pallet-recovery", + "pallet-referenda", + "pallet-root-testing", "pallet-scheduler", "pallet-session", "pallet-society", - "pallet-staking 4.0.0-dev", + "pallet-staking 28.0.0", "pallet-state-trie-migration", "pallet-sudo", "pallet-timestamp", @@ -10244,6 +10623,7 @@ dependencies = [ "pallet-treasury", "pallet-utility", "pallet-vesting", + "pallet-whitelist", "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", @@ -10257,11 +10637,13 @@ dependencies = [ "serde_derive", "smallvec", "sp-api", + "sp-arithmetic", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", "sp-consensus-beefy", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-io", "sp-mmr-primitives", @@ -10269,8 +10651,8 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std", - "sp-storage", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-transaction-pool", "sp-version", "staging-xcm", @@ -10282,8 +10664,8 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-support", "polkadot-primitives", @@ -10292,8 +10674,16 @@ dependencies = [ "sp-core", "sp-runtime", "sp-weights", + "staging-xcm", + "staging-xcm-builder", ] +[[package]] +name = "route-recognizer" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" + [[package]] name = "rpassword" version = "7.3.1" @@ -10315,7 +10705,7 @@ dependencies = [ "log", "netlink-packet-route", "netlink-proto", - "nix", + "nix 0.24.3", "thiserror", "tokio", ] @@ -10332,7 +10722,7 @@ dependencies = [ [[package]] name = "runtime-integration-tests" -version = "1.0.1" +version = "1.0.2" dependencies = [ "basilisk-runtime", "cumulus-pallet-aura-ext", @@ -10360,14 +10750,14 @@ dependencies = [ "orml-xcm", "orml-xcm-support", "orml-xtokens", - "pallet-asset-registry", + "pallet-asset-registry 2.3.3", "pallet-aura", "pallet-authorship", "pallet-balances", "pallet-collator-selection", "pallet-collective", "pallet-currencies", - "pallet-democracy 4.0.0-dev", + "pallet-democracy 28.0.0", "pallet-duster", "pallet-elections-phragmen", "pallet-ema-oracle", @@ -10389,13 +10779,13 @@ dependencies = [ "pallet-utility", "pallet-xcm", "pallet-xyk", - "parachain-info", "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-parachains", "polkadot-service", "pretty_assertions", - "primitives 6.6.0", + "primitives 6.6.1", + "rococo-runtime", "sc-consensus-grandpa", "sp-api", "sp-arithmetic", @@ -10405,18 +10795,18 @@ dependencies = [ "sp-consensus-babe", "sp-consensus-beefy", "sp-core", - "sp-externalities 0.19.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-inherents", "sp-io", "sp-offchain", "sp-runtime", "sp-session", "sp-staking", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-transaction-pool", "sp-trie", "sp-version", - "staging-kusama-runtime", + "staging-parachain-info", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -10448,7 +10838,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.20", + "semver 1.0.22", ] [[package]] @@ -10490,14 +10880,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.27" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfeae074e687625746172d639330f1de242a178bf3189b51e35a7a21573513ac" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.12", + "linux-raw-sys 0.4.13", "windows-sys 0.52.0", ] @@ -10515,12 +10905,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4" dependencies = [ "log", - "ring 0.17.7", + "ring 0.17.8", "rustls-webpki", "sct", ] @@ -10543,7 +10933,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", ] [[package]] @@ -10552,15 +10942,15 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.7", + "ring 0.17.8", "untrusted 0.9.0", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" [[package]] name = "ruzstd" @@ -10586,9 +10976,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "safe_arch" @@ -10610,19 +11000,19 @@ dependencies = [ [[package]] name = "sc-allocator" -version = "4.1.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "log", "sp-core", - "sp-wasm-interface 14.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "thiserror", ] [[package]] name = "sc-authority-discovery" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.34.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "futures", @@ -10630,11 +11020,12 @@ dependencies = [ "ip_network", "libp2p", "log", - "multihash", + "multihash 0.18.1", + "multihash-codetable", "parity-scale-codec", - "prost", + "prost 0.12.4", "prost-build", - "rand 0.8.5", + "rand", "sc-client-api", "sc-network", "sp-api", @@ -10649,15 +11040,14 @@ dependencies = [ [[package]] name = "sc-basic-authorship" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.34.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "futures", "futures-timer", "log", "parity-scale-codec", "sc-block-builder", - "sc-client-api", "sc-proposer-metrics", "sc-telemetry", "sc-transaction-pool-api", @@ -10672,25 +11062,29 @@ dependencies = [ [[package]] name = "sc-block-builder" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.33.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "parity-scale-codec", - "sc-client-api", "sp-api", "sp-block-builder", "sp-blockchain", "sp-core", "sp-inherents", "sp-runtime", + "sp-trie", ] [[package]] name = "sc-chain-spec" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "27.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "memmap2", + "array-bytes 6.2.2", + "docify", + "log", + "memmap2 0.9.4", + "parity-scale-codec", "sc-chain-spec-derive", "sc-client-api", "sc-executor", @@ -10700,41 +11094,47 @@ dependencies = [ "serde_json", "sp-blockchain", "sp-core", + "sp-crypto-hashing", + "sp-genesis-builder", + "sp-io", "sp-runtime", "sp-state-machine", ] [[package]] name = "sc-chain-spec-derive" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "11.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] name = "sc-cli" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.36.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", + "bip39", "chrono", "clap", "fdlimit", "futures", + "itertools 0.10.5", "libp2p-identity", "log", "names", "parity-scale-codec", - "rand 0.8.5", + "rand", "regex", "rpassword", "sc-client-api", "sc-client-db", "sc-keystore", + "sc-mixnet", "sc-network", "sc-service", "sc-telemetry", @@ -10750,14 +11150,13 @@ dependencies = [ "sp-runtime", "sp-version", "thiserror", - "tiny-bip39", "tokio", ] [[package]] name = "sc-client-api" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "fnv", "futures", @@ -10772,20 +11171,21 @@ dependencies = [ "sp-consensus", "sp-core", "sp-database", - "sp-externalities 0.19.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-runtime", "sp-state-machine", "sp-statement-store", - "sp-storage", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-trie", "substrate-prometheus-endpoint", ] [[package]] name = "sc-client-db" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.35.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "hash-db 0.16.0", + "hash-db", "kvdb", "kvdb-memorydb", "kvdb-rocksdb", @@ -10808,8 +11208,8 @@ dependencies = [ [[package]] name = "sc-consensus" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.33.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "futures", @@ -10833,8 +11233,8 @@ dependencies = [ [[package]] name = "sc-consensus-aura" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.34.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "futures", @@ -10862,8 +11262,8 @@ dependencies = [ [[package]] name = "sc-consensus-babe" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.34.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "fork-tree", @@ -10880,7 +11280,6 @@ dependencies = [ "sc-consensus-slots", "sc-telemetry", "sc-transaction-pool-api", - "scale-info", "sp-api", "sp-application-crypto", "sp-block-builder", @@ -10889,6 +11288,7 @@ dependencies = [ "sp-consensus-babe", "sp-consensus-slots", "sp-core", + "sp-crypto-hashing", "sp-inherents", "sp-keystore", "sp-runtime", @@ -10898,8 +11298,8 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.34.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "futures", "jsonrpsee", @@ -10920,10 +11320,10 @@ dependencies = [ [[package]] name = "sc-consensus-beefy" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "13.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", "async-channel 1.9.0", "async-trait", "fnv", @@ -10944,18 +11344,20 @@ dependencies = [ "sp-consensus", "sp-consensus-beefy", "sp-core", + "sp-crypto-hashing", "sp-keystore", "sp-mmr-primitives", "sp-runtime", "substrate-prometheus-endpoint", "thiserror", + "tokio", "wasm-timer", ] [[package]] name = "sc-consensus-beefy-rpc" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "13.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "futures", "jsonrpsee", @@ -10973,8 +11375,8 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.33.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "fork-tree", "parity-scale-codec", @@ -10986,11 +11388,11 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.19.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "ahash 0.8.6", - "array-bytes", + "ahash 0.8.11", + "array-bytes 6.2.2", "async-trait", "dyn-clone", "finality-grandpa", @@ -11000,7 +11402,7 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.1", - "rand 0.8.5", + "rand", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -11008,6 +11410,7 @@ dependencies = [ "sc-network", "sc-network-common", "sc-network-gossip", + "sc-network-sync", "sc-telemetry", "sc-transaction-pool-api", "sc-utils", @@ -11019,6 +11422,7 @@ dependencies = [ "sp-consensus", "sp-consensus-grandpa", "sp-core", + "sp-crypto-hashing", "sp-keystore", "sp-runtime", "substrate-prometheus-endpoint", @@ -11027,8 +11431,8 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa-rpc" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.19.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "finality-grandpa", "futures", @@ -11047,8 +11451,8 @@ dependencies = [ [[package]] name = "sc-consensus-slots" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.33.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "futures", @@ -11070,8 +11474,8 @@ dependencies = [ [[package]] name = "sc-executor" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.32.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", @@ -11080,49 +11484,50 @@ dependencies = [ "schnellru", "sp-api", "sp-core", - "sp-externalities 0.19.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-io", "sp-panic-handler", - "sp-runtime-interface 17.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-trie", "sp-version", - "sp-wasm-interface 14.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "tracing", ] [[package]] name = "sc-executor-common" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.29.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", - "sp-wasm-interface 14.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "thiserror", "wasm-instrument", ] [[package]] name = "sc-executor-wasmtime" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.29.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "anyhow", "cfg-if", "libc", "log", + "parking_lot 0.12.1", "rustix 0.36.17", "sc-allocator", "sc-executor-common", - "sp-runtime-interface 17.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", - "sp-wasm-interface 14.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "wasmtime", ] [[package]] name = "sc-informant" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.33.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "ansi_term", "futures", @@ -11131,16 +11536,17 @@ dependencies = [ "sc-client-api", "sc-network", "sc-network-common", + "sc-network-sync", "sp-blockchain", "sp-runtime", ] [[package]] name = "sc-keystore" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "25.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", "parking_lot 0.12.1", "serde_json", "sp-application-crypto", @@ -11149,12 +11555,41 @@ dependencies = [ "thiserror", ] +[[package]] +name = "sc-mixnet" +version = "0.4.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" +dependencies = [ + "array-bytes 4.2.0", + "arrayvec 0.7.4", + "blake2 0.10.6", + "bytes", + "futures", + "futures-timer", + "libp2p-identity", + "log", + "mixnet", + "multiaddr", + "parity-scale-codec", + "parking_lot 0.12.1", + "sc-client-api", + "sc-network", + "sc-transaction-pool-api", + "sp-api", + "sp-consensus", + "sp-core", + "sp-keystore", + "sp-mixnet", + "sp-runtime", + "thiserror", +] + [[package]] name = "sc-network" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.34.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", "async-channel 1.9.0", "async-trait", "asynchronous-codec", @@ -11172,7 +11607,7 @@ dependencies = [ "parking_lot 0.12.1", "partial_sort", "pin-project", - "rand 0.8.5", + "rand", "sc-client-api", "sc-network-common", "sc-utils", @@ -11185,6 +11620,8 @@ dependencies = [ "sp-runtime", "substrate-prometheus-endpoint", "thiserror", + "tokio", + "tokio-stream", "unsigned-varint", "wasm-timer", "zeroize", @@ -11192,15 +11629,15 @@ dependencies = [ [[package]] name = "sc-network-bitswap" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.33.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-channel 1.9.0", "cid", "futures", "libp2p-identity", "log", - "prost", + "prost 0.12.4", "prost-build", "sc-client-api", "sc-network", @@ -11212,8 +11649,8 @@ dependencies = [ [[package]] name = "sc-network-common" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.33.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "bitflags 1.3.2", @@ -11229,16 +11666,17 @@ dependencies = [ [[package]] name = "sc-network-gossip" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.34.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.11", "futures", "futures-timer", "libp2p", "log", "sc-network", "sc-network-common", + "sc-network-sync", "schnellru", "sp-runtime", "substrate-prometheus-endpoint", @@ -11247,16 +11685,16 @@ dependencies = [ [[package]] name = "sc-network-light" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.33.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", "async-channel 1.9.0", "futures", "libp2p-identity", "log", "parity-scale-codec", - "prost", + "prost 0.12.4", "prost-build", "sc-client-api", "sc-network", @@ -11268,10 +11706,10 @@ dependencies = [ [[package]] name = "sc-network-sync" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.33.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", "async-channel 1.9.0", "async-trait", "fork-tree", @@ -11281,7 +11719,7 @@ dependencies = [ "log", "mockall", "parity-scale-codec", - "prost", + "prost 0.12.4", "prost-build", "sc-client-api", "sc-consensus", @@ -11298,20 +11736,23 @@ dependencies = [ "sp-runtime", "substrate-prometheus-endpoint", "thiserror", + "tokio", + "tokio-stream", ] [[package]] name = "sc-network-transactions" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.33.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", "futures", "libp2p", "log", "parity-scale-codec", "sc-network", "sc-network-common", + "sc-network-sync", "sc-utils", "sp-consensus", "sp-runtime", @@ -11320,10 +11761,10 @@ dependencies = [ [[package]] name = "sc-offchain" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "29.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", "bytes", "fnv", "futures", @@ -11336,7 +11777,7 @@ dependencies = [ "once_cell", "parity-scale-codec", "parking_lot 0.12.1", - "rand 0.8.5", + "rand", "sc-client-api", "sc-network", "sc-network-common", @@ -11344,7 +11785,7 @@ dependencies = [ "sc-utils", "sp-api", "sp-core", - "sp-externalities 0.19.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-keystore", "sp-offchain", "sp-runtime", @@ -11354,8 +11795,8 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.17.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -11363,8 +11804,8 @@ dependencies = [ [[package]] name = "sc-rpc" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "29.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "futures", "jsonrpsee", @@ -11374,6 +11815,7 @@ dependencies = [ "sc-block-builder", "sc-chain-spec", "sc-client-api", + "sc-mixnet", "sc-rpc-api", "sc-tracing", "sc-transaction-pool-api", @@ -11394,12 +11836,13 @@ dependencies = [ [[package]] name = "sc-rpc-api" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.33.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "jsonrpsee", "parity-scale-codec", "sc-chain-spec", + "sc-mixnet", "sc-transaction-pool-api", "scale-info", "serde", @@ -11413,8 +11856,8 @@ dependencies = [ [[package]] name = "sc-rpc-server" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "11.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "http", "jsonrpsee", @@ -11428,10 +11871,10 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.34.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", "futures", "futures-util", "hex", @@ -11441,12 +11884,14 @@ dependencies = [ "parking_lot 0.12.1", "sc-chain-spec", "sc-client-api", + "sc-rpc", "sc-transaction-pool-api", "sc-utils", "serde", "sp-api", "sp-blockchain", "sp-core", + "sp-rpc", "sp-runtime", "sp-version", "thiserror", @@ -11456,8 +11901,8 @@ dependencies = [ [[package]] name = "sc-service" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.35.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "directories", @@ -11469,8 +11914,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "pin-project", - "rand 0.8.5", - "sc-block-builder", + "rand", "sc-chain-spec", "sc-client-api", "sc-client-db", @@ -11499,12 +11943,12 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-core", - "sp-externalities 0.19.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-keystore", "sp-runtime", "sp-session", "sp-state-machine", - "sp-storage", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-transaction-pool", "sp-transaction-storage-proof", "sp-trie", @@ -11520,8 +11964,8 @@ dependencies = [ [[package]] name = "sc-state-db" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.30.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "log", "parity-scale-codec", @@ -11531,13 +11975,12 @@ dependencies = [ [[package]] name = "sc-storage-monitor" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.16.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "clap", "fs4", "log", - "sc-client-db", "sp-core", "thiserror", "tokio", @@ -11545,8 +11988,8 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.34.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -11564,27 +12007,29 @@ dependencies = [ [[package]] name = "sc-sysinfo" -version = "6.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "27.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ + "derive_more", "futures", "libc", "log", - "rand 0.8.5", + "rand", "rand_pcg", "regex", "sc-telemetry", "serde", "serde_json", "sp-core", + "sp-crypto-hashing", "sp-io", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "sc-telemetry" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "15.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "chrono", "futures", @@ -11592,7 +12037,7 @@ dependencies = [ "log", "parking_lot 0.12.1", "pin-project", - "rand 0.8.5", + "rand", "sc-utils", "serde", "serde_json", @@ -11602,15 +12047,16 @@ dependencies = [ [[package]] name = "sc-tracing" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "ansi_term", - "atty", "chrono", + "is-terminal", "lazy_static", "libc", "log", + "parity-scale-codec", "parking_lot 0.12.1", "regex", "rustc-hash", @@ -11622,28 +12068,28 @@ dependencies = [ "sp-core", "sp-rpc", "sp-runtime", - "sp-tracing 10.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "thiserror", "tracing", - "tracing-log", - "tracing-subscriber", + "tracing-log 0.1.4", + "tracing-subscriber 0.2.25", ] [[package]] name = "sc-tracing-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "11.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] name = "sc-transaction-pool" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "futures", @@ -11659,8 +12105,9 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-core", + "sp-crypto-hashing", "sp-runtime", - "sp-tracing 10.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-transaction-pool", "substrate-prometheus-endpoint", "thiserror", @@ -11668,8 +12115,8 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "futures", @@ -11684,8 +12131,8 @@ dependencies = [ [[package]] name = "sc-utils" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "14.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-channel 1.9.0", "futures", @@ -11699,9 +12146,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.10.0" +version = "2.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60" +checksum = "7c453e59a955f81fb62ee5d596b450383d699f152d350e9d23a0db2adb78e4c0" dependencies = [ "bitvec", "cfg-if", @@ -11713,9 +12160,9 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.10.0" +version = "2.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19" +checksum = "18cf6c6447f813ef19eb450e985bcce6705f9ce7660db221b59093d15c79c4b7" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", @@ -11725,11 +12172,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -11737,28 +12184,10 @@ name = "schnellru" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d" -dependencies = [ - "ahash 0.8.6", - "cfg-if", - "hashbrown 0.13.2", -] - -[[package]] -name = "schnorrkel" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "021b403afe70d81eea68f6ea12f6b3c9588e5d536a94c3bf80f15e7faa267862" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "curve25519-dalek 2.1.3", - "getrandom 0.1.16", - "merlin 2.0.1", - "rand 0.7.3", - "rand_core 0.5.1", - "sha2 0.8.2", - "subtle", - "zeroize", +dependencies = [ + "ahash 0.8.11", + "cfg-if", + "hashbrown 0.13.2", ] [[package]] @@ -11770,13 +12199,32 @@ dependencies = [ "arrayref", "arrayvec 0.7.4", "curve25519-dalek-ng", - "merlin 3.0.0", + "merlin", "rand_core 0.6.4", "sha2 0.9.9", "subtle-ng", "zeroize", ] +[[package]] +name = "schnorrkel" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de18f6d8ba0aad7045f5feae07ec29899c1112584a38509a84ad7b04451eaa0" +dependencies = [ + "aead", + "arrayref", + "arrayvec 0.7.4", + "curve25519-dalek 4.1.2", + "getrandom_or_panic", + "merlin", + "rand_core 0.6.4", + "serde_bytes", + "sha2 0.10.8", + "subtle 2.5.0", + "zeroize", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -11795,7 +12243,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.7", + "ring 0.17.8", "untrusted 0.9.0", ] @@ -11809,24 +12257,33 @@ dependencies = [ "der", "generic-array 0.14.7", "pkcs8", - "subtle", + "subtle 2.5.0", "zeroize", ] +[[package]] +name = "seccompiler" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345a3e4dddf721a478089d4697b83c6c0a8f5bf16086f6c13397e4534eb6e2e5" +dependencies = [ + "libc", +] + [[package]] name = "secp256k1" -version = "0.24.3" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" +checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" dependencies = [ "secp256k1-sys", ] [[package]] name = "secp256k1-sys" -version = "0.6.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b" +checksum = "e5d1746aae42c19d583c3c1a8c646bfad910498e2051c551a7f2e3c0c9fbb7eb" dependencies = [ "cc", ] @@ -11842,9 +12299,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -11855,9 +12312,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" dependencies = [ "core-foundation-sys", "libc", @@ -11874,9 +12331,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" dependencies = [ "serde", ] @@ -11889,29 +12346,38 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" dependencies = [ "serde_derive", ] +[[package]] +name = "serde_bytes" +version = "0.11.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +dependencies = [ + "serde", +] + [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", @@ -11920,9 +12386,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -11937,19 +12403,18 @@ dependencies = [ "cfg-if", "cpufeatures", "digest 0.9.0", - "opaque-debug 0.3.0", + "opaque-debug 0.3.1", ] [[package]] -name = "sha2" -version = "0.8.2" +name = "sha1" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "fake-simd", - "opaque-debug 0.2.3", + "cfg-if", + "cpufeatures", + "digest 0.10.7", ] [[package]] @@ -11962,7 +12427,7 @@ dependencies = [ "cfg-if", "cpufeatures", "digest 0.9.0", - "opaque-debug 0.3.0", + "opaque-debug 0.3.1", ] [[package]] @@ -11997,15 +12462,15 @@ dependencies = [ [[package]] name = "shlex" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -12033,6 +12498,11 @@ dependencies = [ "wide", ] +[[package]] +name = "simple-mermaid" +version = "0.1.0" +source = "git+https://github.com/kianenigma/simple-mermaid.git?rev=e48b187bcfd5cc75111acd9d241f1bd36604344b#e48b187bcfd5cc75111acd9d241f1bd36604344b" + [[package]] name = "siphasher" version = "0.3.11" @@ -12056,14 +12526,14 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[package]] name = "slot-range-helper" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "enumn", "parity-scale-codec", "paste", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] @@ -12077,9 +12547,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smol" @@ -12107,10 +12577,10 @@ dependencies = [ "arrayvec 0.7.4", "async-lock 2.8.0", "atomic-take", - "base64 0.21.5", + "base64 0.21.7", "bip39", "blake2-rfc", - "bs58 0.5.0", + "bs58 0.5.1", "chacha20", "crossbeam-queue", "derive_more", @@ -12125,7 +12595,7 @@ dependencies = [ "hmac 0.12.1", "itertools 0.11.0", "libsecp256k1", - "merlin 3.0.0", + "merlin", "no-std-net", "nom", "num-bigint", @@ -12134,7 +12604,7 @@ dependencies = [ "pbkdf2 0.12.2", "pin-project", "poly1305", - "rand 0.8.5", + "rand", "rand_chacha 0.3.1", "ruzstd", "schnorrkel 0.10.2", @@ -12148,7 +12618,7 @@ dependencies = [ "soketto", "twox-hash", "wasmi", - "x25519-dalek 2.0.0", + "x25519-dalek 2.0.1", "zeroize", ] @@ -12160,7 +12630,7 @@ checksum = "256b5bad1d6b49045e95fe87492ce73d5af81545d8b4d8318a872d2007024c33" dependencies = [ "async-channel 1.9.0", "async-lock 2.8.0", - "base64 0.21.5", + "base64 0.21.7", "blake2-rfc", "derive_more", "either", @@ -12177,7 +12647,7 @@ dependencies = [ "no-std-net", "parking_lot 0.12.1", "pin-project", - "rand 0.8.5", + "rand", "rand_chacha 0.3.1", "serde", "serde_json", @@ -12196,19 +12666,19 @@ checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "snow" -version = "0.9.4" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58021967fd0a5eeeb23b08df6cc244a4d4a5b4aec1d27c9e02fad1a58b4cd74e" +checksum = "850948bee068e713b8ab860fe1adc4d109676ab4c3b621fd8147f06b261f2f85" dependencies = [ "aes-gcm", - "blake2", + "blake2 0.10.6", "chacha20poly1305", - "curve25519-dalek 4.1.1", + "curve25519-dalek 4.1.2", "rand_core 0.6.4", - "ring 0.17.7", + "ring 0.17.8", "rustc_version", "sha2 0.10.8", - "subtle", + "subtle 2.5.0", ] [[package]] @@ -12223,12 +12693,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -12244,26 +12714,26 @@ dependencies = [ "http", "httparse", "log", - "rand 0.8.5", + "rand", "sha-1", ] [[package]] name = "sp-api" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "hash-db 0.16.0", + "hash-db", "log", "parity-scale-codec", "scale-info", "sp-api-proc-macro", "sp-core", - "sp-externalities 0.19.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-metadata-ir", "sp-runtime", "sp-state-machine", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-trie", "sp-version", "thiserror", @@ -12271,73 +12741,91 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "15.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "Inflector", - "blake2", - "expander 2.0.0", - "proc-macro-crate 1.3.1", + "blake2 0.10.6", + "expander 2.1.0", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] name = "sp-application-crypto" -version = "23.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "30.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "parity-scale-codec", "scale-info", "serde", "sp-core", "sp-io", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "sp-arithmetic" -version = "16.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "23.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "static_assertions", ] +[[package]] +name = "sp-ark-bls12-381" +version = "0.4.2" +source = "git+https://github.com/paritytech/arkworks-substrate#caa2eed74beb885dd07c7db5f916f2281dad818f" +dependencies = [ + "ark-bls12-381-ext", + "sp-crypto-ec-utils", +] + +[[package]] +name = "sp-ark-ed-on-bls12-381-bandersnatch" +version = "0.4.2" +source = "git+https://github.com/paritytech/arkworks-substrate#caa2eed74beb885dd07c7db5f916f2281dad818f" +dependencies = [ + "ark-ed-on-bls12-381-bandersnatch-ext", + "sp-crypto-ec-utils", +] + [[package]] name = "sp-authority-discovery" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "parity-scale-codec", "scale-info", "sp-api", "sp-application-crypto", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "sp-block-builder" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "sp-api", "sp-inherents", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "sp-blockchain" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "futures", "log", @@ -12354,8 +12842,8 @@ dependencies = [ [[package]] name = "sp-consensus" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.32.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "futures", @@ -12369,8 +12857,8 @@ dependencies = [ [[package]] name = "sp-consensus-aura" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.32.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "parity-scale-codec", @@ -12380,14 +12868,14 @@ dependencies = [ "sp-consensus-slots", "sp-inherents", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-timestamp", ] [[package]] name = "sp-consensus-babe" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.32.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "parity-scale-codec", @@ -12399,14 +12887,14 @@ dependencies = [ "sp-core", "sp-inherents", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-timestamp", ] [[package]] name = "sp-consensus-beefy" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "13.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "lazy_static", "parity-scale-codec", @@ -12415,17 +12903,18 @@ dependencies = [ "sp-api", "sp-application-crypto", "sp-core", + "sp-crypto-hashing", "sp-io", "sp-mmr-primitives", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "strum 0.24.1", ] [[package]] name = "sp-consensus-grandpa" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "13.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "finality-grandpa", "log", @@ -12437,72 +12926,91 @@ dependencies = [ "sp-core", "sp-keystore", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "sp-consensus-slots" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.32.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-timestamp", ] [[package]] name = "sp-core" -version = "21.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "array-bytes", - "arrayvec 0.7.4", + "array-bytes 6.2.2", "bandersnatch_vrfs", + "bip39", "bitflags 1.3.2", - "blake2", + "blake2 0.10.6", "bounded-collections", - "bs58 0.5.0", + "bs58 0.5.1", "dyn-clonable", "ed25519-zebra 3.1.0", "futures", - "hash-db 0.16.0", + "hash-db", "hash256-std-hasher", "impl-serde", - "lazy_static", + "itertools 0.10.5", "libsecp256k1", "log", - "merlin 2.0.1", + "merlin", "parity-scale-codec", "parking_lot 0.12.1", "paste", "primitive-types", - "rand 0.8.5", - "regex", + "rand", "scale-info", - "schnorrkel 0.9.1", + "schnorrkel 0.11.4", "secp256k1", "secrecy", "serde", - "sp-core-hashing", - "sp-debug-derive", - "sp-externalities 0.19.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", - "sp-runtime-interface 17.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", - "sp-std", - "sp-storage", + "sp-crypto-hashing", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "ss58-registry", "substrate-bip39", "thiserror", - "tiny-bip39", "tracing", + "w3f-bls", "zeroize", ] [[package]] -name = "sp-core-hashing" -version = "9.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +name = "sp-crypto-ec-utils" +version = "0.10.0" +source = "git+https://github.com/paritytech/polkadot-sdk#c26cf3f6f2d2b7f7783703308ece440c338459f8" +dependencies = [ + "ark-bls12-377", + "ark-bls12-377-ext", + "ark-bls12-381", + "ark-bls12-381-ext", + "ark-bw6-761", + "ark-bw6-761-ext", + "ark-ec", + "ark-ed-on-bls12-377", + "ark-ed-on-bls12-377-ext", + "ark-ed-on-bls12-381-bandersnatch", + "ark-ed-on-bls12-381-bandersnatch-ext", + "ark-scale", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk)", +] + +[[package]] +name = "sp-crypto-hashing" +version = "0.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "blake2b_simd", "byteorder", @@ -12513,19 +13021,19 @@ dependencies = [ ] [[package]] -name = "sp-core-hashing-proc-macro" -version = "9.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +name = "sp-crypto-hashing-proc-macro" +version = "0.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "quote", - "sp-core-hashing", - "syn 2.0.39", + "sp-crypto-hashing", + "syn 2.0.60", ] [[package]] name = "sp-database" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "10.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -12533,65 +13041,74 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "8.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "14.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.60", +] + +[[package]] +name = "sp-debug-derive" +version = "14.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk#c26cf3f6f2d2b7f7783703308ece440c338459f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] name = "sp-externalities" -version = "0.19.0" -source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#4b7e06d11031f759e2e151eb35a805499a3e284b" +version = "0.25.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "environmental", "parity-scale-codec", - "sp-std", - "sp-storage", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "sp-externalities" -version = "0.19.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.25.0" +source = "git+https://github.com/paritytech/polkadot-sdk#c26cf3f6f2d2b7f7783703308ece440c338459f8" dependencies = [ "environmental", "parity-scale-codec", - "sp-std", - "sp-storage", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk)", ] [[package]] name = "sp-genesis-builder" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "serde_json", "sp-api", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "sp-inherents" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "thiserror", ] [[package]] name = "sp-io" -version = "23.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "30.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "bytes", "ed25519-dalek", @@ -12601,12 +13118,13 @@ dependencies = [ "rustversion", "secp256k1", "sp-core", - "sp-externalities 0.19.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-crypto-hashing", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-keystore", - "sp-runtime-interface 17.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-state-machine", - "sp-std", - "sp-tracing 10.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-trie", "tracing", "tracing-core", @@ -12614,10 +13132,9 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "24.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "31.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "lazy_static", "sp-core", "sp-runtime", "strum 0.24.1", @@ -12625,20 +13142,20 @@ dependencies = [ [[package]] name = "sp-keystore" -version = "0.27.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.34.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "sp-core", - "sp-externalities 0.19.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "thiserror", ] [[package]] name = "sp-maybe-compressed-blob" -version = "4.1.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "11.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "thiserror", "zstd 0.12.4", @@ -12646,19 +13163,31 @@ dependencies = [ [[package]] name = "sp-metadata-ir" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.6.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-metadata", "parity-scale-codec", "scale-info", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", +] + +[[package]] +name = "sp-mixnet" +version = "0.4.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" +dependencies = [ + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-application-crypto", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "sp-mmr-primitives" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "ckb-merkle-mountain-range", "log", @@ -12667,16 +13196,16 @@ dependencies = [ "serde", "sp-api", "sp-core", - "sp-debug-derive", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "thiserror", ] [[package]] name = "sp-npos-elections" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "parity-scale-codec", "scale-info", @@ -12684,13 +13213,13 @@ dependencies = [ "sp-arithmetic", "sp-core", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "sp-offchain" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "sp-api", "sp-core", @@ -12699,8 +13228,8 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "8.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "13.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "backtrace", "lazy_static", @@ -12709,8 +13238,8 @@ dependencies = [ [[package]] name = "sp-rpc" -version = "6.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "rustc-hash", "serde", @@ -12719,90 +13248,95 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "24.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "31.0.1" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ + "docify", "either", "hash256-std-hasher", "impl-trait-for-tuples", "log", "parity-scale-codec", "paste", - "rand 0.8.5", + "rand", "scale-info", "serde", + "simple-mermaid", "sp-application-crypto", "sp-arithmetic", "sp-core", "sp-io", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-weights", ] [[package]] name = "sp-runtime-interface" -version = "17.0.0" -source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#4b7e06d11031f759e2e151eb35a805499a3e284b" +version = "24.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", - "sp-externalities 0.19.0 (git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0)", - "sp-runtime-interface-proc-macro 11.0.0 (git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0)", - "sp-std", - "sp-storage", - "sp-tracing 10.0.0 (git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0)", - "sp-wasm-interface 14.0.0 (git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "static_assertions", ] [[package]] name = "sp-runtime-interface" -version = "17.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "24.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk#c26cf3f6f2d2b7f7783703308ece440c338459f8" dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", + "polkavm-derive", "primitive-types", - "sp-externalities 0.19.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", - "sp-runtime-interface-proc-macro 11.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", - "sp-std", - "sp-storage", - "sp-tracing 10.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", - "sp-wasm-interface 14.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk)", + "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/paritytech/polkadot-sdk)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk)", + "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk)", "static_assertions", ] [[package]] name = "sp-runtime-interface-proc-macro" -version = "11.0.0" -source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#4b7e06d11031f759e2e151eb35a805499a3e284b" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "Inflector", - "proc-macro-crate 1.3.1", + "expander 2.1.0", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] name = "sp-runtime-interface-proc-macro" -version = "11.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk#c26cf3f6f2d2b7f7783703308ece440c338459f8" dependencies = [ "Inflector", - "proc-macro-crate 1.3.1", + "expander 2.1.0", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] name = "sp-session" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "27.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "parity-scale-codec", "scale-info", @@ -12811,13 +13345,13 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-staking", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "sp-staking" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -12825,113 +13359,130 @@ dependencies = [ "serde", "sp-core", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "sp-state-machine" -version = "0.28.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.35.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "hash-db 0.16.0", + "hash-db", "log", "parity-scale-codec", "parking_lot 0.12.1", - "rand 0.8.5", + "rand", "smallvec", "sp-core", - "sp-externalities 0.19.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-panic-handler", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-trie", "thiserror", "tracing", - "trie-db 0.27.1", + "trie-db", ] [[package]] name = "sp-statement-store" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "10.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "aes-gcm", - "curve25519-dalek 4.1.1", + "curve25519-dalek 4.1.2", "ed25519-dalek", "hkdf", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "sha2 0.10.8", "sp-api", "sp-application-crypto", "sp-core", - "sp-externalities 0.19.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-crypto-hashing", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-runtime", - "sp-runtime-interface 17.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", - "sp-std", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "thiserror", - "x25519-dalek 2.0.0", + "x25519-dalek 2.0.1", ] [[package]] name = "sp-std" -version = "8.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "14.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" + +[[package]] +name = "sp-std" +version = "14.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk#c26cf3f6f2d2b7f7783703308ece440c338459f8" [[package]] name = "sp-storage" -version = "13.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "19.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "impl-serde", "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive", - "sp-std", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", +] + +[[package]] +name = "sp-storage" +version = "19.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk#c26cf3f6f2d2b7f7783703308ece440c338459f8" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "ref-cast", + "serde", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk)", ] [[package]] name = "sp-timestamp" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "parity-scale-codec", "sp-inherents", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "thiserror", ] [[package]] name = "sp-tracing" -version = "10.0.0" -source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#4b7e06d11031f759e2e151eb35a805499a3e284b" +version = "16.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "parity-scale-codec", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "tracing", "tracing-core", - "tracing-subscriber", + "tracing-subscriber 0.2.25", ] [[package]] name = "sp-tracing" -version = "10.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "16.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk#c26cf3f6f2d2b7f7783703308ece440c338459f8" dependencies = [ "parity-scale-codec", - "sp-std", "tracing", "tracing-core", - "tracing-subscriber", + "tracing-subscriber 0.3.18", ] [[package]] name = "sp-transaction-pool" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "sp-api", "sp-runtime", @@ -12939,8 +13490,8 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "26.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "parity-scale-codec", @@ -12948,100 +13499,98 @@ dependencies = [ "sp-core", "sp-inherents", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-trie", ] [[package]] name = "sp-trie" -version = "22.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "29.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "ahash 0.8.6", - "hash-db 0.16.0", - "hashbrown 0.13.2", + "ahash 0.8.11", + "hash-db", "lazy_static", "memory-db", "nohash-hasher", "parity-scale-codec", "parking_lot 0.12.1", + "rand", "scale-info", "schnellru", "sp-core", - "sp-std", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "thiserror", "tracing", - "trie-db 0.27.1", + "trie-db", "trie-root", ] [[package]] name = "sp-version" -version = "22.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "29.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "impl-serde", "parity-scale-codec", "parity-wasm", "scale-info", "serde", - "sp-core-hashing-proc-macro", + "sp-crypto-hashing-proc-macro", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-version-proc-macro", "thiserror", ] [[package]] name = "sp-version-proc-macro" -version = "8.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "13.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] name = "sp-wasm-interface" -version = "14.0.0" -source = "git+https://github.com/moonbeam-foundation/polkadot-sdk?branch=moonbeam-polkadot-v1.1.0#4b7e06d11031f759e2e151eb35a805499a3e284b" +version = "20.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "anyhow", "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "wasmtime", ] [[package]] name = "sp-wasm-interface" -version = "14.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "20.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk#c26cf3f6f2d2b7f7783703308ece440c338459f8" dependencies = [ - "anyhow", "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std", - "wasmtime", ] [[package]] name = "sp-weights" -version = "20.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "27.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ + "bounded-collections", "parity-scale-codec", "scale-info", "serde", "smallvec", "sp-arithmetic", - "sp-core", - "sp-debug-derive", - "sp-std", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] @@ -13073,142 +13622,51 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ - "base64ct", - "der", -] - -[[package]] -name = "ss58-registry" -version = "1.44.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35935738370302d5e33963665b77541e4b990a3e919ec904c837a56cfc891de1" -dependencies = [ - "Inflector", - "num-format", - "proc-macro2", - "quote", - "serde", - "serde_json", - "unicode-xid", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "staging-kusama-runtime" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" -dependencies = [ - "binary-merkle-tree", - "bitvec", - "frame-benchmarking", - "frame-election-provider-support", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "frame-try-runtime", - "hex-literal 0.4.1", - "kusama-runtime-constants", - "log", - "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", - "pallet-bags-list", - "pallet-balances", - "pallet-beefy", - "pallet-beefy-mmr", - "pallet-bounties", - "pallet-child-bounties", - "pallet-collective", - "pallet-conviction-voting", - "pallet-democracy 4.0.0-dev", - "pallet-election-provider-multi-phase", - "pallet-election-provider-support-benchmarking", - "pallet-elections-phragmen", - "pallet-fast-unstake", - "pallet-grandpa", - "pallet-identity", - "pallet-im-online", - "pallet-indices", - "pallet-membership", - "pallet-message-queue", - "pallet-mmr", - "pallet-multisig", - "pallet-nis", - "pallet-nomination-pools", - "pallet-nomination-pools-benchmarking", - "pallet-nomination-pools-runtime-api", - "pallet-offences", - "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-runtime-api", - "pallet-state-trie-migration", - "pallet-timestamp", - "pallet-tips", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-treasury", - "pallet-utility", - "pallet-vesting", - "pallet-whitelist", - "pallet-xcm", - "pallet-xcm-benchmarks", + "base64ct", + "der", +] + +[[package]] +name = "ss58-registry" +version = "1.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4743ce898933fbff7bbf414f497c459a782d496269644b3d650a398ae6a487ba" +dependencies = [ + "Inflector", + "num-format", + "proc-macro2", + "quote", + "serde", + "serde_json", + "unicode-xid", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "staging-parachain-info" +version = "0.7.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" +dependencies = [ + "cumulus-primitives-core", + "frame-support", + "frame-system", "parity-scale-codec", - "polkadot-primitives", - "polkadot-runtime-common", - "polkadot-runtime-parachains", - "rustc-hex", "scale-info", - "serde", - "serde_derive", - "smallvec", - "sp-api", - "sp-application-crypto", - "sp-arithmetic", - "sp-authority-discovery", - "sp-block-builder", - "sp-consensus-babe", - "sp-consensus-beefy", - "sp-core", - "sp-inherents", - "sp-io", - "sp-mmr-primitives", - "sp-npos-elections", - "sp-offchain", "sp-runtime", - "sp-session", - "sp-staking", - "sp-std", - "sp-storage", - "sp-transaction-pool", - "sp-version", - "staging-xcm", - "staging-xcm-builder", - "staging-xcm-executor", - "static_assertions", - "substrate-wasm-builder", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", ] [[package]] name = "staging-xcm" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ + "array-bytes 6.2.2", "bounded-collections", "derivative", "environmental", @@ -13223,8 +13681,8 @@ dependencies = [ [[package]] name = "staging-xcm-builder" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-support", "frame-system", @@ -13237,7 +13695,7 @@ dependencies = [ "sp-arithmetic", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-weights", "staging-xcm", "staging-xcm-executor", @@ -13245,8 +13703,8 @@ dependencies = [ [[package]] name = "staging-xcm-executor" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "environmental", "frame-benchmarking", @@ -13254,11 +13712,12 @@ dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", + "scale-info", "sp-arithmetic", "sp-core", "sp-io", "sp-runtime", - "sp-std", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-weights", "staging-xcm", ] @@ -13297,11 +13756,24 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "strobe-rs" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabb238a1cccccfa4c4fb703670c0d157e1256c1ba695abf1b93bd2bb14bab2d" +dependencies = [ + "bitflags 1.3.2", + "byteorder", + "keccak", + "subtle 2.5.0", + "zeroize", +] + [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" @@ -13314,9 +13786,9 @@ dependencies = [ [[package]] name = "strum" -version = "0.25.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" [[package]] name = "strum_macros" @@ -13324,7 +13796,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", @@ -13333,39 +13805,39 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.25.3" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] name = "substrate-bip39" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e620c7098893ba667438b47169c00aacdd9e7c10e042250ce2b60b087ec97328" +checksum = "6a7590dc041b9bc2825e52ce5af8416c73dbe9d0654402bfd4b4941938b94d8f" dependencies = [ "hmac 0.11.0", "pbkdf2 0.8.0", - "schnorrkel 0.9.1", + "schnorrkel 0.11.4", "sha2 0.9.9", "zeroize", ] [[package]] name = "substrate-build-script-utils" -version = "3.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "11.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" [[package]] name = "substrate-frame-rpc-system" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "28.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -13383,8 +13855,8 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.17.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "hyper", "log", @@ -13395,8 +13867,8 @@ dependencies = [ [[package]] name = "substrate-rpc-client" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.33.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "jsonrpsee", @@ -13408,8 +13880,8 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" -version = "4.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "27.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -13420,32 +13892,38 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-trie", - "trie-db 0.27.1", + "trie-db", ] [[package]] name = "substrate-wasm-builder" -version = "5.0.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "ansi_term", "build-helper", "cargo_metadata", + "console", "filetime", "parity-wasm", "sp-maybe-compressed-blob", "strum 0.24.1", "tempfile", - "toml 0.7.8", + "toml 0.8.12", "walkdir", "wasm-opt", ] [[package]] name = "subtle" -version = "2.4.1" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" + +[[package]] +name = "subtle" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "subtle-ng" @@ -13466,9 +13944,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -13516,32 +13994,41 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "redox_syscall 0.4.1", - "rustix 0.38.27", - "windows-sys 0.48.0", + "fastrand 2.0.2", + "rustix 0.38.34", + "windows-sys 0.52.0", ] [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] +[[package]] +name = "terminal_size" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +dependencies = [ + "rustix 0.38.34", + "windows-sys 0.48.0", +] + [[package]] name = "termtree" version = "0.4.1" @@ -13566,7 +14053,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] @@ -13577,15 +14064,24 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", "test-case-core", ] +[[package]] +name = "test-utils" +version = "1.1.1" +source = "git+https://github.com/galacticcouncil/HydraDX-node?branch=polkadot-v1.7.2#4e946130da2063d95ab97298b75645603de4e3a7" +dependencies = [ + "frame-system", + "pretty_assertions", +] + [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] @@ -13607,18 +14103,18 @@ checksum = "e4c60d69f36615a077cc7663b9cb8e42275722d23e58a7fa3d2c7f2915d09d04" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] @@ -13629,9 +14125,9 @@ checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -13682,12 +14178,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -13702,32 +14199,14 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] -[[package]] -name = "tiny-bip39" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861" -dependencies = [ - "anyhow", - "hmac 0.12.1", - "once_cell", - "pbkdf2 0.11.0", - "rand 0.8.5", - "rustc-hash", - "sha2 0.10.8", - "thiserror", - "unicode-normalization", - "wasm-bindgen", - "zeroize", -] - [[package]] name = "tiny-keccak" version = "2.0.2" @@ -13754,9 +14233,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.34.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -13764,9 +14243,9 @@ dependencies = [ "mio", "num_cpus", "parking_lot 0.12.1", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", "signal-hook-registry", - "socket2 0.5.5", + "socket2 0.5.6", "tokio-macros", "windows-sys 0.48.0", ] @@ -13779,7 +14258,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] @@ -13789,7 +14268,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" dependencies = [ "pin-project", - "rand 0.8.5", + "rand", "tokio", ] @@ -13799,18 +14278,18 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.10", + "rustls 0.21.11", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", "tokio", "tokio-util", ] @@ -13825,7 +14304,7 @@ dependencies = [ "futures-core", "futures-io", "futures-sink", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", "tokio", "tracing", ] @@ -13853,21 +14332,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.2" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.20.2", + "toml_edit 0.22.12", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -13878,24 +14357,46 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.2.6", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.2.6", + "toml_datetime", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.20.2" +version = "0.22.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.6", ] [[package]] @@ -13904,6 +14405,10 @@ version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite 0.2.14", "tower-layer", "tower-service", "tracing", @@ -13915,14 +14420,14 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "bytes", "futures-core", "futures-util", "http", "http-body", "http-range-header", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", "tower-layer", "tower-service", ] @@ -13946,7 +14451,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ "log", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", "tracing-attributes", "tracing-core", ] @@ -13959,7 +14464,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] @@ -13984,11 +14489,10 @@ dependencies = [ [[package]] name = "tracing-gum" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "coarsetime", - "polkadot-node-jaeger", "polkadot-primitives", "tracing", "tracing-gum-proc-macro", @@ -13996,14 +14500,14 @@ dependencies = [ [[package]] name = "tracing-gum-proc-macro" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "5.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ - "expander 2.0.0", - "proc-macro-crate 1.3.1", + "expander 2.1.0", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] @@ -14017,6 +14521,17 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + [[package]] name = "tracing-serde" version = "0.1.3" @@ -14036,7 +14551,7 @@ dependencies = [ "ansi_term", "chrono", "lazy_static", - "matchers", + "matchers 0.0.1", "parking_lot 0.11.2", "regex", "serde", @@ -14046,21 +14561,26 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log", + "tracing-log 0.1.4", "tracing-serde", ] [[package]] -name = "trie-db" -version = "0.27.1" +name = "tracing-subscriber" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767abe6ffed88a1889671a102c2861ae742726f52e0a5a425b92c9fbfa7e9c85" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ - "hash-db 0.16.0", - "hashbrown 0.13.2", - "log", - "rustc-hex", + "matchers 0.1.0", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log 0.2.0", ] [[package]] @@ -14069,7 +14589,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff28e0f815c2fea41ebddf148e008b077d2faddb026c9555b29696114d602642" dependencies = [ - "hash-db 0.16.0", + "hash-db", "hashbrown 0.13.2", "log", "rustc-hex", @@ -14082,17 +14602,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4ed310ef5ab98f5fa467900ed906cb9232dd5376597e00fd4cba2a449d06c0b" dependencies = [ - "hash-db 0.16.0", -] - -[[package]] -name = "triehash" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1631b201eb031b563d2e85ca18ec8092508e262a3196ce9bd10a67ec87b9f5c" -dependencies = [ - "hash-db 0.15.2", - "rlp", + "hash-db", ] [[package]] @@ -14111,7 +14621,7 @@ dependencies = [ "idna 0.2.3", "ipnet", "lazy_static", - "rand 0.8.5", + "rand", "smallvec", "socket2 0.4.10", "thiserror", @@ -14149,8 +14659,8 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "try-runtime-cli" -version = "0.10.0-dev" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.38.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "async-trait", "clap", @@ -14166,8 +14676,8 @@ dependencies = [ "sp-consensus-aura", "sp-consensus-babe", "sp-core", - "sp-debug-derive", - "sp-externalities 0.19.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-inherents", "sp-io", "sp-keystore", @@ -14196,7 +14706,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.7", - "rand 0.8.5", + "rand", "static_assertions", ] @@ -14226,9 +14736,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -14264,7 +14774,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ "crypto-common", - "subtle", + "subtle 2.5.0", ] [[package]] @@ -14332,6 +14842,30 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +[[package]] +name = "w3f-bls" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7335e4c132c28cc43caef6adb339789e599e39adbe78da0c4d547fad48cbc331" +dependencies = [ + "ark-bls12-377", + "ark-bls12-381", + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-serialize-derive", + "arrayref", + "constcat", + "digest 0.10.7", + "rand", + "rand_chacha 0.3.1", + "rand_core 0.6.4", + "sha2 0.10.8", + "sha3", + "thiserror", + "zeroize", +] + [[package]] name = "waker-fn" version = "1.1.1" @@ -14340,9 +14874,9 @@ checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -14369,11 +14903,20 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasix" +version = "0.12.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1fbb4ef9bbca0c1170e0b00dd28abc9e3b68669821600cad1caaed606583c6d" +dependencies = [ + "wasi 0.11.0+wasi-snapshot-preview1", +] + [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -14381,24 +14924,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -14408,9 +14951,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -14418,37 +14961,37 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-instrument" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa1dafb3e60065305741e83db35c6c2584bb3725b692b5b66148a38d72ace6cd" +checksum = "2a47ecb37b9734d1085eaa5ae1a81e60801fd8c28d4cabdd8aedb982021918bc" dependencies = [ "parity-wasm", ] [[package]] name = "wasm-opt" -version = "0.114.2" +version = "0.116.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effbef3bd1dde18acb401f73e740a6f3d4a1bc651e9773bddc512fe4d8d68f67" +checksum = "2fd87a4c135535ffed86123b6fb0f0a5a0bc89e50416c942c5f0662c645f679c" dependencies = [ "anyhow", "libc", @@ -14462,9 +15005,9 @@ dependencies = [ [[package]] name = "wasm-opt-cxx-sys" -version = "0.114.2" +version = "0.116.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c09e24eb283919ace2ed5733bda4842a59ce4c8de110ef5c6d98859513d17047" +checksum = "8c57b28207aa724318fcec6575fe74803c23f6f266fce10cbc9f3f116762f12e" dependencies = [ "anyhow", "cxx", @@ -14474,9 +15017,9 @@ dependencies = [ [[package]] name = "wasm-opt-sys" -version = "0.114.2" +version = "0.116.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36f2f817bed2e8d65eb779fa37317e74de15585751f903c9118342d1970703a4" +checksum = "8a1cce564dc768dacbdb718fc29df2dba80bd21cb47d8f77ae7e3d95ceb98cbe" dependencies = [ "anyhow", "cc", @@ -14501,9 +15044,9 @@ dependencies = [ [[package]] name = "wasmi" -version = "0.31.1" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acfc1e384a36ca532d070a315925887247f3c7e23567e23e0ac9b1c5d6b8bf76" +checksum = "77a8281d1d660cdf54c76a3efa9ddd0c270cada1383a995db3ccb43d166456c7" dependencies = [ "smallvec", "spin 0.9.8", @@ -14514,9 +15057,9 @@ dependencies = [ [[package]] name = "wasmi_arena" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "401c1f35e413fac1846d4843745589d9ec678977ab35a384db8ae7830525d468" +checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073" [[package]] name = "wasmi_core" @@ -14542,9 +15085,9 @@ dependencies = [ [[package]] name = "wasmparser-nostd" -version = "0.100.1" +version = "0.100.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724" +checksum = "d5a015fe95f3504a94bb1462c717aae75253e39b9dd6c3fb1062c934535c64aa" dependencies = [ "indexmap-nostd", ] @@ -14593,7 +15136,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c86437fa68626fe896e5afc69234bb2b5894949083586535f200385adfd71213" dependencies = [ "anyhow", - "base64 0.21.5", + "base64 0.21.7", "bincode", "directories-next", "file-per-thread-logger", @@ -14722,9 +15265,9 @@ dependencies = [ "log", "mach", "memfd", - "memoffset 0.8.0", + "memoffset", "paste", - "rand 0.8.5", + "rand", "rustix 0.36.17", "wasmtime-asm-macros", "wasmtime-environ", @@ -14746,9 +15289,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -14760,7 +15303,7 @@ version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring 0.17.7", + "ring 0.17.8", "untrusted 0.9.0", ] @@ -14773,16 +15316,10 @@ dependencies = [ "webpki", ] -[[package]] -name = "webpki-roots" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" - [[package]] name = "westend-runtime" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "binary-merkle-tree", "bitvec", @@ -14796,6 +15333,7 @@ dependencies = [ "frame-try-runtime", "hex-literal 0.4.1", "log", + "pallet-asset-rate", "pallet-authority-discovery", "pallet-authorship", "pallet-babe", @@ -14804,7 +15342,8 @@ dependencies = [ "pallet-beefy", "pallet-beefy-mmr", "pallet-collective", - "pallet-democracy 4.0.0-dev", + "pallet-conviction-voting", + "pallet-democracy 28.0.0", "pallet-election-provider-multi-phase", "pallet-election-provider-support-benchmarking", "pallet-elections-phragmen", @@ -14825,11 +15364,13 @@ dependencies = [ "pallet-preimage", "pallet-proxy", "pallet-recovery", + "pallet-referenda", + "pallet-root-testing", "pallet-scheduler", "pallet-session", "pallet-session-benchmarking", "pallet-society", - "pallet-staking 4.0.0-dev", + "pallet-staking 28.0.0", "pallet-staking-reward-curve", "pallet-staking-runtime-api", "pallet-state-trie-migration", @@ -14840,6 +15381,7 @@ dependencies = [ "pallet-treasury", "pallet-utility", "pallet-vesting", + "pallet-whitelist", "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", @@ -14854,11 +15396,13 @@ dependencies = [ "smallvec", "sp-api", "sp-application-crypto", + "sp-arithmetic", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", "sp-consensus-beefy", "sp-core", + "sp-genesis-builder", "sp-inherents", "sp-io", "sp-mmr-primitives", @@ -14867,8 +15411,8 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std", - "sp-storage", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "sp-transaction-pool", "sp-version", "staging-xcm", @@ -14880,8 +15424,8 @@ dependencies = [ [[package]] name = "westend-runtime-constants" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "frame-support", "polkadot-primitives", @@ -14890,6 +15434,8 @@ dependencies = [ "sp-core", "sp-runtime", "sp-weights", + "staging-xcm", + "staging-xcm-builder", ] [[package]] @@ -14901,14 +15447,14 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.27", + "rustix 0.38.34", ] [[package]] name = "wide" -version = "0.7.13" +version = "0.7.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68938b57b33da363195412cfc5fc37c9ed49aa9cfe2156fde64b8d2c9498242" +checksum = "81a1851a719f11d1d2fea40e15c72f6c00de8c142d7ac47c1441cc7e4d0d5bc6" dependencies = [ "bytemuck", "safe_arch", @@ -14916,9 +15462,9 @@ dependencies = [ [[package]] name = "widestring" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "winapi" @@ -14938,11 +15484,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "134306a13c5647ad6453e8deaec55d3a44d6021970129e6188735e74bf546697" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -14994,7 +15540,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.5", ] [[package]] @@ -15029,17 +15575,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -15056,9 +15603,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -15074,9 +15621,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -15092,9 +15639,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -15110,9 +15663,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -15128,9 +15681,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -15146,9 +15699,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -15164,15 +15717,24 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "winnow" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] [[package]] name = "winnow" -version = "0.5.26" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67b5f0a4e7a27a64c651977932b9dc5667ca7fc31ac44b03ed37a0cf42fdfff" +checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352" dependencies = [ "memchr", ] @@ -15209,11 +15771,11 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ - "curve25519-dalek 4.1.1", + "curve25519-dalek 4.1.2", "rand_core 0.6.4", "serde", "zeroize", @@ -15239,10 +15801,11 @@ dependencies = [ [[package]] name = "xcm-emulator" -version = "0.1.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "0.5.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "cumulus-pallet-parachain-system", + "cumulus-pallet-xcmp-queue", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", "cumulus-test-relay-sproof-builder", @@ -15261,23 +15824,24 @@ dependencies = [ "polkadot-runtime-parachains", "sp-arithmetic", "sp-core", + "sp-crypto-hashing", "sp-io", "sp-runtime", - "sp-std", - "sp-tracing 10.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)", "staging-xcm", "staging-xcm-executor", ] [[package]] name = "xcm-procedural" -version = "1.0.0" -source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3" +version = "7.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f" dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] @@ -15290,7 +15854,7 @@ dependencies = [ "log", "nohash-hasher", "parking_lot 0.12.1", - "rand 0.8.5", + "rand", "static_assertions", ] @@ -15311,22 +15875,22 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.29" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d075cf85bbb114e933343e087b92f2146bac0d55b534cbb8188becf0039948e" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.29" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86cd5ca076997b97ef09d3ad65efe811fa68c9e874cb636ccb211223a813b0c2" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] @@ -15346,7 +15910,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.60", ] [[package]] @@ -15389,9 +15953,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.10+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" dependencies = [ "cc", "pkg-config", diff --git a/Cargo.toml b/Cargo.toml index d0d34b6bb31..e51e266f484 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,412 +6,401 @@ members = [ 'node', 'runtime/basilisk', 'pallets/marketplace', + 'pallets/asset-registry', + 'pallets/xyk-liquidity-mining', + 'pallets/xyk-liquidity-mining/benchmarking', 'integration-tests', ] +resolver = '2' + [workspace.dependencies] primitive-types = { version = "0.12.0", default-features = false } log = "0.4.20" -hydra-dx-math = { git = "https://github.com/galacticcouncil/HydraDX-node", rev = "7e997371d7f2110f7719d2f279a153feb973b994", default-features = false } -hydradx-traits = { git = "https://github.com/galacticcouncil/HydraDX-node", rev = "7e997371d7f2110f7719d2f279a153feb973b994", default-features = false } -hydradx-adapters = { git = "https://github.com/galacticcouncil/HydraDX-node", rev = "7e997371d7f2110f7719d2f279a153feb973b994", default-features = false } -pallet-relaychain-info = { git = "https://github.com/galacticcouncil/HydraDX-node", rev = "7e997371d7f2110f7719d2f279a153feb973b994", default-features = false } -pallet-transaction-multi-payment = { git = "https://github.com/galacticcouncil/HydraDX-node", rev = "7e997371d7f2110f7719d2f279a153feb973b994", default-features = false } -pallet-asset-registry = { git = "https://github.com/galacticcouncil/HydraDX-node", rev = "7e997371d7f2110f7719d2f279a153feb973b994", default-features = false } -pallet-nft = { git = "https://github.com/galacticcouncil/HydraDX-node", rev = "7e997371d7f2110f7719d2f279a153feb973b994", default-features = false } -pallet-currencies = { git = "https://github.com/galacticcouncil/HydraDX-node", rev = "7e997371d7f2110f7719d2f279a153feb973b994", default-features = false } -pallet-transaction-pause = { git = "https://github.com/galacticcouncil/HydraDX-node", rev = "7e997371d7f2110f7719d2f279a153feb973b994", default-features = false } -pallet-route-executor = { git = "https://github.com/galacticcouncil/HydraDX-node", rev = "7e997371d7f2110f7719d2f279a153feb973b994", default-features = false } -pallet-liquidity-mining = { git = "https://github.com/galacticcouncil/HydraDX-node", rev = "7e997371d7f2110f7719d2f279a153feb973b994", default-features = false } -warehouse-liquidity-mining = { package="pallet-liquidity-mining", git = "https://github.com/galacticcouncil/HydraDX-node", rev = "7e997371d7f2110f7719d2f279a153feb973b994", default-features = false } -pallet-ema-oracle = { git = "https://github.com/galacticcouncil/HydraDX-node", rev = "7e997371d7f2110f7719d2f279a153feb973b994", default-features = false } -pallet-duster = { git = "https://github.com/galacticcouncil/HydraDX-node", rev = "7e997371d7f2110f7719d2f279a153feb973b994", default-features = false } -pallet-collator-rewards = { git = "https://github.com/galacticcouncil/HydraDX-node", rev = "7e997371d7f2110f7719d2f279a153feb973b994", default-features = false } -test-utils = { git = "https://github.com/galacticcouncil/HydraDX-node", rev = "7e997371d7f2110f7719d2f279a153feb973b994", default-features = false } -pallet-xcm-rate-limiter = { git = "https://github.com/galacticcouncil/HydraDX-node", rev = "7e997371d7f2110f7719d2f279a153feb973b994", default-features = false } -pallet-xyk = { git = "https://github.com/galacticcouncil/HydraDX-node", rev = "7e997371d7f2110f7719d2f279a153feb973b994", default-features = false } -pallet-lbp = { git = "https://github.com/galacticcouncil/HydraDX-node", rev = "7e997371d7f2110f7719d2f279a153feb973b994", default-features = false } -hydra-dx-build-script-utils = { git = "https://github.com/galacticcouncil/HydraDX-node", rev = "7e997371d7f2110f7719d2f279a153feb973b994" } +basilisk-runtime = { path = "runtime/basilisk", default-features = false } + +pallet-marketplace = { path = "pallets/marketplace", default-features = false} +pallet-asset-registry = { path = "pallets/asset-registry", default-features = false} +pallet-xyk-liquidity-mining = { path = "pallets/xyk-liquidity-mining", default-features = false} +pallet-xyk-liquidity-mining-benchmarking = { path = "pallets/xyk-liquidity-mining/benchmarking", default-features = false} + +hydra-dx-math = { git = "https://github.com/galacticcouncil/HydraDX-node", branch ="polkadot-v1.7.2", default-features = false } +hydradx-traits = { git = "https://github.com/galacticcouncil/HydraDX-node", branch ="polkadot-v1.7.2", default-features = false } +hydradx-adapters = { git = "https://github.com/galacticcouncil/HydraDX-node", branch ="polkadot-v1.7.2", default-features = false } +pallet-relaychain-info = { git = "https://github.com/galacticcouncil/HydraDX-node", branch ="polkadot-v1.7.2", default-features = false } +pallet-transaction-multi-payment = { git = "https://github.com/galacticcouncil/HydraDX-node", branch ="polkadot-v1.7.2", default-features = false } +pallet-nft = { git = "https://github.com/galacticcouncil/HydraDX-node", branch ="polkadot-v1.7.2", default-features = false } +pallet-currencies = { git = "https://github.com/galacticcouncil/HydraDX-node", branch ="polkadot-v1.7.2", default-features = false } +pallet-transaction-pause = { git = "https://github.com/galacticcouncil/HydraDX-node", branch ="polkadot-v1.7.2", default-features = false } +pallet-route-executor = { git = "https://github.com/galacticcouncil/HydraDX-node", branch ="polkadot-v1.7.2", default-features = false } +pallet-ema-oracle = { git = "https://github.com/galacticcouncil/HydraDX-node", branch ="polkadot-v1.7.2", default-features = false } +pallet-duster = { git = "https://github.com/galacticcouncil/HydraDX-node", branch ="polkadot-v1.7.2", default-features = false } +pallet-collator-rewards = { git = "https://github.com/galacticcouncil/HydraDX-node", branch ="polkadot-v1.7.2", default-features = false } +test-utils = { git = "https://github.com/galacticcouncil/HydraDX-node", branch ="polkadot-v1.7.2", default-features = false } +pallet-lbp = { git = "https://github.com/galacticcouncil/HydraDX-node", branch ="polkadot-v1.7.2", default-features = false } +pallet-xyk = { git = "https://github.com/galacticcouncil/HydraDX-node", branch ="polkadot-v1.7.2", default-features = false } +pallet-liquidity-mining = { git = "https://github.com/galacticcouncil/HydraDX-node", branch ="polkadot-v1.7.2", default-features = false } +warehouse-liquidity-mining = { package="pallet-liquidity-mining", git = "https://github.com/galacticcouncil/HydraDX-node", branch ="polkadot-v1.7.2", default-features = false } +hydra-dx-build-script-utils = { git = "https://github.com/galacticcouncil/HydraDX-node", branch ="polkadot-v1.7.2" } -frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -frame-election-provider-support = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -frame-support-procedural = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -frame-support-procedural-tools = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -frame-support-procedural-tools-derive = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-authority-discovery = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-babe = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-identity = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-im-online = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-indices = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-membership = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-offences = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-offences-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-recovery = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-session-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-society = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-staking = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-staking-reward-fn = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-state-trie-migration = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-tips = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-uniques = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-vesting = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-authority-discovery = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-client-db = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-consensus-babe = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-consensus-babe-rpc = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-consensus-epochs = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-consensus-slots = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-executor-common = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-executor-wasmtime = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-informant = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-keystore = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-network = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-network-common = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-network-gossip = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-rpc-api = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-rpc-server = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-service = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-sync-state-rpc = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-tracing = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-utils = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sc-sysinfo = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-api = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-application-crypto = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-authority-discovery = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false} -sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-consensus-babe = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-consensus-slots = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-consensus-beefy = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-debug-derive = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-externalities = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-maybe-compressed-blob = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-npos-elections = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-rpc = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-session = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-state-machine = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-trie = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-version = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-wasm-interface = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-weights = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-mmr = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -sp-mmr-primitives = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901" } +frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +frame-election-provider-support = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +frame-support-procedural = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +frame-support-procedural-tools = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +frame-support-procedural-tools-derive = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-authority-discovery = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-babe = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-identity = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-im-online = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-indices = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-membership = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-offences = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-offences-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-recovery = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-session-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-society = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-staking = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-staking-reward-fn = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-state-trie-migration = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-tips = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-uniques = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-vesting = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false } -kusama-runtime = { package = "staging-kusama-runtime", git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -polkadot-node-core-pvf = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -polkadot-node-network-protocol = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -polkadot-node-subsystem-util = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -polkadot-overseer = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false, features = ["wasm-api"] } -polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -polkadot-runtime = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -polkadot-service = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -polkadot-statement-table = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -rococo-runtime = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -westend-runtime = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -polkadot-xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -xcm-emulator = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } +sc-authority-discovery = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-client-db = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-consensus-babe = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-consensus-babe-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-consensus-epochs = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-consensus-slots = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-executor-common = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-executor-wasmtime = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-informant = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-network = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-network-common = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-network-gossip = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-rpc-api = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-rpc-server = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-service = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-sync-state-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sc-sysinfo = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-application-crypto = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-authority-discovery = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false} +sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-consensus-babe = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-consensus-slots = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-consensus-beefy = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-debug-derive = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-externalities = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-npos-elections = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-session = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-state-machine = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-trie = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-version = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-wasm-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-weights = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-crypto-hashing= { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false} +sp-crypto-ec-utils= { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false} +sp-core-hashing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false} -pallet-collator-selection = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -cumulus-client-cli = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -cumulus-client-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -cumulus-client-consensus-common = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -cumulus-client-consensus-proposer = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -cumulus-client-network = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -cumulus-client-collator = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -cumulus-primitives-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -parachain-info = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false } +substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +pallet-mmr = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +sp-mmr-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2" } + +pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +polkadot-node-core-pvf = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +polkadot-node-network-protocol = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +polkadot-node-subsystem-util = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +polkadot-overseer = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false, features = ["wasm-api"] } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +polkadot-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +polkadot-service = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +polkadot-statement-table = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +rococo-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +rococo-emulated-chain = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +westend-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +polkadot-xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +xcm-emulator = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +parachains-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false } + +pallet-collator-selection = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +cumulus-client-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +cumulus-client-consensus-proposer = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +cumulus-client-network = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +cumulus-client-collator = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +staging-parachain-info = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch ="release-polkadot-v1.7.2", default-features = false } # ORML dependencies -orml-benchmarking = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "b3694e631df7f1ca16b1973122937753fcdee9d4", default-features = false } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "b3694e631df7f1ca16b1973122937753fcdee9d4", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "b3694e631df7f1ca16b1973122937753fcdee9d4", default-features = false } -orml-utilities = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "b3694e631df7f1ca16b1973122937753fcdee9d4", default-features = false } -orml-vesting = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "b3694e631df7f1ca16b1973122937753fcdee9d4", default-features = false } +orml-benchmarking = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2", default-features = false } +orml-tokens = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2", default-features = false } +orml-traits = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2", default-features = false } +orml-utilities = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2", default-features = false } +orml-vesting = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2", default-features = false } # orml XCM support -orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "b3694e631df7f1ca16b1973122937753fcdee9d4", default-features = false } -orml-xcm = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "b3694e631df7f1ca16b1973122937753fcdee9d4", default-features = false } -orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "b3694e631df7f1ca16b1973122937753fcdee9d4", default-features = false } -orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "b3694e631df7f1ca16b1973122937753fcdee9d4", default-features = false } +orml-unknown-tokens = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2", default-features = false } +orml-xcm = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2", default-features = false } +orml-xcm-support = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2", default-features = false } +orml-xtokens = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2", default-features = false } +[patch."https://github.com/moonbeam-foundation/open-runtime-module-library"] +# ORML dependencies +orml-benchmarking = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2"} +orml-tokens = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2"} +orml-traits = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2"} +orml-utilities = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2"} +orml-vesting = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2"} +orml-unknown-tokens = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2"} +orml-xcm = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2"} +orml-xcm-support = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2"} +orml-xtokens = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2"} -[patch."https://github.com/paritytech/polkadot-sdk"] -frame-benchmarking = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -frame-benchmarking-cli = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -frame-election-provider-support = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -frame-executive = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -frame-support = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -frame-support-procedural = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -frame-support-procedural-tools = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -frame-support-procedural-tools-derive = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -frame-system = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -frame-system-benchmarking = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -frame-system-rpc-runtime-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -frame-try-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-aura = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-authority-discovery = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-authorship = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-babe = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-balances = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-bounties = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-collective = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-democracy = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-election-provider-multi-phase = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-elections-phragmen = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-identity = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-im-online = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-indices = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-membership = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-multisig = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-offences = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-offences-benchmarking = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-proxy = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-recovery = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-scheduler = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-session = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-session-benchmarking = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-society = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-staking = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-staking-reward-curve = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-staking-reward-fn = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-state-trie-migration = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-sudo = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-timestamp = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-tips = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-transaction-payment = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-transaction-payment-rpc = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-treasury = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-uniques = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-utility = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-vesting = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-preimage = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-authority-discovery = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-basic-authorship = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-block-builder = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-chain-spec = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-cli = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-client-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-client-db = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-consensus = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-consensus-aura = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-consensus-babe = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-consensus-babe-rpc = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-consensus-epochs = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-consensus-slots = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-consensus-grandpa = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-executor = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-executor-common = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-executor-wasmtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-informant = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-keystore = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-network = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-network-common = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-network-sync = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-network-gossip = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-offchain = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-rpc = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-rpc-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-rpc-server = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-service = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-sync-state-rpc = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-telemetry = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-tracing = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-transaction-pool = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-transaction-pool-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-utils = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sc-sysinfo = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-application-crypto = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-arithmetic = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-authority-discovery = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-block-builder = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-blockchain = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-consensus = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-consensus-aura = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-consensus-babe = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-consensus-slots = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-consensus-beefy = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-core = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-debug-derive = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-externalities = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-inherents = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-io = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-keyring = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-keystore = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-maybe-compressed-blob = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-npos-elections = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-offchain = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-rpc = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-runtime-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-runtime-interface-proc-macro = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-session = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-staking = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-state-machine = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-std = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-storage = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-timestamp = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-tracing = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-transaction-pool = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-trie = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-version = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-wasm-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-weights = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -substrate-build-script-utils = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -substrate-frame-rpc-system = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -substrate-prometheus-endpoint = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -substrate-wasm-builder = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-mmr = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-mmr-primitives = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -substrate-state-trie-migration-rpc = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } +[patch."https://github.com/moonbeam-foundation/polkadot-sdk"] +frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +frame-remote-externalities = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-authority-discovery = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-consensus-babe = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-externalities = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-npos-elections = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-wasm-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-panic-handler = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-database = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-trie = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-version = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sc-client-db = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sc-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sc-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sc-network-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sc-rpc-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sc-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sc-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sc-sysinfo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sc-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-state-machine = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +sp-weights = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2"} +sp-crypto-hashing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2"} -kusama-runtime = { package = "staging-kusama-runtime", git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -pallet-xcm = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -polkadot-cli = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -polkadot-core-primitives = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -polkadot-node-core-pvf = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -polkadot-node-network-protocol = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -polkadot-node-primitives = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -polkadot-node-subsystem = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -polkadot-node-subsystem-util = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -polkadot-overseer = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -polkadot-primitives = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -polkadot-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -polkadot-runtime-common = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -polkadot-runtime-parachains = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -polkadot-service = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -polkadot-statement-table = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -rococo-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -westend-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -polkadot-xcm = { package = "staging-xcm", git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -xcm-emulator = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } +# Substrate Pallets +pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +pallet-elections-phragmen = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +pallet-identity = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +pallet-tips = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +pallet-uniques = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +pallet-im-online = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2"} -pallet-collator-selection = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -cumulus-client-cli = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -cumulus-client-consensus-aura = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -cumulus-client-consensus-common = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -cumulus-client-consensus-proposer = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -cumulus-client-network = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -cumulus-client-service = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -cumulus-client-collator = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -cumulus-pallet-aura-ext = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -cumulus-pallet-dmp-queue = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -cumulus-pallet-parachain-system = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -cumulus-pallet-xcm = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -cumulus-pallet-xcmp-queue = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -cumulus-primitives-core = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -cumulus-primitives-parachain-inherent = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -cumulus-primitives-timestamp = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -cumulus-primitives-utility = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -parachain-info = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -cumulus-relay-chain-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -cumulus-relay-chain-minimal-node = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } +substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +substrate-rpc-client = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } -# pallet-transaction-multi-payment depends on pallet-evm from moonbeam. Patch dependencies of this pallet. -[patch."https://github.com/moonbeam-foundation/polkadot-sdk"] -frame-benchmarking = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -frame-support = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -frame-system = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-core = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-io = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-keystore = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-storage = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } -sp-std = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" } +# Cumulus dependencies +cumulus-client-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +cumulus-client-collator = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +cumulus-client-consensus-proposer = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +cumulus-client-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +cumulus-primitives-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +pallet-collator-selection = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +staging-parachain-info = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +xcm-emulator = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +parachains-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2"} + +# Polkadot dependencies +pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2"} +polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +polkadot-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } + +polkadot-node-core-pvf = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +polkadot-node-network-protocol = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +polkadot-node-subsystem-util = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +polkadot-overseer = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2"} +polkadot-statement-table = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +rococo-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +westend-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } + +cumulus-client-pov-recovery = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +cumulus-pallet-parachain-system-proc-macro = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } +cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml index 7b9f93d7a2e..ae5d1da188a 100644 --- a/integration-tests/Cargo.toml +++ b/integration-tests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "runtime-integration-tests" -version = "1.0.1" +version = "1.0.2" description = "Integration tests" authors = ["GalacticCouncil"] edition = "2021" @@ -21,7 +21,7 @@ pallet-duster = { workspace = true } pallet-xyk = { workspace = true } pallet-lbp = { workspace = true } -pallet-marketplace = { path = '../pallets/marketplace', default-features = false } +pallet-marketplace = { workspace = true} primitives = { default-features = false, path = "../primitives" } @@ -56,7 +56,7 @@ cumulus-primitives-core = { workspace = true } cumulus-primitives-utility = { workspace = true } cumulus-primitives-parachain-inherent = { workspace = true } cumulus-primitives-timestamp = { workspace = true } -parachain-info = { workspace = true } +staging-parachain-info = { workspace = true } # Polkadot dependencies polkadot-parachain = { workspace = true } @@ -107,7 +107,7 @@ polkadot-primitives = { workspace = true } polkadot-runtime-parachains = { workspace = true } basilisk-runtime = { path = "../runtime/basilisk", default-features = false} -kusama-runtime = { workspace = true, features = ["try-runtime"] } +rococo-runtime = {workspace = true} cumulus-test-relay-sproof-builder = { workspace = true } [dev-dependencies] @@ -142,7 +142,7 @@ std = [ "xcm-builder/std", "xcm-executor/std", "pallet-xcm/std", - "parachain-info/std", + "staging-parachain-info/std", "pallet-xyk/std", "pallet-duster/std", "pallet-asset-registry/std", @@ -183,12 +183,12 @@ std = [ "pallet-tips/std", "pallet-collator-selection/std", "pallet-authorship/std", - "kusama-runtime/std", "basilisk-runtime/std", "hydradx-traits/std", + "rococo-runtime/std", ] runtime-benchmarks = [ "basilisk-runtime/runtime-benchmarks", - "kusama-runtime/runtime-benchmarks", + "rococo-runtime/runtime-benchmarks", ] \ No newline at end of file diff --git a/integration-tests/src/call_filter.rs b/integration-tests/src/call_filter.rs index 858c719c6ea..9f9055e21c2 100644 --- a/integration-tests/src/call_filter.rs +++ b/integration-tests/src/call_filter.rs @@ -1,7 +1,7 @@ #![cfg(test)] use crate::kusama_test_net::*; use frame_support::traits::Contains; -use polkadot_xcm::latest::prelude::*; +use polkadot_xcm::v3::prelude::*; use polkadot_xcm::VersionedXcm; use xcm_emulator::TestExt; @@ -26,7 +26,7 @@ fn calling_pallet_xcm_extrinsic_should_be_filtered_by_call_filter() { Basilisk::execute_with(|| { // the values here don't need to make sense, all we need is a valid Call let call = basilisk_runtime::RuntimeCall::PolkadotXcm(pallet_xcm::Call::send { - dest: Box::new(MultiLocation::parent().into()), + dest: Box::new(MultiLocation::parent().into_versioned()), message: Box::new(VersionedXcm::from(Xcm(vec![]))), }); @@ -41,7 +41,7 @@ fn calling_orml_xcm_extrinsic_should_be_filtered_by_call_filter() { Basilisk::execute_with(|| { // the values here don't need to make sense, all we need is a valid Call let call = basilisk_runtime::RuntimeCall::OrmlXcm(orml_xcm::Call::send_as_sovereign { - dest: Box::new(MultiLocation::parent().into()), + dest: Box::new(MultiLocation::parent().into_versioned()), message: Box::new(VersionedXcm::from(Xcm(vec![]))), }); diff --git a/integration-tests/src/cross_chain_transfer.rs b/integration-tests/src/cross_chain_transfer.rs index 082e7bd60f1..9f41f724b3b 100644 --- a/integration-tests/src/cross_chain_transfer.rs +++ b/integration-tests/src/cross_chain_transfer.rs @@ -1,25 +1,27 @@ #![cfg(test)] -use crate::kusama_test_net::Kusama; +use crate::kusama_test_net::Rococo; use crate::kusama_test_net::*; use frame_support::{assert_noop, assert_ok}; -use polkadot_xcm::{latest::prelude::*, VersionedMultiAssets, VersionedXcm}; +use polkadot_xcm::{v4::prelude::*, VersionedAssets, VersionedXcm}; use cumulus_primitives_core::ParaId; -use frame_support::weights::Weight; -use hex_literal::hex; use orml_traits::currency::MultiCurrency; +use polkadot_xcm::opaque::v3::{ + Junction, + Junctions::{X1, X2}, + MultiLocation, +}; use sp_core::H256; use sp_runtime::traits::{AccountIdConversion, BlakeTwo256, Hash}; use xcm_emulator::TestExt; +use sp_std::sync::Arc; + // Determine the hash for assets expected to be have been trapped. -fn determine_hash(origin: &MultiLocation, assets: M) -> H256 -where - M: Into, -{ - let versioned = VersionedMultiAssets::from(assets.into()); +fn determine_hash(origin: &MultiLocation, assets: Vec) -> H256 { + let versioned = VersionedAssets::from(Assets::from(assets)); BlakeTwo256::hash_of(&(origin, &versioned)) } @@ -29,20 +31,20 @@ fn basilisk_should_receive_asset_when_transferred_from_relaychain() { assert_ok!(basilisk_runtime::AssetRegistry::set_location( basilisk_runtime::RuntimeOrigin::root(), 1, - basilisk_runtime::AssetLocation(MultiLocation::parent()) + basilisk_runtime::AssetLocation(MultiLocation::parent().into()) )); }); - Kusama::execute_with(|| { - assert_ok!(kusama_runtime::XcmPallet::reserve_transfer_assets( - kusama_runtime::RuntimeOrigin::signed(ALICE.into()), + Rococo::execute_with(|| { + assert_ok!(rococo_runtime::XcmPallet::reserve_transfer_assets( + rococo_runtime::RuntimeOrigin::signed(ALICE.into()), Box::new(Parachain(BASILISK_PARA_ID).into_versioned()), - Box::new(Junction::AccountId32 { id: BOB, network: None }.into()), + Box::new(Junction::AccountId32 { id: BOB, network: None }.into_versioned()), Box::new((Here, 300 * UNITS).into()), 0, )); assert_eq!( - kusama_runtime::Balances::free_balance(AccountIdConversion::::into_account_truncating( + rococo_runtime::Balances::free_balance(AccountIdConversion::::into_account_truncating( &ParaId::from(BASILISK_PARA_ID) )), 310 * UNITS @@ -70,11 +72,13 @@ fn relaychain_should_receive_asset_when_transferred_from_basilisk() { basilisk_runtime::AssetLocation(MultiLocation::parent()) )); + let dest = MultiLocation::new(1, X1(Junction::AccountId32 { id: BOB, network: None })).into_versioned(); + assert_ok!(basilisk_runtime::XTokens::transfer( basilisk_runtime::RuntimeOrigin::signed(ALICE.into()), 1, 3 * UNITS, - Box::new(MultiLocation::new(1, X1(Junction::AccountId32 { id: BOB, network: None })).into()), + Box::new(dest), WeightLimit::Limited(Weight::from_parts(4_600_000_000, 10_000)) )); assert_eq!( @@ -83,10 +87,10 @@ fn relaychain_should_receive_asset_when_transferred_from_basilisk() { ); }); - Kusama::execute_with(|| { + Rococo::execute_with(|| { assert_eq!( - kusama_runtime::Balances::free_balance(AccountId::from(BOB)), - 2999918220455 // 3 * BSX - fee + rococo_runtime::Balances::free_balance(AccountId::from(BOB)), + 2999989698923 // 3 * BSX - fee ); }); } @@ -101,7 +105,9 @@ fn basilisk_should_receive_asset_when_sent_from_other_parachain() { assert_ok!(basilisk_runtime::AssetRegistry::set_location( basilisk_runtime::RuntimeOrigin::root(), 1, - basilisk_runtime::AssetLocation(MultiLocation::new(1, X2(Parachain(OTHER_PARA_ID), GeneralIndex(0)))) + basilisk_runtime::AssetLocation( + MultiLocation::new(1, X2(Junction::Parachain(OTHER_PARA_ID), Junction::GeneralIndex(0))).into() + ) )); }); @@ -118,7 +124,7 @@ fn basilisk_should_receive_asset_when_sent_from_other_parachain() { Junction::AccountId32 { id: BOB, network: None } ) ) - .into() + .into_versioned() ), WeightLimit::Limited(Weight::from_parts(399_600_000_000, 0)) )); @@ -151,7 +157,10 @@ fn other_parachain_should_receive_asset_when_sent_from_basilisk() { assert_ok!(basilisk_runtime::AssetRegistry::set_location( basilisk_runtime::RuntimeOrigin::root(), 1, - basilisk_runtime::AssetLocation(MultiLocation::new(1, X2(Parachain(BASILISK_PARA_ID), GeneralIndex(0)))) + basilisk_runtime::AssetLocation(MultiLocation::new( + 1, + X2(Junction::Parachain(BASILISK_PARA_ID), Junction::GeneralIndex(0)) + )) )); }); @@ -173,7 +182,7 @@ fn other_parachain_should_receive_asset_when_sent_from_basilisk() { Junction::AccountId32 { id: BOB, network: None } ) ) - .into() + .into_versioned() ), WeightLimit::Limited(Weight::from_parts(399_600_000_000, 0)) )); @@ -207,7 +216,10 @@ fn transfer_from_other_parachain_and_back() { assert_ok!(basilisk_runtime::AssetRegistry::set_location( basilisk_runtime::RuntimeOrigin::root(), 1, - basilisk_runtime::AssetLocation(MultiLocation::new(1, X2(Parachain(OTHER_PARA_ID), GeneralIndex(0)))) + basilisk_runtime::AssetLocation(MultiLocation::new( + 1, + X2(Junction::Parachain(OTHER_PARA_ID), Junction::GeneralIndex(0)) + )) )); }); @@ -224,7 +236,7 @@ fn transfer_from_other_parachain_and_back() { Junction::AccountId32 { id: BOB, network: None } ) ) - .into() + .into_versioned() ), WeightLimit::Limited(Weight::from_parts(399_600_000_000, 0)) )); @@ -266,7 +278,7 @@ fn transfer_from_other_parachain_and_back() { } ) ) - .into() + .into_versioned() ), WeightLimit::Limited(Weight::from_parts(399_600_000_000, 0)) )); @@ -296,7 +308,10 @@ fn other_parachain_should_fail_to_send_asset_to_basilisk_when_insufficient_amoun assert_ok!(basilisk_runtime::AssetRegistry::set_location( basilisk_runtime::RuntimeOrigin::root(), 1, - basilisk_runtime::AssetLocation(MultiLocation::new(1, X2(Parachain(OTHER_PARA_ID), GeneralIndex(0)))) + basilisk_runtime::AssetLocation(MultiLocation::new( + 1, + X2(Junction::Parachain(OTHER_PARA_ID), Junction::GeneralIndex(0)) + )) )); }); @@ -320,7 +335,7 @@ fn other_parachain_should_fail_to_send_asset_to_basilisk_when_insufficient_amoun Junction::AccountId32 { id: BOB, network: None } ) ) - .into() + .into_versioned() ), WeightLimit::Limited(Weight::from_parts(399_600_000_000, 0)) ), @@ -341,7 +356,6 @@ fn other_parachain_should_fail_to_send_asset_to_basilisk_when_insufficient_amoun ); }); } - #[test] fn fee_currency_set_on_xcm_transfer() { TestNet::reset(); @@ -354,7 +368,10 @@ fn fee_currency_set_on_xcm_transfer() { assert_ok!(basilisk_runtime::AssetRegistry::set_location( basilisk_runtime::RuntimeOrigin::root(), 1, - basilisk_runtime::AssetLocation(MultiLocation::new(1, X2(Parachain(OTHER_PARA_ID), GeneralIndex(0)))) + basilisk_runtime::AssetLocation(MultiLocation::new( + 1, + X2(Junction::Parachain(OTHER_PARA_ID), Junction::GeneralIndex(0)) + )) )); // fee currency is not set before XCM transfer @@ -380,7 +397,7 @@ fn fee_currency_set_on_xcm_transfer() { } ) ) - .into() + .into_versioned() ), WeightLimit::Limited(Weight::from_parts(399_600_000_000, 0)) )); @@ -425,7 +442,7 @@ fn assets_should_be_trapped_when_assets_are_unknown() { Junction::AccountId32 { id: BOB, network: None } ) ) - .into() + .into_versioned() ), WeightLimit::Limited(Weight::from_parts(399_600_000_000, 0)) )); @@ -436,25 +453,32 @@ fn assets_should_be_trapped_when_assets_are_unknown() { }); Basilisk::execute_with(|| { - expect_basilisk_events(vec![ - cumulus_pallet_xcmp_queue::Event::Fail { - message_hash: hex!["30291d1dfb68ae6f66d4c841facb78f44e7611ab2a25c84f4fb7347f448d2944"], - message_id: hex!["30291d1dfb68ae6f66d4c841facb78f44e7611ab2a25c84f4fb7347f448d2944"], - error: XcmError::AssetNotFound, - weight: Weight::from_parts(300_000_000, 0), - } - .into(), - pallet_relaychain_info::Event::CurrentBlockNumbers { - parachain_block_number: 3, - relaychain_block_number: 5, - } - .into(), - ]); - let origin = MultiLocation::new(1, X1(Parachain(OTHER_PARA_ID))); - let loc = MultiLocation::new(1, X2(Parachain(OTHER_PARA_ID), GeneralIndex(0))); - let asset: MultiAsset = (loc, 30 * UNITS).into(); - let hash = determine_hash(&origin, vec![asset]); + assert_xcm_message_processing_failed(); + let origin = MultiLocation::new(1, X1(Junction::Parachain(OTHER_PARA_ID))); + let asset: Asset = Asset { + id: cumulus_primitives_core::AssetId(Location::new( + 1, + cumulus_primitives_core::Junctions::X2(Arc::new( + vec![ + cumulus_primitives_core::Junction::Parachain(OTHER_PARA_ID), + cumulus_primitives_core::Junction::GeneralIndex(0), + ] + .try_into() + .unwrap(), + )), + )), + fun: Fungible(30 * UNITS), + }; + let hash = determine_hash(&origin, vec![asset.clone()]); assert_eq!(basilisk_runtime::PolkadotXcm::asset_trap(hash), 1); + + expect_basilisk_event(basilisk_runtime::RuntimeEvent::PolkadotXcm( + pallet_xcm::Event::AssetsTrapped { + hash: hash, + origin: origin.try_into().unwrap(), + assets: vec![asset].into(), + }, + )) }); } @@ -470,11 +494,23 @@ fn claim_trapped_asset_should_work() { assert_ok!(basilisk_runtime::AssetRegistry::set_location( basilisk_runtime::RuntimeOrigin::root(), 1, - basilisk_runtime::AssetLocation(MultiLocation::new(1, X2(Parachain(OTHER_PARA_ID), GeneralIndex(0)))) + basilisk_runtime::AssetLocation(MultiLocation::new( + 1, + X2(Junction::Parachain(OTHER_PARA_ID), Junction::GeneralIndex(0)) + )) )); }); - claim_asset(asset.clone(), BOB); + let bob_loc = Location::new( + 0, + cumulus_primitives_core::Junctions::X1(Arc::new( + vec![cumulus_primitives_core::Junction::AccountId32 { id: BOB, network: None }] + .try_into() + .unwrap(), + )), + ); + + claim_asset(asset.clone(), bob_loc); Basilisk::execute_with(|| { assert_eq!( @@ -482,13 +518,13 @@ fn claim_trapped_asset_should_work() { 1000 * UNITS + 29_999_992_361_112u128 ); - let origin = MultiLocation::new(1, X1(Parachain(OTHER_PARA_ID))); + let origin = MultiLocation::new(1, X1(Junction::Parachain(OTHER_PARA_ID))); let hash = determine_hash(&origin, vec![asset]); assert_eq!(basilisk_runtime::PolkadotXcm::asset_trap(hash), 0); }); } -fn trap_asset() -> MultiAsset { +fn trap_asset() -> Asset { OtherParachain::execute_with(|| { assert_eq!( basilisk_runtime::Balances::free_balance(AccountId::from(ALICE)), @@ -506,7 +542,7 @@ fn trap_asset() -> MultiAsset { Junction::AccountId32 { id: BOB, network: None } ) ) - .into() + .into_versioned() ), WeightLimit::Limited(Weight::from_parts(399_600_000_000, 0)) )); @@ -516,43 +552,33 @@ fn trap_asset() -> MultiAsset { ); }); - let loc = MultiLocation::new(1, X2(Parachain(OTHER_PARA_ID), GeneralIndex(0))); - let asset: MultiAsset = (loc, 30 * UNITS).into(); + let asset: Asset = Asset { + id: cumulus_primitives_core::AssetId(Location::new( + 1, + cumulus_primitives_core::Junctions::X2(Arc::new( + vec![ + cumulus_primitives_core::Junction::Parachain(OTHER_PARA_ID), + cumulus_primitives_core::Junction::GeneralIndex(0), + ] + .try_into() + .unwrap(), + )), + )), + fun: Fungible(30 * UNITS), + }; Basilisk::execute_with(|| { - expect_basilisk_events(vec![ - cumulus_pallet_xcmp_queue::Event::Fail { - message_hash: hex!["30291d1dfb68ae6f66d4c841facb78f44e7611ab2a25c84f4fb7347f448d2944"], - message_id: hex!["30291d1dfb68ae6f66d4c841facb78f44e7611ab2a25c84f4fb7347f448d2944"], - error: XcmError::AssetNotFound, - weight: Weight::from_parts(300_000_000, 0), - } - .into(), - pallet_relaychain_info::Event::CurrentBlockNumbers { - parachain_block_number: 3, - relaychain_block_number: 5, - } - .into(), - ]); - let origin = MultiLocation::new(1, X1(Parachain(OTHER_PARA_ID))); - let loc = MultiLocation::new(1, X2(Parachain(OTHER_PARA_ID), GeneralIndex(0))); - let asset: MultiAsset = (loc, 30 * UNITS).into(); - let hash = determine_hash(&origin, vec![asset]); + assert_xcm_message_processing_failed(); + let origin = MultiLocation::new(1, X1(Junction::Parachain(OTHER_PARA_ID))); + let hash = determine_hash(&origin, vec![asset.clone()]); assert_eq!(basilisk_runtime::PolkadotXcm::asset_trap(hash), 1); }); asset } -fn claim_asset(asset: MultiAsset, recipient: [u8; 32]) { +fn claim_asset(asset: Asset, recipient: Location) { OtherParachain::execute_with(|| { - let recipient = MultiLocation::new( - 0, - X1(Junction::AccountId32 { - network: None, - id: recipient, - }), - ); let xcm_msg = Xcm(vec![ ClaimAsset { assets: vec![asset.clone()].into(), @@ -569,7 +595,7 @@ fn claim_asset(asset: MultiAsset, recipient: [u8; 32]) { ]); assert_ok!(basilisk_runtime::PolkadotXcm::send( basilisk_runtime::RuntimeOrigin::root(), - Box::new(MultiLocation::new(1, X1(Parachain(BASILISK_PARA_ID))).into()), + Box::new(MultiLocation::new(1, X1(Junction::Parachain(BASILISK_PARA_ID))).into_versioned()), Box::new(VersionedXcm::from(xcm_msg)) )); }); @@ -580,19 +606,19 @@ fn polkadot_xcm_execute_extrinsic_should_not_be_allowed() { TestNet::reset(); Basilisk::execute_with(|| { - let message = VersionedXcm::V3(Xcm(vec![ + let xcm_msg = Xcm(vec![ WithdrawAsset((Here, 410000000000u128).into()), BuyExecution { fees: (Here, 400000000000u128).into(), weight_limit: Unlimited, }, ClearError, - ])); + ]); assert_noop!( basilisk_runtime::PolkadotXcm::execute( basilisk_runtime::RuntimeOrigin::signed(ALICE.into()), - Box::new(message), + Box::new(VersionedXcm::from(xcm_msg)), Weight::from_parts(400_000_000_000, 0) ), pallet_xcm::Error::::Filtered diff --git a/integration-tests/src/exchange_asset.rs b/integration-tests/src/exchange_asset.rs index ca0c9692108..dffbbe24eec 100644 --- a/integration-tests/src/exchange_asset.rs +++ b/integration-tests/src/exchange_asset.rs @@ -5,16 +5,20 @@ use basilisk_runtime::Currencies; use basilisk_runtime::RuntimeOrigin; use basilisk_runtime::XYK; use frame_support::dispatch::GetDispatchInfo; -use frame_support::weights::Weight; use frame_support::{assert_ok, pallet_prelude::*}; use hydradx_traits::router::AssetPair; use hydradx_traits::router::PoolType; use hydradx_traits::router::Trade; use orml_traits::currency::MultiCurrency; -use polkadot_xcm::{latest::prelude::*, VersionedXcm}; +use polkadot_xcm::{ + opaque::v3::{Junction, Junctions::X2, MultiLocation}, + v4::prelude::*, + VersionedXcm, +}; use pretty_assertions::assert_eq; use primitives::constants::chain::CORE_ASSET_ID; use sp_runtime::FixedU128; +use sp_std::sync::Arc; use xcm_emulator::TestExt; pub const SELL: bool = true; @@ -34,11 +38,14 @@ fn basilisk_should_swap_assets_when_receiving_from_otherchain_with_sell() { }); OtherParachain::execute_with(|| { - let xcm = craft_exchange_asset_xcm::<_, basilisk_runtime::RuntimeCall>( - MultiAsset::from((GeneralIndex(0), 5 * UNITS)), - MultiAsset::from((GeneralIndex(CORE_ASSET_ID.into()), 2 * UNITS)), - SELL, - ); + let sell_amount: Asset = Asset::from((cumulus_primitives_core::Junction::GeneralIndex(0), 5 * UNITS)); + + let min_amount_out = Asset::from(( + cumulus_primitives_core::Junction::GeneralIndex(CORE_ASSET_ID.into()), + 2 * UNITS, + )); + + let xcm = craft_exchange_asset_xcm::<_, basilisk_runtime::RuntimeCall>(sell_amount, min_amount_out, SELL); //Act let res = basilisk_runtime::PolkadotXcm::execute( basilisk_runtime::RuntimeOrigin::signed(ALICE.into()), @@ -98,11 +105,13 @@ fn basilisk_should_swap_assets_when_receiving_from_otherchain_with_buy() { let amount_out = 20 * UNITS; OtherParachain::execute_with(|| { - let xcm = craft_exchange_asset_xcm::<_, basilisk_runtime::RuntimeCall>( - MultiAsset::from((GeneralIndex(0), 70 * UNITS)), - MultiAsset::from((GeneralIndex(CORE_ASSET_ID.into()), amount_out)), - BUY, - ); + let max_amount_in: Asset = Asset::from((cumulus_primitives_core::Junction::GeneralIndex(0), 70 * UNITS)); + let amount_out_asset: Asset = Asset::from(( + cumulus_primitives_core::Junction::GeneralIndex(CORE_ASSET_ID.into()), + amount_out, + )); + + let xcm = craft_exchange_asset_xcm::<_, basilisk_runtime::RuntimeCall>(max_amount_in, amount_out_asset, BUY); //Act let res = basilisk_runtime::PolkadotXcm::execute( basilisk_runtime::RuntimeOrigin::signed(ALICE.into()), @@ -125,23 +134,14 @@ fn basilisk_should_swap_assets_when_receiving_from_otherchain_with_buy() { )); }); - let fees = 27_500_000_000_000; - let amount_in = 41_791_666_666_665; - Basilisk::execute_with(|| { - assert_eq!( - basilisk_runtime::Tokens::free_balance(KAR, &AccountId::from(BOB)), - 100 * UNITS - amount_in - fees - ); + let fees = basilisk_runtime::Tokens::free_balance(KAR, &basilisk_runtime::Treasury::account_id()); + assert!(fees > 0, "Fees are not sent to treasury"); assert_eq!( basilisk_runtime::Balances::free_balance(AccountId::from(BOB)), BOB_INITIAL_BSX_BALANCE + amount_out ); - assert_eq!( - basilisk_runtime::Tokens::free_balance(KAR, &basilisk_runtime::Treasury::account_id()), - fees - ); }); } @@ -160,7 +160,10 @@ fn basilisk_should_swap_assets_coming_from_karura_when_onchain_route_present() { assert_ok!(basilisk_runtime::AssetRegistry::set_location( basilisk_runtime::RuntimeOrigin::root(), KSM, - basilisk_runtime::AssetLocation(MultiLocation::new(0, X1(GeneralIndex(3)))) + basilisk_runtime::AssetLocation(MultiLocation::new( + 0, + polkadot_xcm::opaque::v3::Junctions::X1(polkadot_xcm::opaque::v3::Junction::GeneralIndex(3)) + )) )); //Register onchain route from KAR to KSM @@ -185,11 +188,11 @@ fn basilisk_should_swap_assets_coming_from_karura_when_onchain_route_present() { }); OtherParachain::execute_with(|| { - let xcm = craft_exchange_asset_xcm::<_, basilisk_runtime::RuntimeCall>( - MultiAsset::from((GeneralIndex(0), 5 * UNITS)), - MultiAsset::from((GeneralIndex(KSM.into()), 2 * UNITS)), - SELL, - ); + let amount_in: Asset = Asset::from((cumulus_primitives_core::Junction::GeneralIndex(0), 5 * UNITS)); + let min_amount_out: Asset = + Asset::from((cumulus_primitives_core::Junction::GeneralIndex(KSM.into()), 2 * UNITS)); + + let xcm = craft_exchange_asset_xcm::<_, basilisk_runtime::RuntimeCall>(amount_in, min_amount_out, SELL); //Act let res = basilisk_runtime::PolkadotXcm::execute( basilisk_runtime::RuntimeOrigin::signed(ALICE.into()), @@ -240,7 +243,7 @@ fn register_kar() { None, Some(basilisk_runtime::AssetLocation(MultiLocation::new( 1, - X2(Parachain(OTHER_PARA_ID), GeneralIndex(0)) + X2(Junction::Parachain(OTHER_PARA_ID), Junction::GeneralIndex(0)) ))), None )); @@ -257,30 +260,58 @@ fn add_currency_price(asset_id: u32, price: FixedU128) { basilisk_runtime::MultiTransactionPayment::on_initialize(basilisk_runtime::System::block_number()); } -fn craft_exchange_asset_xcm, RC: Decode + GetDispatchInfo>( - give: MultiAsset, +fn craft_exchange_asset_xcm, RC: Decode + GetDispatchInfo>( + give: Asset, want: M, is_sell: bool, ) -> VersionedXcm { - use kusama_runtime::xcm_config::BaseXcmWeight; + use rococo_runtime::xcm_config::BaseXcmWeight; use xcm_builder::FixedWeightBounds; use xcm_executor::traits::WeightBounds; type Weigher = FixedWeightBounds>; - let dest = MultiLocation::new(1, Parachain(BASILISK_PARA_ID)); - let beneficiary = Junction::AccountId32 { id: BOB, network: None }.into(); - let assets: MultiAssets = MultiAsset::from((GeneralIndex(0), 100 * UNITS)).into(); // hardcoded + let dest = Location::new( + 1, + cumulus_primitives_core::Junctions::X1(Arc::new( + vec![cumulus_primitives_core::Junction::Parachain(BASILISK_PARA_ID)] + .try_into() + .unwrap(), + )), + ); + + let beneficiary = Location::new( + 0, + cumulus_primitives_core::Junctions::X1(Arc::new( + vec![cumulus_primitives_core::Junction::AccountId32 { id: BOB, network: None }] + .try_into() + .unwrap(), + )), + ); + + let assets: Assets = Assets::from(Asset::from(( + cumulus_primitives_core::Junction::GeneralIndex(0), + 100 * UNITS, + ))); + let max_assets = assets.len() as u32 + 1; - let context = X2(GlobalConsensus(NetworkId::Polkadot), Parachain(OTHER_PARA_ID)); + let context = cumulus_primitives_core::Junctions::X2(Arc::new( + vec![ + cumulus_primitives_core::Junction::GlobalConsensus(NetworkId::Polkadot), + cumulus_primitives_core::Junction::Parachain(OTHER_PARA_ID), + ] + .try_into() + .unwrap(), + )); + let fees = assets .get(0) .expect("should have at least 1 asset") .clone() - .reanchored(&dest, context) + .reanchored(&dest, &context) .expect("should reanchor"); - let give = give.reanchored(&dest, context).expect("should reanchor give"); - let give: MultiAssetFilter = Definite(give.into()); + let give = give.reanchored(&dest, &context).expect("should reanchor give"); + let give: AssetFilter = Definite(give.into()); let want = want.into(); let weight_limit = { let fees = fees.clone(); @@ -298,7 +329,7 @@ fn craft_exchange_asset_xcm, RC: Decode + GetDispatchInfo>( }, DepositAsset { assets: Wild(AllCounted(max_assets)), - beneficiary, + beneficiary: beneficiary.clone(), }, ]); // use local weight for remote message and hope for the best. @@ -323,7 +354,7 @@ fn craft_exchange_asset_xcm, RC: Decode + GetDispatchInfo>( SetFeesMode { jit_withdraw: true }, TransferReserveAsset { assets, dest, xcm }, ]); - VersionedXcm::V3(message) + VersionedXcm::from(message) } pub fn last_other_para_events(n: usize) -> Vec { diff --git a/integration-tests/src/kusama_test_net.rs b/integration-tests/src/kusama_test_net.rs index ebc15282f6d..0bfedca8d11 100644 --- a/integration-tests/src/kusama_test_net.rs +++ b/integration-tests/src/kusama_test_net.rs @@ -48,7 +48,7 @@ use frame_support::assert_ok; use frame_support::traits::OnInitialize; use pallet_transaction_multi_payment::Price; pub use pallet_xyk::types::AssetPair; -use polkadot_primitives::v5::{BlockNumber, MAX_CODE_SIZE, MAX_POV_SIZE}; +use polkadot_primitives::v6::{BlockNumber, MAX_CODE_SIZE, MAX_POV_SIZE}; use polkadot_runtime_parachains::configuration::HostConfiguration; use pretty_assertions::assert_eq; use primitives::{AssetId, Balance}; @@ -57,28 +57,42 @@ use sp_runtime::{traits::AccountIdConversion, BuildStorage}; use primitives::constants::chain::CORE_ASSET_ID; pub use xcm_emulator::Network; -use xcm_emulator::{decl_test_networks, decl_test_parachains, decl_test_relay_chains, DefaultMessageProcessor}; +use xcm_emulator::{decl_test_networks, decl_test_parachains, decl_test_relay_chains}; + +pub type Rococo = RococoRelayChain; +pub type Basilisk = BasiliskParachain; +pub type OtherParachain = OtherPara; + +decl_test_networks! { + pub struct TestNet { + relay_chain = RococoRelayChain, + parachains = vec![ + OtherPara, + BasiliskParachain, + ], + bridge = () + }, +} decl_test_relay_chains! { - #[api_version(5)] - pub struct Kusama { - genesis = kusama::genesis(), + #[api_version(10)] + pub struct RococoRelayChain { + genesis = rococo::genesis(), on_init = (), - runtime = kusama_runtime, + runtime = rococo_runtime, core = { - MessageProcessor: DefaultMessageProcessor, - SovereignAccountOf: kusama_runtime::xcm_config::SovereignAccountOf, + SovereignAccountOf: rococo_runtime::xcm_config::LocationConverter, }, pallets = { - XcmPallet: kusama_runtime::XcmPallet, - Balances: kusama_runtime::Balances, - Hrmp: kusama_runtime::Hrmp, + XcmPallet: rococo_runtime::XcmPallet, + Balances: rococo_runtime::Balances, + Hrmp: rococo_runtime::Hrmp, } } } decl_test_parachains! { - pub struct Basilisk { + pub struct BasiliskParachain { genesis = basilisk::genesis(), on_init = { basilisk_runtime::System::set_block_number(1); @@ -88,16 +102,16 @@ decl_test_parachains! { runtime = basilisk_runtime, core = { XcmpMessageHandler: basilisk_runtime::XcmpQueue, - DmpMessageHandler: basilisk_runtime::DmpQueue, LocationToAccountId: basilisk_runtime::xcm::LocationToAccountId, ParachainInfo: basilisk_runtime::ParachainInfo, + MessageOrigin: cumulus_primitives_core::AggregateMessageOrigin, }, pallets = { PolkadotXcm: basilisk_runtime::PolkadotXcm, Balances: basilisk_runtime::Balances, } }, - pub struct OtherParachain { + pub struct OtherPara { genesis = other_parachain::genesis(), on_init = { basilisk_runtime::System::set_block_number(1); @@ -107,9 +121,9 @@ decl_test_parachains! { runtime = basilisk_runtime, core = { XcmpMessageHandler: basilisk_runtime::XcmpQueue, - DmpMessageHandler: basilisk_runtime::DmpQueue, LocationToAccountId: basilisk_runtime::LocationToAccountId, ParachainInfo: basilisk_runtime::ParachainInfo, + MessageOrigin: cumulus_primitives_core::AggregateMessageOrigin, }, pallets = { PolkadotXcm: basilisk_runtime::PolkadotXcm, @@ -118,18 +132,7 @@ decl_test_parachains! { } } -decl_test_networks! { - pub struct TestNet { - relay_chain = Kusama, - parachains = vec![ - OtherParachain, - Basilisk, - ], - bridge = () - }, -} - -pub mod kusama { +pub mod rococo { use super::*; fn get_host_configuration() -> HostConfiguration { @@ -166,7 +169,6 @@ pub mod kusama { } } - use pallet_im_online::sr25519::AuthorityId as ImOnlineId; use polkadot_primitives::{AssignmentId, ValidatorId}; use polkadot_service::chain_spec::get_authority_keys_from_seed_no_beefy; use sc_consensus_grandpa::AuthorityId as GrandpaId; @@ -186,16 +188,14 @@ pub mod kusama { fn session_keys( babe: BabeId, grandpa: GrandpaId, - im_online: ImOnlineId, para_validator: ValidatorId, para_assignment: AssignmentId, authority_discovery: AuthorityDiscoveryId, beefy: BeefyId, - ) -> kusama_runtime::SessionKeys { - kusama_runtime::SessionKeys { + ) -> rococo_runtime::SessionKeys { + rococo_runtime::SessionKeys { babe, grandpa, - im_online, para_validator, para_assignment, authority_discovery, @@ -208,23 +208,34 @@ pub mod kusama { AccountId, BabeId, GrandpaId, - ImOnlineId, ValidatorId, AssignmentId, AuthorityDiscoveryId, + BeefyId, )> { - vec![get_authority_keys_from_seed_no_beefy("Alice")] + let no_beefy = get_authority_keys_from_seed_no_beefy("Alice"); + let with_beefy = ( + no_beefy.0, + no_beefy.1, + no_beefy.2, + no_beefy.3, + no_beefy.4, + no_beefy.5, + no_beefy.6, + get_from_seed::("Alice"), + ); + vec![with_beefy] } pub fn genesis() -> Storage { - let genesis_config = kusama_runtime::RuntimeGenesisConfig { - balances: kusama_runtime::BalancesConfig { + let genesis_config = rococo_runtime::RuntimeGenesisConfig { + balances: rococo_runtime::BalancesConfig { balances: vec![ (AccountId::from(ALICE), 2002 * UNITS), (ParaId::from(BASILISK_PARA_ID).into_account_truncating(), 10 * UNITS), ], }, - session: kusama_runtime::SessionConfig { + session: rococo_runtime::SessionConfig { keys: initial_authorities() .iter() .map(|x| { @@ -238,22 +249,21 @@ pub mod kusama { x.5.clone(), x.6.clone(), x.7.clone(), - get_from_seed::("Alice"), ), ) }) .collect::>(), }, - babe: kusama_runtime::BabeConfig { + babe: rococo_runtime::BabeConfig { authorities: Default::default(), - epoch_config: Some(kusama_runtime::BABE_GENESIS_EPOCH_CONFIG), + epoch_config: Some(rococo_runtime::BABE_GENESIS_EPOCH_CONFIG), ..Default::default() }, - configuration: kusama_runtime::ConfigurationConfig { + configuration: rococo_runtime::ConfigurationConfig { config: get_host_configuration(), }, - xcm_pallet: kusama_runtime::XcmPalletConfig { + xcm_pallet: rococo_runtime::XcmPalletConfig { safe_xcm_version: Some(3), ..Default::default() }, @@ -470,10 +480,24 @@ pub fn last_basilisk_events(n: usize) -> Vec { .collect() } +#[allow(dead_code)] pub fn expect_basilisk_events(e: Vec) { assert_eq!(last_basilisk_events(e.len()), e); } +pub fn expect_basilisk_event(e: basilisk_runtime::RuntimeEvent) { + let last_10_events = last_basilisk_events(10); + let mut found = false; + for event in last_10_events { + if event == e { + found = true; + break; + } + } + assert!(found, "Event not found in the last 10 basilisk events"); +} + +#[allow(dead_code)] pub fn last_parachain_events(n: usize) -> Vec { frame_system::Pallet::::events() .into_iter() @@ -492,7 +516,7 @@ pub fn set_relaychain_block_number(number: BlockNumber) { use basilisk_runtime::ParachainSystem; use basilisk_runtime::RuntimeOrigin; - kusama_run_to_block(number); //We need to set block number this way as well because tarpaulin code coverage tool does not like the way how we set the block number with `cumulus-test-relay-sproof-builder` package + rococo_run_to_block(number); //We need to set block number this way as well because tarpaulin code coverage tool does not like the way how we set the block number with `cumulus-test-relay-sproof-builder` package ParachainSystem::on_initialize(number); @@ -514,13 +538,29 @@ pub fn set_relaychain_block_number(number: BlockNumber) { )); } -pub fn kusama_run_to_block(to: BlockNumber) { +pub fn rococo_run_to_block(to: BlockNumber) { use frame_support::traits::OnFinalize; - while kusama_runtime::System::block_number() < to { - let b = kusama_runtime::System::block_number(); - kusama_runtime::System::on_finalize(b); - kusama_runtime::System::on_initialize(b + 1); - kusama_runtime::System::set_block_number(b + 1); + while rococo_runtime::System::block_number() < to { + let b = rococo_runtime::System::block_number(); + rococo_runtime::System::on_finalize(b); + rococo_runtime::System::on_initialize(b + 1); + rococo_runtime::System::set_block_number(b + 1); } } + +use xcm_emulator::pallet_message_queue; + +pub fn assert_xcm_message_processing_failed() { + assert!(basilisk_runtime::System::events().iter().any(|r| matches!( + r.event, + basilisk_runtime::RuntimeEvent::MessageQueue(pallet_message_queue::Event::Processed { success: false, .. }) + ))); +} + +pub fn assert_xcm_message_processing_passed() { + assert!(basilisk_runtime::System::events().iter().any(|r| matches!( + r.event, + basilisk_runtime::RuntimeEvent::MessageQueue(pallet_message_queue::Event::Processed { success: true, .. }) + ))); +} diff --git a/integration-tests/src/lib.rs b/integration-tests/src/lib.rs index e877e58f7be..1a05d15f31b 100644 --- a/integration-tests/src/lib.rs +++ b/integration-tests/src/lib.rs @@ -13,5 +13,4 @@ mod oracle; mod router; mod transact_call_filter; mod vesting; -mod xcm_rate_limiter; mod xyk; diff --git a/integration-tests/src/non_native_fee.rs b/integration-tests/src/non_native_fee.rs index be98b2dc9cb..7415109052e 100644 --- a/integration-tests/src/non_native_fee.rs +++ b/integration-tests/src/non_native_fee.rs @@ -25,12 +25,12 @@ pub fn basilisk_run_to_next_block() { let b = basilisk_runtime::System::block_number(); basilisk_runtime::System::on_finalize(b); - basilisk_runtime::MultiTransactionPayment::on_finalize(b); basilisk_runtime::EmaOracle::on_finalize(b); + basilisk_runtime::MultiTransactionPayment::on_finalize(b); basilisk_runtime::System::on_initialize(b + 1); - basilisk_runtime::MultiTransactionPayment::on_initialize(b + 1); basilisk_runtime::EmaOracle::on_initialize(b + 1); + basilisk_runtime::MultiTransactionPayment::on_initialize(b + 1); basilisk_runtime::System::set_block_number(b + 1); } diff --git a/integration-tests/src/router.rs b/integration-tests/src/router.rs index a89d85301b0..c5a774c025d 100644 --- a/integration-tests/src/router.rs +++ b/integration-tests/src/router.rs @@ -23,7 +23,7 @@ pub const SALE_END: Option = Some(40); mod router_different_pools_tests { use crate::kusama_test_net::*; - use basilisk_runtime::{Router, RuntimeOrigin}; + use basilisk_runtime::Router; use xcm_emulator::TestExt; use frame_support::assert_ok; @@ -82,7 +82,7 @@ mod router_different_pools_tests { assert_trader_non_native_balance!(BOB_INITIAL_NEW_BOOTSTRAPPED_TOKEN_BALANCE, NEW_BOOTSTRAPPED_TOKEN); assert_trader_non_native_balance!(amount_out, KSM); - expect_basilisk_events(vec![pallet_route_executor::Event::RouteExecuted { + expect_basilisk_events(vec![pallet_route_executor::Event::Executed { asset_in: AUSD, asset_out: KSM, amount_in: amount_to_sell, @@ -142,7 +142,7 @@ mod router_different_pools_tests { assert_trader_non_native_balance!(BOB_INITIAL_NEW_BOOTSTRAPPED_TOKEN_BALANCE, NEW_BOOTSTRAPPED_TOKEN); assert_trader_non_native_balance!(amount_to_buy, KSM); - expect_basilisk_events(vec![pallet_route_executor::Event::RouteExecuted { + expect_basilisk_events(vec![pallet_route_executor::Event::Executed { asset_in: AUSD, asset_out: KSM, amount_in, @@ -156,7 +156,7 @@ mod router_different_pools_tests { mod xyk_router_tests { use crate::kusama_test_net::*; - use basilisk_runtime::{Router, RuntimeOrigin}; + use basilisk_runtime::Router; use xcm_emulator::TestExt; use frame_support::{assert_noop, assert_ok}; @@ -200,7 +200,7 @@ mod xyk_router_tests { assert_trader_bsx_balance!(BOB_INITIAL_BSX_BALANCE - amount_to_sell); assert_trader_non_native_balance!(amount_out, KSM); - expect_basilisk_events(vec![pallet_route_executor::Event::RouteExecuted { + expect_basilisk_events(vec![pallet_route_executor::Event::Executed { asset_in: BSX, asset_out: KSM, amount_in: amount_to_sell, @@ -262,7 +262,7 @@ mod xyk_router_tests { assert_trader_non_native_balance!(BOB_INITIAL_AUSD_BALANCE, AUSD); assert_trader_non_native_balance!(0, MOVR); - expect_basilisk_events(vec![pallet_route_executor::Event::RouteExecuted { + expect_basilisk_events(vec![pallet_route_executor::Event::Executed { asset_in: BSX, asset_out: KSM, amount_in: amount_to_sell, @@ -484,7 +484,7 @@ mod xyk_router_tests { assert_trader_bsx_balance!(BOB_INITIAL_BSX_BALANCE - amount_in); assert_trader_non_native_balance!(amount_to_buy, KSM); - expect_basilisk_events(vec![pallet_route_executor::Event::RouteExecuted { + expect_basilisk_events(vec![pallet_route_executor::Event::Executed { asset_in: BSX, asset_out: KSM, amount_in, @@ -539,7 +539,7 @@ mod xyk_router_tests { assert_trader_non_native_balance!(BOB_INITIAL_AUSD_BALANCE + amount_to_buy, AUSD); assert_trader_non_native_balance!(0, KSM); - expect_basilisk_events(vec![pallet_route_executor::Event::RouteExecuted { + expect_basilisk_events(vec![pallet_route_executor::Event::Executed { asset_in: BSX, asset_out: AUSD, amount_in, @@ -602,7 +602,7 @@ mod xyk_router_tests { assert_trader_non_native_balance!(0, MOVR); assert_trader_non_native_balance!(0, KSM); - expect_basilisk_events(vec![pallet_route_executor::Event::RouteExecuted { + expect_basilisk_events(vec![pallet_route_executor::Event::Executed { asset_in: BSX, asset_out: AUSD, amount_in, @@ -794,7 +794,7 @@ mod xyk_router_tests { mod lbp_router_tests { use crate::kusama_test_net::*; - use basilisk_runtime::{Router, RuntimeOrigin, LBP}; + use basilisk_runtime::Router; use xcm_emulator::TestExt; use frame_support::assert_ok; @@ -840,7 +840,7 @@ mod lbp_router_tests { NEW_BOOTSTRAPPED_TOKEN ); - expect_basilisk_events(vec![pallet_route_executor::Event::RouteExecuted { + expect_basilisk_events(vec![pallet_route_executor::Event::Executed { asset_in: BSX, asset_out: NEW_BOOTSTRAPPED_TOKEN, amount_in: amount_to_sell, @@ -887,7 +887,7 @@ mod lbp_router_tests { ); assert_trader_bsx_balance!(BOB_INITIAL_BSX_BALANCE + amount_out); - expect_basilisk_events(vec![pallet_route_executor::Event::RouteExecuted { + expect_basilisk_events(vec![pallet_route_executor::Event::Executed { asset_in: NEW_BOOTSTRAPPED_TOKEN, asset_out: BSX, amount_in: amount_to_sell, @@ -940,7 +940,7 @@ mod lbp_router_tests { assert_trader_non_native_balance!(BOB_INITIAL_NEW_BOOTSTRAPPED_TOKEN_BALANCE, NEW_BOOTSTRAPPED_TOKEN); assert_trader_non_native_balance!(amount_out, KSM); - expect_basilisk_events(vec![pallet_route_executor::Event::RouteExecuted { + expect_basilisk_events(vec![pallet_route_executor::Event::Executed { asset_in: BSX, asset_out: KSM, amount_in: amount_to_sell, @@ -993,7 +993,7 @@ mod lbp_router_tests { assert_trader_non_native_balance!(BOB_INITIAL_NEW_BOOTSTRAPPED_TOKEN_BALANCE, NEW_BOOTSTRAPPED_TOKEN); assert_trader_non_native_balance!(amount_out, KSM); - expect_basilisk_events(vec![pallet_route_executor::Event::RouteExecuted { + expect_basilisk_events(vec![pallet_route_executor::Event::Executed { asset_in: BSX, asset_out: KSM, amount_in: amount_to_sell, @@ -1040,7 +1040,7 @@ mod lbp_router_tests { NEW_BOOTSTRAPPED_TOKEN ); - expect_basilisk_events(vec![pallet_route_executor::Event::RouteExecuted { + expect_basilisk_events(vec![pallet_route_executor::Event::Executed { asset_in: BSX, asset_out: NEW_BOOTSTRAPPED_TOKEN, amount_in: amount_to_sell, @@ -1112,7 +1112,7 @@ mod lbp_router_tests { NEW_BOOTSTRAPPED_TOKEN ); - expect_basilisk_events(vec![pallet_route_executor::Event::RouteExecuted { + expect_basilisk_events(vec![pallet_route_executor::Event::Executed { asset_in: BSX, asset_out: NEW_BOOTSTRAPPED_TOKEN, amount_in, @@ -1159,7 +1159,7 @@ mod lbp_router_tests { NEW_BOOTSTRAPPED_TOKEN ); - expect_basilisk_events(vec![pallet_route_executor::Event::RouteExecuted { + expect_basilisk_events(vec![pallet_route_executor::Event::Executed { asset_in: NEW_BOOTSTRAPPED_TOKEN, asset_out: BSX, amount_in, @@ -1212,7 +1212,7 @@ mod lbp_router_tests { assert_trader_non_native_balance!(BOB_INITIAL_NEW_BOOTSTRAPPED_TOKEN_BALANCE, NEW_BOOTSTRAPPED_TOKEN); assert_trader_non_native_balance!(amount_to_buy, KSM); - expect_basilisk_events(vec![pallet_route_executor::Event::RouteExecuted { + expect_basilisk_events(vec![pallet_route_executor::Event::Executed { asset_in: BSX, asset_out: KSM, amount_in, @@ -1265,7 +1265,7 @@ mod lbp_router_tests { assert_trader_non_native_balance!(BOB_INITIAL_NEW_BOOTSTRAPPED_TOKEN_BALANCE, NEW_BOOTSTRAPPED_TOKEN); assert_trader_non_native_balance!(amount_to_buy, KSM); - expect_basilisk_events(vec![pallet_route_executor::Event::RouteExecuted { + expect_basilisk_events(vec![pallet_route_executor::Event::Executed { asset_in: BSX, asset_out: KSM, amount_in, @@ -1312,7 +1312,7 @@ mod lbp_router_tests { NEW_BOOTSTRAPPED_TOKEN ); - expect_basilisk_events(vec![pallet_route_executor::Event::RouteExecuted { + expect_basilisk_events(vec![pallet_route_executor::Event::Executed { asset_in: BSX, asset_out: NEW_BOOTSTRAPPED_TOKEN, amount_in: spent_amount_in, diff --git a/integration-tests/src/transact_call_filter.rs b/integration-tests/src/transact_call_filter.rs index a0bb626b355..d232e07ad75 100644 --- a/integration-tests/src/transact_call_filter.rs +++ b/integration-tests/src/transact_call_filter.rs @@ -1,63 +1,72 @@ #![cfg(test)] use crate::kusama_test_net::*; -use frame_support::{assert_ok, dispatch::GetDispatchInfo, weights::Weight}; +use frame_support::{assert_ok, dispatch::GetDispatchInfo}; use sp_runtime::codec::Encode; -use polkadot_xcm::latest::prelude::*; +use polkadot_xcm::v4::prelude::*; + use xcm_emulator::TestExt; +use sp_std::sync::Arc; #[test] fn allowed_transact_call_should_pass_filter() { // Arrange TestNet::reset(); Basilisk::execute_with(|| { - assert_ok!(basilisk_runtime::Balances::transfer( + assert_ok!(basilisk_runtime::Currencies::transfer( basilisk_runtime::RuntimeOrigin::signed(ALICE.into()), parachain_reserve_account(), + BSX, 1_000 * UNITS, )); }); OtherParachain::execute_with(|| { // allowed by SafeCallFilter and the runtime call filter - let call = pallet_balances::Call::::transfer { + let call = pallet_currencies::Call::::transfer { dest: BOB.into(), - value: UNITS, + currency_id: 0, + amount: UNITS, + }; + let bsx_loc = Location::new( + 1, + cumulus_primitives_core::Junctions::X2(Arc::new( + vec![ + cumulus_primitives_core::Junction::Parachain(BASILISK_PARA_ID), + cumulus_primitives_core::Junction::GeneralIndex(0), + ] + .try_into() + .unwrap(), + )), + ); + let asset_to_withdraw: Asset = Asset { + id: cumulus_primitives_core::AssetId(bsx_loc.clone()), + fun: Fungible(900 * UNITS), + }; + + let asset_for_buy_execution: Asset = Asset { + id: cumulus_primitives_core::AssetId(bsx_loc), + fun: Fungible(800 * UNITS), }; + let message = Xcm(vec![ - WithdrawAsset( - ( - MultiLocation { - parents: 1, - interior: X2(Parachain(BASILISK_PARA_ID), GeneralIndex(0)), - }, - 900 * UNITS, - ) - .into(), - ), + WithdrawAsset(asset_to_withdraw.into()), BuyExecution { - fees: ( - MultiLocation { - parents: 1, - interior: X2(Parachain(BASILISK_PARA_ID), GeneralIndex(0)), - }, - 800 * UNITS, - ) - .into(), + fees: asset_for_buy_execution.into(), weight_limit: Unlimited, }, Transact { require_weight_at_most: call.get_dispatch_info().weight, origin_kind: OriginKind::SovereignAccount, - call: basilisk_runtime::RuntimeCall::Balances(call).encode().into(), + call: basilisk_runtime::RuntimeCall::Currencies(call).encode().into(), }, ExpectTransactStatus(MaybeErrorCode::Success), RefundSurplus, DepositAsset { assets: All.into(), - beneficiary: Junction::AccountId32 { + beneficiary: cumulus_primitives_core::Junction::AccountId32 { id: parachain_reserve_account().into(), network: None, } @@ -66,19 +75,25 @@ fn allowed_transact_call_should_pass_filter() { ]); // Act + let dest = Location::new( + 1, + cumulus_primitives_core::Junctions::X1(Arc::new( + vec![cumulus_primitives_core::Junction::Parachain(BASILISK_PARA_ID)] + .try_into() + .unwrap(), + )), + ); + assert_ok!(basilisk_runtime::PolkadotXcm::send_xcm( - Here, - MultiLocation::new(1, X1(Parachain(BASILISK_PARA_ID))), + cumulus_primitives_core::Junctions::Here, + dest, message )); }); + // Assert Basilisk::execute_with(|| { - // Assert - assert!(basilisk_runtime::System::events().iter().any(|r| matches!( - r.event, - basilisk_runtime::RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::Success { .. }) - ))); + assert_xcm_message_processing_passed(); assert_eq!( basilisk_runtime::Balances::free_balance(AccountId::from(BOB)), BOB_INITIAL_BSX_BALANCE + UNITS @@ -92,9 +107,10 @@ fn blocked_transact_calls_should_not_pass_filter() { TestNet::reset(); Basilisk::execute_with(|| { - assert_ok!(basilisk_runtime::Balances::transfer( + assert_ok!(basilisk_runtime::Currencies::transfer( basilisk_runtime::RuntimeOrigin::signed(ALICE.into()), parachain_reserve_account(), + BSX, 1_000 * UNITS, )); }); @@ -105,26 +121,30 @@ fn blocked_transact_calls_should_not_pass_filter() { reason: vec![0, 10], who: BOB.into(), }; + let bsx_loc = Location::new( + 1, + cumulus_primitives_core::Junctions::X2(Arc::new( + vec![ + cumulus_primitives_core::Junction::Parachain(BASILISK_PARA_ID), + cumulus_primitives_core::Junction::GeneralIndex(0), + ] + .try_into() + .unwrap(), + )), + ); + let asset_to_withdraw: Asset = Asset { + id: cumulus_primitives_core::AssetId(bsx_loc.clone()), + fun: Fungible(900 * UNITS), + }; + + let asset_for_buy_execution: Asset = Asset { + id: cumulus_primitives_core::AssetId(bsx_loc), + fun: Fungible(800 * UNITS), + }; let message = Xcm(vec![ - WithdrawAsset( - ( - MultiLocation { - parents: 1, - interior: X2(Parachain(BASILISK_PARA_ID), GeneralIndex(0)), - }, - 900 * UNITS, - ) - .into(), - ), + WithdrawAsset(asset_to_withdraw.into()), BuyExecution { - fees: ( - MultiLocation { - parents: 1, - interior: X2(Parachain(BASILISK_PARA_ID), GeneralIndex(0)), - }, - 800 * UNITS, - ) - .into(), + fees: asset_for_buy_execution, weight_limit: Unlimited, }, Transact { @@ -136,7 +156,7 @@ fn blocked_transact_calls_should_not_pass_filter() { RefundSurplus, DepositAsset { assets: All.into(), - beneficiary: Junction::AccountId32 { + beneficiary: cumulus_primitives_core::Junction::AccountId32 { id: parachain_reserve_account().into(), network: None, } @@ -144,23 +164,15 @@ fn blocked_transact_calls_should_not_pass_filter() { }, ]); + let dest = basilisk_location(); + // Act - assert_ok!(basilisk_runtime::PolkadotXcm::send_xcm( - Here, - MultiLocation::new(1, X1(Parachain(BASILISK_PARA_ID))), - message - )); + assert_ok!(basilisk_runtime::PolkadotXcm::send_xcm(Here, dest, message)); }); Basilisk::execute_with(|| { // Assert - assert!(basilisk_runtime::System::events().iter().any(|r| matches!( - r.event, - basilisk_runtime::RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::Fail { - error: cumulus_primitives_core::XcmError::NoPermission, - .. - }) - ))); + assert_xcm_message_processing_failed() }); } @@ -170,9 +182,10 @@ fn safe_call_filter_should_respect_runtime_call_filter() { TestNet::reset(); Basilisk::execute_with(|| { - assert_ok!(basilisk_runtime::Balances::transfer( + assert_ok!(basilisk_runtime::Currencies::transfer( basilisk_runtime::RuntimeOrigin::signed(ALICE.into()), parachain_reserve_account(), + BSX, 1_000 * UNITS, )); }); @@ -183,26 +196,31 @@ fn safe_call_filter_should_respect_runtime_call_filter() { collection: 1u128, admin: ALICE.into(), }; + let bsx_loc = Location::new( + 1, + cumulus_primitives_core::Junctions::X2(Arc::new( + vec![ + cumulus_primitives_core::Junction::Parachain(BASILISK_PARA_ID), + cumulus_primitives_core::Junction::GeneralIndex(0), + ] + .try_into() + .unwrap(), + )), + ); + let asset_to_withdraw: Asset = Asset { + id: cumulus_primitives_core::AssetId(bsx_loc.clone()), + fun: Fungible(900 * UNITS), + }; + + let asset_for_buy_execution: Asset = Asset { + id: cumulus_primitives_core::AssetId(bsx_loc), + fun: Fungible(800 * UNITS), + }; + let message = Xcm(vec![ - WithdrawAsset( - ( - MultiLocation { - parents: 1, - interior: X2(Parachain(BASILISK_PARA_ID), GeneralIndex(0)), - }, - 900 * UNITS, - ) - .into(), - ), + WithdrawAsset(asset_to_withdraw.into()), BuyExecution { - fees: ( - MultiLocation { - parents: 1, - interior: X2(Parachain(BASILISK_PARA_ID), GeneralIndex(0)), - }, - 800 * UNITS, - ) - .into(), + fees: asset_for_buy_execution, weight_limit: Unlimited, }, Transact { @@ -214,7 +232,7 @@ fn safe_call_filter_should_respect_runtime_call_filter() { RefundSurplus, DepositAsset { assets: All.into(), - beneficiary: Junction::AccountId32 { + beneficiary: cumulus_primitives_core::Junction::AccountId32 { id: parachain_reserve_account().into(), network: None, } @@ -222,22 +240,23 @@ fn safe_call_filter_should_respect_runtime_call_filter() { }, ]); + let dest = basilisk_location(); + // Act - assert_ok!(basilisk_runtime::PolkadotXcm::send_xcm( - Here, - MultiLocation::new(1, X1(Parachain(BASILISK_PARA_ID))), - message - )); + assert_ok!(basilisk_runtime::PolkadotXcm::send_xcm(Here, dest, message)); }); - Basilisk::execute_with(|| { - // Assert - assert!(basilisk_runtime::System::events().iter().any(|r| matches!( - r.event, - basilisk_runtime::RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::Fail { - error: cumulus_primitives_core::XcmError::NoPermission, - .. - }) - ))); - }); + //Assert + Basilisk::execute_with(|| assert_xcm_message_processing_failed()); +} + +fn basilisk_location() -> Location { + Location::new( + 1, + cumulus_primitives_core::Junctions::X1(Arc::new( + vec![cumulus_primitives_core::Junction::Parachain(BASILISK_PARA_ID)] + .try_into() + .unwrap(), + )), + ) } diff --git a/integration-tests/src/xcm_rate_limiter.rs b/integration-tests/src/xcm_rate_limiter.rs deleted file mode 100644 index 8e3421cdfb0..00000000000 --- a/integration-tests/src/xcm_rate_limiter.rs +++ /dev/null @@ -1,259 +0,0 @@ -#![cfg(test)] - -use crate::kusama_test_net::*; - -use frame_support::assert_ok; -use frame_support::weights::Weight; -use orml_traits::currency::MultiCurrency; -use pallet_asset_registry::AssetType; -use polkadot_xcm::prelude::*; -use xcm_emulator::TestExt; - -pub const EVE: [u8; 32] = [8u8; 32]; - -/// Returns the message hash in the `XcmpMessageSent` event at the `n`th last event (1-indexed, so if the second to last -/// event has the hash, pass `2`); -fn get_message_hash_from_event(n: usize) -> Option<[u8; 32]> { - use basilisk_runtime::RuntimeEvent; - use cumulus_pallet_xcmp_queue::Event; - let RuntimeEvent::XcmpQueue(Event::XcmpMessageSent { message_hash }) = &last_parachain_events(n)[0] else { - panic!("expecting to find message sent event"); - }; - Some(*message_hash) -} - -// NOTE: Tests disabled until toggling the `runtime-benchmarks` feature no longer fails these tests. -// Github issue: https://github.com/galacticcouncil/Basilisk-node/issues/637 -#[ignore] -#[test] -fn xcm_rate_limiter_should_limit_aca_when_limit_is_exceeded() { - // Arrange - TestNet::reset(); - - Basilisk::execute_with(|| { - assert_ok!(basilisk_runtime::AssetRegistry::set_location( - basilisk_runtime::RuntimeOrigin::root(), - AUSD, - basilisk_runtime::AssetLocation(MultiLocation::new(1, X2(Parachain(OTHER_PARA_ID), GeneralIndex(0)))) - )); - - // set an xcm rate limit - assert_ok!(basilisk_runtime::AssetRegistry::update( - basilisk_runtime::RuntimeOrigin::root(), - AUSD, - b"AUSD".to_vec(), - AssetType::Token, - None, - Some(50 * UNITS), - )); - - assert_eq!(basilisk_runtime::Tokens::free_balance(AUSD, &AccountId::from(EVE)), 0); - }); - - let amount = 100 * UNITS; - let mut message_hash = None; - OtherParachain::execute_with(|| { - assert!(basilisk_runtime::Balances::free_balance(AccountId::from(ALICE)) >= amount); - // Act - assert_ok!(basilisk_runtime::XTokens::transfer( - basilisk_runtime::RuntimeOrigin::signed(ALICE.into()), - 0, - amount, - Box::new( - MultiLocation::new( - 1, - X2( - Junction::Parachain(BASILISK_PARA_ID), - Junction::AccountId32 { id: EVE, network: None } - ) - ) - .into() - ), - WeightLimit::Limited(Weight::from_parts(399_600_000_000, 0)) - )); - - // Assert - assert_eq!( - basilisk_runtime::Balances::free_balance(AccountId::from(ALICE)), - ALICE_INITIAL_NATIVE_BALANCE_ON_OTHER_PARACHAIN - amount - ); - - message_hash = get_message_hash_from_event(2); - }); - - Basilisk::execute_with(|| { - expect_basilisk_events(vec![ - cumulus_pallet_xcmp_queue::Event::XcmDeferred { - sender: OTHER_PARA_ID.into(), - sent_at: 3, - deferred_to: basilisk_runtime::DeferDuration::get() + 4, - index: (1, 1), - position: 1, - message_hash, - } - .into(), - pallet_relaychain_info::Event::CurrentBlockNumbers { - parachain_block_number: 1, - relaychain_block_number: 5, - } - .into(), - ]); - assert_eq!(basilisk_runtime::Tokens::free_balance(AUSD, &AccountId::from(EVE)), 0); - }); -} - -#[test] -#[ignore] -fn xcm_rate_limiter_should_not_limit_aca_when_limit_is_not_exceeded() { - // Arrange - TestNet::reset(); - - Basilisk::execute_with(|| { - assert_ok!(basilisk_runtime::AssetRegistry::set_location( - basilisk_runtime::RuntimeOrigin::root(), - AUSD, - basilisk_runtime::AssetLocation(MultiLocation::new(1, X2(Parachain(OTHER_PARA_ID), GeneralIndex(0)))) - )); - - // set an xcm rate limit - assert_ok!(basilisk_runtime::AssetRegistry::update( - basilisk_runtime::RuntimeOrigin::root(), - AUSD, - b"AUSD".to_vec(), - AssetType::Token, - None, - Some(101 * UNITS), - )); - }); - - let amount = 100 * UNITS; - OtherParachain::execute_with(|| { - // Act - assert_ok!(basilisk_runtime::XTokens::transfer( - basilisk_runtime::RuntimeOrigin::signed(ALICE.into()), - 0, - amount, - Box::new( - MultiLocation::new( - 1, - X2( - Junction::Parachain(BASILISK_PARA_ID), - Junction::AccountId32 { id: EVE, network: None } - ) - ) - .into() - ), - WeightLimit::Limited(Weight::from_parts(399_600_000_000, 0)) - )); - - // Assert - assert_eq!( - basilisk_runtime::Balances::free_balance(AccountId::from(ALICE)), - ALICE_INITIAL_NATIVE_BALANCE_ON_OTHER_PARACHAIN - amount - ); - }); - - Basilisk::execute_with(|| { - let fee = basilisk_runtime::Tokens::free_balance(AUSD, &basilisk_runtime::Treasury::account_id()); - assert_eq!( - basilisk_runtime::Tokens::free_balance(AUSD, &AccountId::from(EVE)), - amount - fee - ); - }); -} - -#[test] -#[ignore] -fn deferred_messages_should_be_executable_by_root() { - // Arrange - TestNet::reset(); - - Basilisk::execute_with(|| { - assert_ok!(basilisk_runtime::AssetRegistry::set_location( - basilisk_runtime::RuntimeOrigin::root(), - AUSD, - basilisk_runtime::AssetLocation(MultiLocation::new(1, X2(Parachain(OTHER_PARA_ID), GeneralIndex(0)))) - )); - - // set an xcm rate limit - assert_ok!(basilisk_runtime::AssetRegistry::update( - basilisk_runtime::RuntimeOrigin::root(), - AUSD, - b"AUSD".to_vec(), - AssetType::Token, - None, - Some(50 * UNITS), - )); - - assert_eq!(basilisk_runtime::Tokens::free_balance(AUSD, &AccountId::from(EVE)), 0); - }); - - let amount = 100 * UNITS; - let mut message_hash = None; - let max_weight = Weight::from_parts(399_600_000_000, 0); - - OtherParachain::execute_with(|| { - assert!(basilisk_runtime::Balances::free_balance(AccountId::from(ALICE)) >= amount); - // Act - assert_ok!(basilisk_runtime::XTokens::transfer( - basilisk_runtime::RuntimeOrigin::signed(ALICE.into()), - 0, - amount, - Box::new( - MultiLocation::new( - 1, - X2( - Junction::Parachain(BASILISK_PARA_ID), - Junction::AccountId32 { id: EVE, network: None } - ) - ) - .into() - ), - WeightLimit::Limited(Weight::from_parts(399_600_000_000, 0)) - )); - - // Assert - assert_eq!( - basilisk_runtime::Balances::free_balance(AccountId::from(ALICE)), - ALICE_INITIAL_NATIVE_BALANCE_ON_OTHER_PARACHAIN - amount - ); - - message_hash = get_message_hash_from_event(2); - }); - - Basilisk::execute_with(|| { - expect_basilisk_events(vec![ - cumulus_pallet_xcmp_queue::Event::XcmDeferred { - sender: OTHER_PARA_ID.into(), - sent_at: 3, - deferred_to: basilisk_runtime::DeferDuration::get() + 4, - index: (1, 1), - position: 1, - message_hash, - } - .into(), - pallet_relaychain_info::Event::CurrentBlockNumbers { - parachain_block_number: 1, - relaychain_block_number: 5, - } - .into(), - ]); - assert_eq!(basilisk_runtime::Tokens::free_balance(AUSD, &AccountId::from(EVE)), 0); - - set_relaychain_block_number(basilisk_runtime::DeferDuration::get() + 4); - - assert_eq!(basilisk_runtime::Tokens::free_balance(AUSD, &AccountId::from(EVE)), 0); - assert_ok!(basilisk_runtime::XcmpQueue::service_deferred( - basilisk_runtime::RuntimeOrigin::root(), - max_weight, - OTHER_PARA_ID.into(), - basilisk_runtime::MaxBucketsProcessed::get(), - )); - - let fee = basilisk_runtime::Tokens::free_balance(AUSD, &basilisk_runtime::Treasury::account_id()); - assert_eq!( - basilisk_runtime::Tokens::free_balance(AUSD, &AccountId::from(EVE)), - amount - fee - ); - }); -} diff --git a/integration-tests/src/xyk.rs b/integration-tests/src/xyk.rs index 3e244dccc8d..d03ac990253 100644 --- a/integration-tests/src/xyk.rs +++ b/integration-tests/src/xyk.rs @@ -2,13 +2,14 @@ use crate::kusama_test_net::*; +use basilisk_runtime::Currencies; use basilisk_runtime::{DustRemovalWhitelist, RuntimeOrigin, XYK}; +use frame_support::assert_noop; +use frame_support::{assert_ok, traits::Contains}; use hydradx_traits::AMM; use pallet_xyk::types::AssetId; use xcm_emulator::TestExt; -use frame_support::{assert_ok, traits::Contains}; - fn pair_account(asset_a: AssetId, asset_b: AssetId) -> AccountId { let asset_pair = AssetPair { asset_in: asset_a, @@ -127,3 +128,67 @@ fn share_asset_id_should_be_offset() { assert!(share_token >= offset); }); } + +#[test] +fn creating_xyk_pool_should_fail_when_asset_is_pool_share_asset() { + TestNet::reset(); + let asset_a = 1; + let asset_b = 2; + + Basilisk::execute_with(|| { + assert_ok!(Currencies::update_balance( + RuntimeOrigin::root(), + ALICE.into(), + asset_a, + 1000 * UNITS as i128, + )); + + assert_ok!(Currencies::update_balance( + RuntimeOrigin::root(), + ALICE.into(), + asset_b, + 1000 * UNITS as i128, + )); + + assert_ok!(XYK::create_pool( + RuntimeOrigin::signed(ALICE.into()), + asset_a, + 100 * UNITS, + asset_b, + 200 * UNITS, + )); + + let share_token = XYK::get_share_token(AssetPair { + asset_in: asset_a, + asset_out: asset_b, + }); + assert_ok!(Currencies::update_balance( + RuntimeOrigin::root(), + ALICE.into(), + share_token, + 1000 * UNITS as i128, + )); + + assert_noop!( + XYK::create_pool( + RuntimeOrigin::signed(ALICE.into()), + share_token, + 100 * UNITS, + asset_b, + 200 * UNITS, + ), + pallet_xyk::Error::::CannotCreatePool + ); + + assert_noop!( + XYK::create_pool( + RuntimeOrigin::signed(ALICE.into()), + asset_a, + 100 * UNITS, + share_token, + 200 * UNITS, + ), + pallet_xyk::Error::::CannotCreatePool + ); + }); +} diff --git a/node/Cargo.toml b/node/Cargo.toml index 018181bfba3..f7805d93f7a 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "basilisk" -version = "11.1.0" +version = "13.0.0" description = "Basilisk node" authors = ["GalacticCouncil"] edition = "2021" @@ -21,7 +21,7 @@ hydra-dx-build-script-utils = { workspace = true } [dependencies] codec = { package = "parity-scale-codec", version = "3.4.0" } hex-literal = "0.4.1" -jsonrpsee = { version = "0.16.2", features = ["server", "macros"] } +jsonrpsee = { version = "0.20.3", features = ["server", "macros"] } log = "0.4.17" serde = { version = "1.0.136", features = ["derive"] } serde_json = "1.0.85" diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs index adc225605d6..dca9d915e37 100644 --- a/node/src/chain_spec.rs +++ b/node/src/chain_spec.rs @@ -114,6 +114,7 @@ pub fn kusama_staging_parachain_config() -> Result { properties.insert("tokenDecimals".into(), TOKEN_DECIMALS.into()); properties.insert("tokenSymbol".into(), TOKEN_SYMBOL.into()); + #[allow(deprecated)] Ok(ChainSpec::from_genesis( // Name "Basilisk", @@ -122,7 +123,6 @@ pub fn kusama_staging_parachain_config() -> Result { ChainType::Live, move || { parachain_genesis( - wasm_binary, //initial authorities & invulnerables vec![ ( @@ -184,6 +184,7 @@ pub fn kusama_staging_parachain_config() -> Result { relay_chain: "kusama".into(), para_id: PARA_ID, }, + wasm_binary, )) } @@ -193,6 +194,7 @@ pub fn testnet_parachain_config() -> Result { properties.insert("tokenDecimals".into(), TOKEN_DECIMALS.into()); properties.insert("tokenSymbol".into(), TOKEN_SYMBOL.into()); + #[allow(deprecated)] Ok(ChainSpec::from_genesis( // Name "Basilisk Egg", @@ -201,7 +203,6 @@ pub fn testnet_parachain_config() -> Result { ChainType::Live, move || { testnet_parachain_genesis( - wasm_binary, //initial authorities & invulnerables vec![ ( @@ -265,6 +266,7 @@ pub fn testnet_parachain_config() -> Result { relay_chain: "westend".into(), para_id: PARA_ID, }, + wasm_binary, )) } @@ -274,6 +276,7 @@ pub fn parachain_development_config() -> Result { properties.insert("tokenDecimals".into(), TOKEN_DECIMALS.into()); properties.insert("tokenSymbol".into(), TOKEN_SYMBOL.into()); + #[allow(deprecated)] Ok(ChainSpec::from_genesis( // Name "Basilisk Development", @@ -282,7 +285,6 @@ pub fn parachain_development_config() -> Result { ChainType::Development, move || { testnet_parachain_genesis( - wasm_binary, //initial authorities & invulnerables vec![ ( @@ -336,6 +338,7 @@ pub fn parachain_development_config() -> Result { relay_chain: "rococo-dev".into(), para_id: PARA_ID, }, + wasm_binary, )) } @@ -345,6 +348,7 @@ pub fn rococo_parachain_config() -> Result { properties.insert("tokenDecimals".into(), TOKEN_DECIMALS.into()); properties.insert("tokenSymbol".into(), TOKEN_SYMBOL.into()); + #[allow(deprecated)] Ok(ChainSpec::from_genesis( // Name "Basilisk testnet", @@ -353,7 +357,6 @@ pub fn rococo_parachain_config() -> Result { ChainType::Live, move || { testnet_parachain_genesis( - wasm_binary, //initial authorities & invulnerables vec![ ( @@ -412,6 +415,7 @@ pub fn rococo_parachain_config() -> Result { relay_chain: "rococo".into(), para_id: PARA_ID, }, + wasm_binary, )) } @@ -421,6 +425,7 @@ pub fn karura_testnet_parachain_config() -> Result { properties.insert("tokenDecimals".into(), TOKEN_DECIMALS.into()); properties.insert("tokenSymbol".into(), TOKEN_SYMBOL.into()); + #[allow(deprecated)] Ok(ChainSpec::from_genesis( // Name "Basilisk testnet", @@ -429,7 +434,6 @@ pub fn karura_testnet_parachain_config() -> Result { ChainType::Live, move || { testnet_parachain_genesis( - wasm_binary, //initial authorities & invulnerables vec![ ( @@ -484,6 +488,7 @@ pub fn karura_testnet_parachain_config() -> Result { relay_chain: "kusama-local".into(), para_id: PARA_ID, }, + wasm_binary, )) } @@ -495,6 +500,7 @@ pub fn benchmarks_development_config() -> Result { properties.insert("tokenDecimals".into(), TOKEN_DECIMALS.into()); properties.insert("tokenSymbol".into(), TOKEN_SYMBOL.into()); + #[allow(deprecated)] Ok(ChainSpec::from_genesis( // Name "Basilisk Benchmarks", @@ -503,7 +509,6 @@ pub fn benchmarks_development_config() -> Result { ChainType::Development, move || { testnet_parachain_genesis( - wasm_binary, //initial authorities & invulnerables vec![ ( @@ -554,6 +559,7 @@ pub fn benchmarks_development_config() -> Result { relay_chain: "rococo-dev".into(), para_id: PARA_ID, }, + wasm_binary, )) } @@ -564,6 +570,7 @@ pub fn local_parachain_config() -> Result { properties.insert("tokenDecimals".into(), TOKEN_DECIMALS.into()); properties.insert("tokenSymbol".into(), TOKEN_SYMBOL.into()); + #[allow(deprecated)] Ok(ChainSpec::from_genesis( // Name "Basilisk Local Testnet", @@ -572,7 +579,6 @@ pub fn local_parachain_config() -> Result { ChainType::Local, move || { testnet_parachain_genesis( - wasm_binary, //initial authorities & invulnerables vec![ ( @@ -633,12 +639,12 @@ pub fn local_parachain_config() -> Result { relay_chain: "rococo-local".into(), para_id: PARA_ID, }, + wasm_binary, )) } /// Configure initial storage state for FRAME modules. fn parachain_genesis( - wasm_binary: &[u8], initial_authorities: Vec<(AccountId, AuraId)>, _endowed_accounts: Vec, _enable_println: bool, @@ -647,7 +653,6 @@ fn parachain_genesis( RuntimeGenesisConfig { system: SystemConfig { // Add Wasm runtime to storage. - code: wasm_binary.to_vec(), ..Default::default() }, balances: BalancesConfig { @@ -741,7 +746,6 @@ fn parachain_genesis( } fn testnet_parachain_genesis( - wasm_binary: &[u8], initial_authorities: Vec<(AccountId, AuraId)>, endowed_accounts: Vec, _enable_println: bool, @@ -756,7 +760,6 @@ fn testnet_parachain_genesis( RuntimeGenesisConfig { system: SystemConfig { // Add Wasm runtime to storage. - code: wasm_binary.to_vec(), ..Default::default() }, balances: BalancesConfig { diff --git a/node/src/cli.rs b/node/src/cli.rs index 853a61a50bd..9ed3cd40de4 100644 --- a/node/src/cli.rs +++ b/node/src/cli.rs @@ -110,7 +110,7 @@ pub enum Subcommand { /// Export the genesis state of the parachain. #[clap(name = "export-genesis-state")] - ExportGenesisState(cumulus_client_cli::ExportGenesisStateCommand), + ExportGenesisHead(cumulus_client_cli::ExportGenesisHeadCommand), /// Export the genesis wasm of the parachain. #[clap(name = "export-genesis-wasm")] diff --git a/node/src/command.rs b/node/src/command.rs index b9526aa1abd..88349c28d19 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -21,7 +21,6 @@ use crate::service::{new_partial, BasiliskNativeExecutor}; use basilisk_runtime::Block; use codec::Encode; -use cumulus_client_cli::generate_genesis_block; use cumulus_primitives_core::ParaId; use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE}; use log::info; @@ -32,8 +31,11 @@ use sc_cli::{ use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch}; use sc_service::config::{BasePath, PrometheusConfig}; use sp_core::hexdisplay::HexDisplay; -use sp_runtime::traits::AccountIdConversion; use sp_runtime::traits::Block as BlockT; +use sp_runtime::traits::Hash as HashT; +use sp_runtime::traits::Header as HeaderT; +use sp_runtime::traits::{AccountIdConversion, Zero}; +use sp_storage::StateVersion; use std::io::Write; fn load_spec(id: &str) -> std::result::Result, String> { @@ -232,7 +234,7 @@ pub fn run() -> sc_cli::Result<()> { BenchmarkCmd::Extrinsic(_) => Err("Unsupported benchmarking command".into()), } } - Some(Subcommand::ExportGenesisState(params)) => { + Some(Subcommand::ExportGenesisHead(params)) => { let mut builder = sc_cli::LoggerBuilder::new(""); builder.with_profiling(sc_tracing::TracingReceiver::Log, ""); let _ = builder.init(); @@ -307,7 +309,7 @@ pub fn run() -> sc_cli::Result<()> { let id = ParaId::from(para_id); let parachain_account = - AccountIdConversion::::into_account_truncating(&id); + AccountIdConversion::::into_account_truncating(&id); let state_version = Cli::runtime_version().state_version(); @@ -453,3 +455,37 @@ impl Cli { &basilisk_runtime::VERSION } } + +/// Generate the genesis block from a given ChainSpec. +pub fn generate_genesis_block( + chain_spec: &dyn ChainSpec, + genesis_state_version: StateVersion, +) -> std::result::Result { + let storage = chain_spec.build_storage()?; + + let child_roots = storage.children_default.iter().map(|(sk, child_content)| { + let state_root = <<::Header as HeaderT>::Hashing as HashT>::trie_root( + child_content.data.clone().into_iter().collect(), + genesis_state_version, + ); + (sk.clone(), state_root.encode()) + }); + let state_root = <<::Header as HeaderT>::Hashing as HashT>::trie_root( + storage.top.clone().into_iter().chain(child_roots).collect(), + genesis_state_version, + ); + + let extrinsics_root = + <<::Header as HeaderT>::Hashing as HashT>::trie_root(Vec::new(), genesis_state_version); + + Ok(Block::new( + <::Header as HeaderT>::new( + Zero::zero(), + extrinsics_root, + state_root, + Default::default(), + Default::default(), + ), + Default::default(), + )) +} diff --git a/node/src/rpc.rs b/node/src/rpc.rs index 35f3a3bec7f..ba274b1901c 100644 --- a/node/src/rpc.rs +++ b/node/src/rpc.rs @@ -8,7 +8,6 @@ use std::sync::Arc; use basilisk_runtime::{opaque::Block, AccountId, Balance, Index}; -pub use sc_rpc::SubscriptionTaskExecutor; pub use sc_rpc_api::DenyUnsafe; use sc_transaction_pool_api::TransactionPool; use sp_api::ProvideRuntimeApi; diff --git a/node/src/service.rs b/node/src/service.rs index 2e5fe6ee07c..b76df987834 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -269,6 +269,8 @@ async fn start_node_impl( if let Some(hwbench) = hwbench { sc_sysinfo::print_hwbench(&hwbench); + //TODO: need? + /* // Here you can check whether the hardware meets your chains' requirements. Putting a link // in there and swapping out the requirements for your own are probably a good idea. The // requirements for a para-chain are dictated by its relay-chain. @@ -279,6 +281,8 @@ async fn start_node_impl( ); } + */ + if let Some(ref mut telemetry) = telemetry { let telemetry_handle = telemetry.handle(); task_manager.spawn_handle().spawn( @@ -429,6 +433,7 @@ fn start_consensus( collator_service, // Very limited proposal time. authoring_duration: Duration::from_millis(500), + collation_request_receiver: None, }; let fut = basic_aura::run::(params); diff --git a/pallets/asset-registry/Cargo.toml b/pallets/asset-registry/Cargo.toml new file mode 100644 index 00000000000..13a9788aedd --- /dev/null +++ b/pallets/asset-registry/Cargo.toml @@ -0,0 +1,68 @@ +[package] +name = "pallet-asset-registry" +version = "2.3.3" +description = "Pallet for asset registry management" +authors = ["GalacticCouncil"] +edition = "2021" +license = "Apache 2.0" +repository = "https://github.com/galacticcouncil/warehouse" + +[package.metadata.docs.rs] +targets = ["x86_64-unknown-linux-gnu"] + +[build-dependencies] +substrate-wasm-builder = { workspace = true } + +[dependencies] +codec = { default-features = false, features = ["derive", "max-encoded-len"], package = "parity-scale-codec", version = "3.4.0" } +scale-info = { version = "2.1.2", default-features = false, features = ["derive"] } +primitive-types = { default-features = false, version = "0.12.0" } +serde = { features = ["derive"], optional = true, version = "1.0.137" } +log = { workspace = true } + +# ORML dependencies +orml-traits = { workspace = true } + +# Substrate dependencies +frame-support = { workspace = true } +frame-system = { workspace = true } +sp-core = { workspace = true } +sp-arithmetic = { workspace = true } +sp-runtime = { workspace = true } +sp-std = { workspace = true } + +# HydraDX dependencies +hydradx-traits = { workspace = true } + +# Optionals +frame-benchmarking = { workspace = true, optional = true } +sp-api = { workspace = true, optional = true } + +[dev-dependencies] +sp-io = { workspace = true } +polkadot-xcm = { workspace = true } +test-utils = { workspace = true } + +[features] +default = ["std"] +runtime-benchmarks = [ + "frame-benchmarking", + "frame-system/runtime-benchmarks", + "frame-support/runtime-benchmarks", +] +std = [ + "serde/std", + "codec/std", + "frame-support/std", + "frame-system/std", + "sp-runtime/std", + "sp-core/std", + "sp-std/std", + "hydradx-traits/std", + "sp-api/std", + "frame-benchmarking/std", + "scale-info/std", + "polkadot-xcm/std", +] +try-runtime = ["frame-support/try-runtime"] + diff --git a/pallets/asset-registry/README.md b/pallets/asset-registry/README.md new file mode 100644 index 00000000000..73e676aaa2d --- /dev/null +++ b/pallets/asset-registry/README.md @@ -0,0 +1,29 @@ +### Asset registry + +## Overview +Asset registry provides functionality to create, store and keep tracking of existing assets in a system. + +### Terminology + +- **CoreAssetId** - asset id of native/core asset. Usually 0. +- **NextAssetId** - asset id to be assigned for next asset added to the system. +- **AssetIds** - list of existing asset ids +- **AssetDetail** - details of an asset such as type, name or whether it is locked or not. +- **AssetMetadata** - additional optional metadata of an asset ( symbol, decimals) +- **AssetLocation** - information of native location of an asset. Used in XCM. + +### Implementation detail + +For each newly registered asset, a sequential id is assigned to that asset. This id identifies the asset and can be used directly in transfers or any other operation which works with an asset ( without performing any additioanl asset check or asset retrieval). + +There is a mapping between the name and asset id stored as well, which helps and is used in AMM Implementation where there is a need to register a pool asset and only name is provided ( see `get_or_create_asset` ). + +An asset has additional details stored on chain such as name and type. + +Optional metadata can be also set for an asset. + +The registry pallet supports storing of native location of an asset. This can be used in XCM where it is possible to create mapping between native location and local system asset ids. + +### Interface +- `get_or_create_asset` - creates new asset id for give asset name. If such asset already exists, it returns the corresponding asset id. + diff --git a/pallets/asset-registry/src/benchmarking.rs b/pallets/asset-registry/src/benchmarking.rs new file mode 100644 index 00000000000..4f92be61e39 --- /dev/null +++ b/pallets/asset-registry/src/benchmarking.rs @@ -0,0 +1,133 @@ +// This file is part of pallet-asset-registry. + +// Copyright (C) 2020-2022 Intergalactic, Limited (GIB). +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#![cfg(feature = "runtime-benchmarks")] + +use super::*; + +use frame_benchmarking::benchmarks; +use frame_system::RawOrigin; + +use crate::types::Metadata; + +use sp_std::vec; + +benchmarks! { + register{ + let name = vec![1; T::StringLimit::get() as usize]; + let ed = T::Balance::from(1_000_000u32); + + let symbol = vec![1; T::StringLimit::get() as usize]; + + let metadata = Metadata { + symbol, + decimals: 100, + }; + + }: _(RawOrigin::Root, name.clone(), AssetType::Token, ed, None, Some(metadata), Some(Default::default()), None) + verify { + let bname = crate::Pallet::::to_bounded_name(name).unwrap(); + assert!(crate::Pallet::::asset_ids(bname).is_some()); + } + + update{ + let name = b"NAME".to_vec(); + let ed = T::Balance::from(1_000_000u32); + let asset_id = T::AssetId::from(10u8); + let _ = crate::Pallet::::register(RawOrigin::Root.into(), name, AssetType::Token, ed, Some(asset_id), None, None, None); + + let new_name= vec![1; T::StringLimit::get() as usize]; + + let new_ed = T::Balance::from(2_000_000u32); + + let rate_limit = T::Balance::from(10_000_000u32); + + }: _(RawOrigin::Root, asset_id, new_name.clone(), AssetType::PoolShare(T::AssetId::from(10u8),T::AssetId::from(20u8)), Some(new_ed), Some(rate_limit)) + verify { + let bname = crate::Pallet::::to_bounded_name(new_name).unwrap(); + assert_eq!(crate::Pallet::::asset_ids(&bname), Some(asset_id)); + + let stored = crate::Pallet::::assets(asset_id); + + assert!(stored.is_some()); + let stored = stored.unwrap(); + + let expected = AssetDetails{ + asset_type: AssetType::PoolShare(T::AssetId::from(10u8), T::AssetId::from(20u8)), + existential_deposit: new_ed, + name: bname, + xcm_rate_limit: Some(rate_limit), + }; + + assert_eq!(stored.asset_type, expected.asset_type); + assert_eq!(stored.existential_deposit, expected.existential_deposit); + assert_eq!(stored.name.to_vec(), expected.name.to_vec()); + } + + set_metadata{ + let name = b"NAME".to_vec(); + let bname = crate::Pallet::::to_bounded_name(name.clone()).unwrap(); + let ed = T::Balance::from(1_000_000u32); + let _ = crate::Pallet::::register(RawOrigin::Root.into(), name, AssetType::Token, ed, None, None, None, None); + + let asset_id = crate::Pallet::::asset_ids(bname).unwrap(); + + let max_symbol = vec![1; T::StringLimit::get() as usize]; + + }: _(RawOrigin::Root, asset_id, max_symbol.clone(), 10u8) + verify { + let bsymbol= crate::Pallet::::to_bounded_name(max_symbol).unwrap(); + + let stored = crate::Pallet::::asset_metadata(asset_id); + + assert!(stored.is_some()); + + let stored = stored.unwrap(); + + let expected =AssetMetadata{ + symbol: bsymbol, + decimals: 10u8 + }; + + assert_eq!(stored.symbol.to_vec(), expected.symbol.to_vec()); + assert_eq!(stored.decimals, expected.decimals); + } + + set_location{ + let name = b"NAME".to_vec(); + let ed = T::Balance::from(1_000_000u32); + let asset_id = T::AssetId::from(10u8); + let _ = crate::Pallet::::register(RawOrigin::Root.into(), name.clone(), AssetType::Token, ed, Some(asset_id), None, None, None); + + }: _(RawOrigin::Root, asset_id, Default::default()) + verify { + let bname = crate::Pallet::::to_bounded_name(name).unwrap(); + let bsymbol= crate::Pallet::::to_bounded_name(b"SYMBOL".to_vec()).unwrap(); + + assert_eq!(crate::Pallet::::locations(asset_id), Some(Default::default())); + assert_eq!(crate::Pallet::::location_assets(T::AssetNativeLocation::default()), Some(asset_id)); + } +} + +#[cfg(test)] +mod tests { + use super::Pallet; + use crate::mock::*; + use frame_benchmarking::impl_benchmark_test_suite; + + impl_benchmark_test_suite!(Pallet, super::ExtBuilder::default().build(), super::Test); +} diff --git a/pallets/asset-registry/src/lib.rs b/pallets/asset-registry/src/lib.rs new file mode 100644 index 00000000000..5a1b644593f --- /dev/null +++ b/pallets/asset-registry/src/lib.rs @@ -0,0 +1,751 @@ +// This file is part of pallet-asset-registry. + +// Copyright (C) 2020-2022 Intergalactic, Limited (GIB). +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#![cfg_attr(not(feature = "std"), no_std)] + +use frame_support::pallet_prelude::*; +use frame_support::sp_runtime::traits::CheckedAdd; +use frame_system::pallet_prelude::*; +use scale_info::TypeInfo; +use sp_arithmetic::traits::BaseArithmetic; +use sp_runtime::DispatchError; +use sp_std::convert::TryInto; +use sp_std::vec::Vec; + +#[cfg(test)] +mod mock; + +#[cfg(test)] +mod tests; + +mod benchmarking; +pub mod migration; +pub mod traits; +mod types; +pub mod weights; + +pub use weights::WeightInfo; + +pub use types::AssetType; + +// Re-export pallet items so that they can be accessed from the crate namespace. +pub use pallet::*; + +pub use crate::types::{AssetDetails, AssetMetadata}; +use frame_support::BoundedVec; +use hydradx_traits::{AssetKind, Create, Inspect}; +use traits::{CreateRegistry, InspectRegistry, Registry, ShareTokenRegistry}; + +#[frame_support::pallet] +pub mod pallet { + use super::*; + use crate::types::Metadata; + use frame_support::sp_runtime::traits::AtLeast32BitUnsigned; + + const STORAGE_VERSION: StorageVersion = StorageVersion::new(1); + + pub type AssetDetailsT = + AssetDetails<::AssetId, ::Balance, BoundedVec::StringLimit>>; + + #[pallet::config] + pub trait Config: frame_system::Config { + type RuntimeEvent: From> + IsType<::RuntimeEvent>; + + /// The origin which can work with asset-registry. + type RegistryOrigin: EnsureOrigin; + + /// Asset type + type AssetId: Parameter + + Member + + Default + + Copy + + BaseArithmetic + + MaybeSerializeDeserialize + + MaxEncodedLen + + TypeInfo; + + /// Balance type + type Balance: Parameter + + Member + + AtLeast32BitUnsigned + + Default + + Copy + + MaybeSerializeDeserialize + + MaxEncodedLen; + + /// Asset location type + type AssetNativeLocation: Parameter + Member + Default + MaxEncodedLen; + + /// The maximum length of a name or symbol stored on-chain. + type StringLimit: Get; + + #[pallet::constant] + type SequentialIdStartAt: Get; + + /// Native Asset Id + #[pallet::constant] + type NativeAssetId: Get; + + /// Weight information for the extrinsics + type WeightInfo: WeightInfo; + } + + #[pallet::pallet] + #[pallet::storage_version(STORAGE_VERSION)] + pub struct Pallet(_); + + #[pallet::hooks] + impl Hooks> for Pallet {} + + #[pallet::error] + pub enum Error { + /// Asset ID is not available. This only happens when it reaches the MAX value of given id type. + NoIdAvailable, + + /// Invalid asset name or symbol. + AssetNotFound, + + /// Invalid asset name or symbol. + TooLong, + + /// Asset ID is not registered in the asset-registry. + AssetNotRegistered, + + /// Asset is already registered. + AssetAlreadyRegistered, + + /// Incorrect number of assets provided to create shared asset. + InvalidSharedAssetLen, + + /// Cannot update asset location + CannotUpdateLocation, + + /// Selected asset id is out of reserved range. + NotInReservedRange, + + /// Location already registered with different asset + LocationAlreadyRegistered, + } + + #[pallet::storage] + #[pallet::getter(fn assets)] + /// Details of an asset. + pub type Assets = StorageMap<_, Twox64Concat, T::AssetId, AssetDetailsT, OptionQuery>; + + #[pallet::storage] + /// Next available asset id. This is sequential id assigned for each new registered asset. + pub type NextAssetId = StorageValue<_, T::AssetId, ValueQuery>; + + #[pallet::storage] + #[pallet::getter(fn asset_ids)] + /// Mapping between asset name and asset id. + pub type AssetIds = + StorageMap<_, Blake2_128Concat, BoundedVec, T::AssetId, OptionQuery>; + + #[pallet::storage] + #[pallet::getter(fn locations)] + /// Native location of an asset. + pub type AssetLocations = StorageMap<_, Twox64Concat, T::AssetId, T::AssetNativeLocation, OptionQuery>; + + #[pallet::storage] + #[pallet::getter(fn location_assets)] + /// Local asset for native location. + pub type LocationAssets = + StorageMap<_, Blake2_128Concat, T::AssetNativeLocation, T::AssetId, OptionQuery>; + + #[pallet::storage] + #[pallet::getter(fn asset_metadata)] + /// Metadata of an asset. + pub type AssetMetadataMap = + StorageMap<_, Twox64Concat, T::AssetId, AssetMetadata>, OptionQuery>; + + #[allow(clippy::type_complexity)] + #[pallet::genesis_config] + pub struct GenesisConfig { + pub registered_assets: Vec<(Vec, T::Balance, Option)>, + pub native_asset_name: Vec, + pub native_existential_deposit: T::Balance, + } + + impl Default for GenesisConfig { + fn default() -> Self { + GenesisConfig:: { + registered_assets: sp_std::vec![], + native_asset_name: b"HDX".to_vec(), + native_existential_deposit: Default::default(), + } + } + } + #[pallet::genesis_build] + impl BuildGenesisConfig for GenesisConfig { + fn build(&self) { + // Register native asset first + // It is to make sure that native is registered as any other asset + let native_asset_name = Pallet::::to_bounded_name(self.native_asset_name.to_vec()) + .map_err(|_| panic!("Invalid native asset name!")) + .unwrap(); + + AssetIds::::insert(&native_asset_name, T::NativeAssetId::get()); + let details = AssetDetails { + name: native_asset_name, + asset_type: AssetType::Token, + existential_deposit: self.native_existential_deposit, + + xcm_rate_limit: None, + }; + + Assets::::insert(T::NativeAssetId::get(), details); + + self.registered_assets.iter().for_each(|(name, ed, id)| { + let bounded_name = Pallet::::to_bounded_name(name.to_vec()) + .map_err(|_| panic!("Invalid asset name!")) + .unwrap(); + let _ = Pallet::::register_asset(bounded_name, AssetType::Token, *ed, *id, None) + .map_err(|_| panic!("Failed to register asset")); + }) + } + } + + #[pallet::event] + #[pallet::generate_deposit(pub(super) fn deposit_event)] + pub enum Event { + /// Asset was registered. + Registered { + asset_id: T::AssetId, + asset_name: BoundedVec, + asset_type: AssetType, + }, + + /// Asset was updated. + Updated { + asset_id: T::AssetId, + asset_name: BoundedVec, + asset_type: AssetType, + existential_deposit: T::Balance, + xcm_rate_limit: Option, + }, + + /// Metadata set for an asset. + MetadataSet { + asset_id: T::AssetId, + symbol: BoundedVec, + decimals: u8, + }, + + /// Native location set for an asset. + LocationSet { + asset_id: T::AssetId, + location: T::AssetNativeLocation, + }, + } + + #[pallet::call] + impl Pallet { + /// Register a new asset. + /// + /// Asset is identified by `name` and the name must not be used to register another asset. + /// + /// New asset is given `NextAssetId` - sequential asset id + /// + /// Adds mapping between `name` and assigned `asset_id` so asset id can be retrieved by name too (Note: this approach is used in AMM implementation (xyk)) + /// + /// Emits 'Registered` event when successful. + #[allow(clippy::too_many_arguments)] + #[pallet::call_index(0)] + #[pallet::weight(::WeightInfo::register())] + pub fn register( + origin: OriginFor, + name: Vec, + asset_type: AssetType, + existential_deposit: T::Balance, + asset_id: Option, + metadata: Option, + location: Option, + xcm_rate_limit: Option, + ) -> DispatchResult { + T::RegistryOrigin::ensure_origin(origin)?; + + let bounded_name = Self::to_bounded_name(name)?; + + ensure!( + Self::asset_ids(&bounded_name).is_none(), + Error::::AssetAlreadyRegistered + ); + + let asset_id = + Self::register_asset(bounded_name, asset_type, existential_deposit, asset_id, xcm_rate_limit)?; + + if let Some(meta) = metadata { + let symbol = Self::to_bounded_name(meta.symbol)?; + AssetMetadataMap::::insert( + asset_id, + AssetMetadata { + symbol: symbol.clone(), + decimals: meta.decimals, + }, + ); + + Self::deposit_event(Event::MetadataSet { + asset_id, + symbol, + decimals: meta.decimals, + }); + } + + if let Some(loc) = location { + ensure!(asset_id != T::NativeAssetId::get(), Error::::CannotUpdateLocation); + ensure!( + Self::location_assets(&loc).is_none(), + Error::::LocationAlreadyRegistered + ); + AssetLocations::::insert(asset_id, &loc); + LocationAssets::::insert(&loc, asset_id); + + Self::deposit_event(Event::LocationSet { + asset_id, + location: loc, + }); + } + + Ok(()) + } + + /// Update registered asset. + /// + /// Updates also mapping between name and asset id if provided name is different than currently registered. + /// + /// Emits `Updated` event when successful. + + // TODO: No tests + #[pallet::call_index(1)] + #[pallet::weight(::WeightInfo::update())] + pub fn update( + origin: OriginFor, + asset_id: T::AssetId, + name: Vec, + asset_type: AssetType, + existential_deposit: Option, + xcm_rate_limit: Option, + ) -> DispatchResult { + T::RegistryOrigin::ensure_origin(origin)?; + + Assets::::try_mutate(asset_id, |maybe_detail| -> DispatchResult { + let detail = maybe_detail.as_mut().ok_or(Error::::AssetNotFound)?; + + let bounded_name = Self::to_bounded_name(name)?; + + if bounded_name != detail.name { + // Make sure that there is no such name already registered + ensure!( + Self::asset_ids(&bounded_name).is_none(), + Error::::AssetAlreadyRegistered + ); + + // update also name map - remove old one first + AssetIds::::remove(&detail.name); + AssetIds::::insert(&bounded_name, asset_id); + } + + detail.name = bounded_name.clone(); + detail.asset_type = asset_type; + detail.existential_deposit = existential_deposit.unwrap_or(detail.existential_deposit); + detail.xcm_rate_limit = xcm_rate_limit; + + Self::deposit_event(Event::Updated { + asset_id, + asset_name: bounded_name, + asset_type, + existential_deposit: detail.existential_deposit, + xcm_rate_limit: detail.xcm_rate_limit, + }); + + Ok(()) + }) + } + + /// Set metadata for an asset. + /// + /// - `asset_id`: Asset identifier. + /// - `symbol`: The exchange symbol for this asset. Limited in length by `StringLimit`. + /// - `decimals`: The number of decimals this asset uses to represent one unit. + /// + /// Emits `MetadataSet` event when successful. + #[pallet::call_index(2)] + #[pallet::weight(::WeightInfo::set_metadata())] + pub fn set_metadata( + origin: OriginFor, + asset_id: T::AssetId, + symbol: Vec, + decimals: u8, + ) -> DispatchResult { + T::RegistryOrigin::ensure_origin(origin)?; + + ensure!(Self::assets(asset_id).is_some(), Error::::AssetNotFound); + + let b_symbol = Self::to_bounded_name(symbol)?; + + let metadata = AssetMetadata::> { + symbol: b_symbol.clone(), + decimals, + }; + + AssetMetadataMap::::insert(asset_id, metadata); + + Self::deposit_event(Event::MetadataSet { + asset_id, + symbol: b_symbol, + decimals, + }); + + Ok(()) + } + + /// Set asset native location. + /// + /// Adds mapping between native location and local asset id and vice versa. + /// + /// Mainly used in XCM. + /// + /// Emits `LocationSet` event when successful. + #[pallet::call_index(3)] + #[pallet::weight(::WeightInfo::set_location())] + pub fn set_location( + origin: OriginFor, + asset_id: T::AssetId, + location: T::AssetNativeLocation, + ) -> DispatchResult { + T::RegistryOrigin::ensure_origin(origin)?; + + ensure!(asset_id != T::NativeAssetId::get(), Error::::CannotUpdateLocation); + ensure!(Self::assets(asset_id).is_some(), Error::::AssetNotRegistered); + ensure!( + Self::location_assets(&location).is_none(), + Error::::LocationAlreadyRegistered + ); + + if let Some(old_location) = AssetLocations::::take(asset_id) { + LocationAssets::::remove(&old_location); + } + AssetLocations::::insert(asset_id, &location); + LocationAssets::::insert(&location, asset_id); + + Self::deposit_event(Event::LocationSet { asset_id, location }); + + Ok(()) + } + } +} + +impl Pallet { + pub fn next_asset_id() -> Option { + NextAssetId::::get().checked_add(&T::SequentialIdStartAt::get()) + } + + /// Convert Vec to BoundedVec so it respects the max set limit, otherwise return TooLong error + pub fn to_bounded_name(name: Vec) -> Result, Error> { + name.try_into().map_err(|_| Error::::TooLong) + } + + /// Register new asset. + /// + /// Does not perform any check whether an asset for given name already exists. This has to be prior to calling this function. + pub fn register_asset( + name: BoundedVec, + asset_type: AssetType, + existential_deposit: T::Balance, + selected_asset_id: Option, + xcm_rate_limit: Option, + ) -> Result { + let asset_id = if let Some(selected_id) = selected_asset_id { + ensure!( + selected_id < T::SequentialIdStartAt::get(), + Error::::NotInReservedRange + ); + + ensure!( + !Assets::::contains_key(selected_id), + Error::::AssetAlreadyRegistered + ); + + selected_id + } else { + NextAssetId::::mutate(|value| -> Result { + // Check if current id does not clash with CORE ASSET ID. + // If yes, just skip it and use next one, otherwise use it. + // Note: this way we prevent accidental clashes with native asset id, so no need to set next asset id to be > next asset id + let next_asset_id = if *value == T::NativeAssetId::get() { + value + .checked_add(&T::AssetId::from(1)) + .ok_or(Error::::NoIdAvailable)? + } else { + *value + }; + + *value = next_asset_id + .checked_add(&T::AssetId::from(1)) + .ok_or(Error::::NoIdAvailable)?; + + Ok(next_asset_id + .checked_add(&T::SequentialIdStartAt::get()) + .ok_or(Error::::NoIdAvailable)?) + })? + }; + + AssetIds::::insert(&name, asset_id); + + let details = AssetDetails { + name: name.clone(), + asset_type, + existential_deposit, + xcm_rate_limit, + }; + + // Store the details + Assets::::insert(asset_id, details); + + // Increase asset id to be assigned for following asset. + + Self::deposit_event(Event::Registered { + asset_id, + asset_name: name, + asset_type, + }); + + Ok(asset_id) + } + + /// Create asset for given name or return existing AssetId if such asset already exists. + pub fn get_or_create_asset( + name: Vec, + asset_type: AssetType, + existential_deposit: T::Balance, + asset_id: Option, + ) -> Result { + let bounded_name: BoundedVec = Self::to_bounded_name(name)?; + + if let Some(asset_id) = AssetIds::::get(&bounded_name) { + Ok(asset_id) + } else { + Self::register_asset(bounded_name, asset_type, existential_deposit, asset_id, None) + } + } + + /// Return location for given asset. + pub fn asset_to_location(asset_id: T::AssetId) -> Option { + Self::locations(asset_id) + } + + /// Return asset for given loation. + pub fn location_to_asset(location: T::AssetNativeLocation) -> Option { + Self::location_assets(location) + } +} + +impl Registry, T::Balance, DispatchError> for Pallet { + fn exists(asset_id: T::AssetId) -> bool { + Assets::::contains_key(asset_id) + } + + fn retrieve_asset(name: &Vec) -> Result { + let bounded_name = Self::to_bounded_name(name.clone())?; + if let Some(asset_id) = AssetIds::::get(bounded_name) { + Ok(asset_id) + } else { + Err(Error::::AssetNotFound.into()) + } + } + + fn retrieve_asset_type(asset_id: T::AssetId) -> Result { + let asset_details = + Assets::::get(asset_id).ok_or_else(|| Into::::into(Error::::AssetNotFound))?; + Ok(asset_details.asset_type.into()) + } + + fn create_asset(name: &Vec, existential_deposit: T::Balance) -> Result { + Self::get_or_create_asset(name.clone(), AssetType::Token, existential_deposit, None) + } +} + +impl ShareTokenRegistry, T::Balance, DispatchError> for Pallet { + fn retrieve_shared_asset(name: &Vec, _assets: &[T::AssetId]) -> Result { + Self::retrieve_asset(name) + } + + fn create_shared_asset( + name: &Vec, + assets: &[T::AssetId], + existential_deposit: T::Balance, + ) -> Result { + ensure!(assets.len() == 2, Error::::InvalidSharedAssetLen); + Self::get_or_create_asset( + name.clone(), + AssetType::PoolShare(assets[0], assets[1]), + existential_deposit, + None, + ) + } +} + +use crate::types::{Name, Symbol}; +use orml_traits::GetByKey; +use sp_arithmetic::traits::Bounded; + +// Return Existential deposit of an asset +impl GetByKey for Pallet { + fn get(k: &T::AssetId) -> T::Balance { + if let Some(details) = Self::assets(k) { + details.existential_deposit + } else { + // Asset does not exist - not supported + T::Balance::max_value() + } + } +} + +/// Allows querying the XCM rate limit for an asset by its id. +pub struct XcmRateLimitsInRegistry(PhantomData); +/// Allows querying the XCM rate limit for an asset by its id. +/// Both a unknown asset and an unset rate limit will return `None`. +impl GetByKey> for XcmRateLimitsInRegistry { + fn get(k: &T::AssetId) -> Option { + Pallet::::assets(k).and_then(|details| details.xcm_rate_limit) + } +} + +impl CreateRegistry for Pallet { + type Error = DispatchError; + + fn create_asset(name: &[u8], kind: AssetKind, existential_deposit: T::Balance) -> Result { + let bounded_name: BoundedVec = Self::to_bounded_name(name.to_vec())?; + Pallet::::register_asset(bounded_name, kind.into(), existential_deposit, None, None) + } +} + +impl InspectRegistry for Pallet { + fn exists(asset_id: T::AssetId) -> bool { + Assets::::contains_key(asset_id) + } + + fn decimals(asset_id: T::AssetId) -> Option { + Some(AssetMetadataMap::::get(asset_id)?.decimals) + } + + fn asset_name(asset_id: T::AssetId) -> Option> { + let asset = Assets::::get(asset_id)?; + Some(asset.name.into_inner()) + } + + fn asset_symbol(asset_id: T::AssetId) -> Option> { + let asset_metadata = AssetMetadataMap::::get(asset_id)?; + Some(asset_metadata.symbol.into_inner()) + } +} + +impl> Inspect for Pallet { + type AssetId = T::AssetId; + type Location = T::AssetNativeLocation; + + fn is_sufficient(_id: Self::AssetId) -> bool { + true + } + + fn exists(id: Self::AssetId) -> bool { + Assets::::contains_key(id) + } + + fn decimals(id: Self::AssetId) -> Option { + Self::asset_metadata(id).map(|a| a.decimals) + } + + fn asset_type(id: Self::AssetId) -> Option { + Self::assets(id).map(|a| a.asset_type.into()) + } + + fn is_banned(_id: Self::AssetId) -> bool { + false + } + + fn asset_name(id: Self::AssetId) -> Option> { + Self::assets(id).map(|a| a.name.to_vec()) + } + + fn asset_symbol(id: Self::AssetId) -> Option> { + Self::asset_metadata(id).map(|a| a.symbol.to_vec()) + } + + fn existential_deposit(id: Self::AssetId) -> Option { + Self::assets(id).map(|a| a.existential_deposit) + } +} + +/// Default value of existential deposit. This value is used if existential deposit wasn't +/// provided. +pub const DEFAULT_ED: u128 = 1; + +// Dev note: this comes from new version of asset registry, but in order to support new xyk, we need to implement it here +// but we can ignore the new fields for now +impl> Create for Pallet { + type Error = DispatchError; + type Name = Name; + type Symbol = Symbol; + + fn register_asset( + asset_id: Option, + name: Option, + kind: AssetKind, + existential_deposit: Option, + _symbol: Option, + _decimals: Option, + _location: Option, + xcm_rate_limit: Option, + _is_sufficient: bool, + ) -> Result { + let Some(asset_name) = name else { + return Err(Error::::TooLong.into()); + }; + + Self::register_asset( + asset_name, + kind.into(), + existential_deposit.unwrap_or(DEFAULT_ED), + asset_id, + xcm_rate_limit, + ) + } + + fn get_or_register_asset( + name: Self::Name, + kind: AssetKind, + existential_deposit: Option, + _symbol: Option, + _decimals: Option, + _location: Option, + xcm_rate_limit: Option, + _is_sufficient: bool, + ) -> Result { + match Self::asset_ids(&name) { + Some(id) => Ok(id), + None => Self::register_asset( + name, + kind.into(), + existential_deposit.unwrap_or(DEFAULT_ED), + None, + xcm_rate_limit, + ), + } + } +} diff --git a/pallets/asset-registry/src/migration.rs b/pallets/asset-registry/src/migration.rs new file mode 100644 index 00000000000..26fc5986d50 --- /dev/null +++ b/pallets/asset-registry/src/migration.rs @@ -0,0 +1,90 @@ +// This file is part of pallet-asset-registry + +// Copyright (C) 2020-2023 Intergalactic, Limited (GIB). +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License.. + +use crate::{AssetDetails, AssetType, Assets, Config, Pallet}; +use frame_support::{ + traits::{Get, StorageVersion}, + weights::Weight, +}; + +/// +pub mod v1 { + use super::*; + use codec::{Decode, Encode}; + use scale_info::TypeInfo; + use sp_core::RuntimeDebug; + + #[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, TypeInfo)] + pub struct OldAssetDetails { + /// The name of this asset. Limited in length by `StringLimit`. + pub(super) name: BoundedString, + + pub(super) asset_type: AssetType, + + pub(super) existential_deposit: Balance, + + pub(super) locked: bool, + } + + pub fn pre_migrate() { + assert_eq!(StorageVersion::get::>(), 0, "Storage version too high."); + + log::info!( + target: "runtime::asset-registry", + "Asset Registry migration: PRE checks successful!" + ); + } + + pub fn migrate() -> Weight { + log::info!( + target: "runtime::asset-registry", + "Running migration to v1 for Asset Registry" + ); + + let mut i = 0; + Assets::::translate( + |_key, + OldAssetDetails { + name, + asset_type, + existential_deposit, + locked: _, + }| { + i += 1; + Some(AssetDetails { + name, + asset_type, + existential_deposit, + xcm_rate_limit: None, + }) + }, + ); + + StorageVersion::new(1).put::>(); + + T::DbWeight::get().reads_writes(i, i) + } + + pub fn post_migrate() { + assert_eq!(StorageVersion::get::>(), 1, "Unexpected storage version."); + + log::info!( + target: "runtime::asset-registry", + "Asset Registry migration: POST checks successful!" + ); + } +} diff --git a/pallets/asset-registry/src/mock.rs b/pallets/asset-registry/src/mock.rs new file mode 100644 index 00000000000..6bc0fce114a --- /dev/null +++ b/pallets/asset-registry/src/mock.rs @@ -0,0 +1,150 @@ +// This file is part of pallet-asset-registry. + +// Copyright (C) 2020-2022 Intergalactic, Limited (GIB). +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#![cfg(test)] + +use frame_support::parameter_types; +use frame_system as system; +use sp_core::H256; +use sp_runtime::{ + traits::{BlakeTwo256, IdentityLookup}, + BuildStorage, +}; + +use frame_support::traits::Everything; + +use polkadot_xcm::v3::MultiLocation; + +use crate::{self as asset_registry, Config}; + +pub type AssetId = u32; +pub type Balance = u128; + +pub const UNIT: Balance = 1_000_000_000_000; + +type Block = frame_system::mocking::MockBlock; + +frame_support::construct_runtime!( + pub enum Test + { + System: frame_system, + Registry: asset_registry, + } + +); + +parameter_types! { + pub const BlockHashCount: u64 = 250; + pub const SS58Prefix: u8 = 63; + pub const NativeAssetId: AssetId = 0; + pub const RegistryStringLimit: u32 = 10; + pub const SequentialIdStart: u32 = 1_000_000; +} + +impl system::Config for Test { + type BaseCallFilter = Everything; + type BlockWeights = (); + type BlockLength = (); + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; + type RuntimeTask = RuntimeTask; + type Nonce = u64; + type Block = Block; + type Hash = H256; + type Hashing = BlakeTwo256; + type AccountId = u64; + type Lookup = IdentityLookup; + type RuntimeEvent = RuntimeEvent; + type BlockHashCount = BlockHashCount; + type DbWeight = (); + type Version = (); + type PalletInfo = PalletInfo; + type AccountData = (); + type OnNewAccount = (); + type OnKilledAccount = (); + type SystemWeightInfo = (); + type SS58Prefix = SS58Prefix; + type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; +} + +use codec::{Decode, Encode, MaxEncodedLen}; +use scale_info::TypeInfo; + +#[derive(Debug, Default, Encode, Decode, Clone, PartialEq, Eq, TypeInfo, MaxEncodedLen)] +pub struct AssetLocation(pub MultiLocation); + +impl Config for Test { + type RuntimeEvent = RuntimeEvent; + type RegistryOrigin = frame_system::EnsureRoot; + type AssetId = u32; + type Balance = Balance; + type AssetNativeLocation = AssetLocation; + type StringLimit = RegistryStringLimit; + type SequentialIdStartAt = SequentialIdStart; + type NativeAssetId = NativeAssetId; + type WeightInfo = (); +} +pub type AssetRegistryPallet = crate::Pallet; + +#[derive(Default)] +pub struct ExtBuilder { + registered_assets: Vec<(Vec, Balance, Option)>, + native_asset_name: Option>, +} + +impl ExtBuilder { + pub fn with_assets(mut self, asset_ids: Vec<(Vec, Balance, Option)>) -> Self { + self.registered_assets = asset_ids; + self + } + + pub fn with_native_asset_name(mut self, name: Vec) -> Self { + self.native_asset_name = Some(name); + self + } + + pub fn build(self) -> sp_io::TestExternalities { + let mut t = frame_system::GenesisConfig::::default().build_storage().unwrap(); + + if let Some(name) = self.native_asset_name { + crate::GenesisConfig:: { + registered_assets: self.registered_assets, + native_asset_name: name, + native_existential_deposit: 1_000_000u128, + } + } else { + crate::GenesisConfig:: { + registered_assets: self.registered_assets, + ..Default::default() + } + } + .assimilate_storage(&mut t) + .unwrap(); + t.into() + } +} + +pub fn new_test_ext() -> sp_io::TestExternalities { + let mut ext = ExtBuilder::default().build(); + ext.execute_with(|| System::set_block_number(1)); + ext +} + +pub fn expect_events(e: Vec) { + test_utils::expect_events::(e); +} diff --git a/pallets/asset-registry/src/tests.rs b/pallets/asset-registry/src/tests.rs new file mode 100644 index 00000000000..ed4f60fcb21 --- /dev/null +++ b/pallets/asset-registry/src/tests.rs @@ -0,0 +1,865 @@ +// This file is part of pallet-asset-registry. + +// Copyright (C) 2020-2022 Intergalactic, Limited (GIB). +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +use super::Error; +use crate::mock::AssetId as RegistryAssetId; +use crate::types::{AssetDetails, AssetMetadata, AssetType, Metadata}; +use crate::Event; +use crate::{mock::*, XcmRateLimitsInRegistry}; +use codec::Encode; +use frame_support::{assert_noop, assert_ok, BoundedVec}; +use orml_traits::GetByKey; +use polkadot_xcm::v3::prelude::*; +use sp_std::convert::TryInto; + +#[test] +fn register_asset_works() { + new_test_ext().execute_with(|| { + let too_long = [1u8; ::StringLimit::get() as usize + 1]; + + let ed = 1_000_000u128; + + assert_noop!( + AssetRegistryPallet::register( + RuntimeOrigin::root(), + too_long.to_vec(), + AssetType::Token, + ed, + None, + None, + None, + None + ), + Error::::TooLong + ); + + let name: Vec = b"BSX".to_vec(); + + assert_ok!(AssetRegistryPallet::register( + RuntimeOrigin::root(), + name.clone(), + AssetType::Token, + ed, + None, + None, + None, + None + )); + + let bn = AssetRegistryPallet::to_bounded_name(name.clone()).unwrap(); + + expect_events(vec![Event::Registered { + asset_id: 1 + SequentialIdStart::get(), + asset_name: bn.clone(), + asset_type: AssetType::Token, + } + .into()]); + + assert_eq!( + AssetRegistryPallet::asset_ids(&bn).unwrap(), + 1u32 + SequentialIdStart::get() + ); + assert_eq!( + AssetRegistryPallet::assets(1u32 + SequentialIdStart::get()).unwrap(), + AssetDetails { + name: bn, + asset_type: AssetType::Token, + existential_deposit: ed, + xcm_rate_limit: None, + } + ); + + assert_noop!( + AssetRegistryPallet::register( + RuntimeOrigin::root(), + name, + AssetType::Token, + ed, + None, + None, + None, + None + ), + Error::::AssetAlreadyRegistered + ); + }); +} + +#[test] +fn create_asset() { + new_test_ext().execute_with(|| { + let ed = 1_000_000u128; + + assert_ok!(AssetRegistryPallet::get_or_create_asset( + b"BSX".to_vec(), + AssetType::Token, + ed, + None, + )); + + let dot_asset = AssetRegistryPallet::get_or_create_asset(b"DOT".to_vec(), AssetType::Token, ed, None); + assert_ok!(dot_asset); + let dot_asset_id = dot_asset.ok().unwrap(); + + assert_ok!(AssetRegistryPallet::get_or_create_asset( + b"BTC".to_vec(), + AssetType::Token, + ed, + None, + )); + + let current_asset_id = AssetRegistryPallet::next_asset_id().unwrap(); + + // Existing asset should return previously created one. + assert_ok!( + AssetRegistryPallet::get_or_create_asset(b"DOT".to_vec(), AssetType::Token, ed, None), + dot_asset_id + ); + + // Retrieving existing asset should not increased the next asset id counter. + assert_eq!(AssetRegistryPallet::next_asset_id().unwrap(), current_asset_id); + + let dot: BoundedVec::StringLimit> = b"DOT".to_vec().try_into().unwrap(); + let aaa: BoundedVec::StringLimit> = b"AAA".to_vec().try_into().unwrap(); + + assert_eq!( + AssetRegistryPallet::asset_ids(dot).unwrap(), + 2u32 + SequentialIdStart::get() + ); + assert!(AssetRegistryPallet::asset_ids(aaa).is_none()); + }); +} + +#[test] +fn location_mapping_works() { + new_test_ext().execute_with(|| { + let bn = AssetRegistryPallet::to_bounded_name(b"BSX".to_vec()).unwrap(); + + let ed = 1_000_000u128; + + assert_ok!(AssetRegistryPallet::get_or_create_asset( + b"BSX".to_vec(), + AssetType::Token, + ed, + None, + )); + let asset_id: RegistryAssetId = + AssetRegistryPallet::get_or_create_asset(b"BSX".to_vec(), AssetType::Token, ed, None).unwrap(); + + crate::Assets::::insert( + asset_id, + AssetDetails::> { + name: bn, + asset_type: AssetType::Token, + existential_deposit: ed, + xcm_rate_limit: None, + }, + ); + + let key = Junction::from(BoundedVec::try_from(asset_id.encode()).unwrap()); + let asset_location = AssetLocation(MultiLocation::new(0, X2(Parachain(200), key))); + + assert_ok!(AssetRegistryPallet::set_location( + RuntimeOrigin::root(), + asset_id, + asset_location.clone() + )); + + expect_events(vec![Event::LocationSet { + asset_id: 1 + SequentialIdStart::get(), + location: asset_location.clone(), + } + .into()]); + + assert_eq!( + AssetRegistryPallet::location_to_asset(asset_location.clone()), + Some(asset_id) + ); + assert_eq!( + AssetRegistryPallet::asset_to_location(asset_id), + Some(asset_location.clone()) + ); + + // asset location for the native asset cannot be changed + assert_noop!( + AssetRegistryPallet::set_location( + RuntimeOrigin::root(), + ::NativeAssetId::get(), + asset_location + ), + Error::::CannotUpdateLocation + ); + }); +} + +#[test] +fn genesis_config_works() { + ExtBuilder::default() + .with_native_asset_name(b"NATIVE".to_vec()) + .build() + .execute_with(|| { + let native: BoundedVec::StringLimit> = b"NATIVE".to_vec().try_into().unwrap(); + assert_eq!(AssetRegistryPallet::asset_ids(native).unwrap(), 0u32); + }); + + let one = b"ONE".to_vec(); + let life = b"LIFE".to_vec(); + + ExtBuilder::default() + .with_assets(vec![ + (one.clone(), 1_000u128, None), + (life.clone(), 1_000u128, Some(42)), + ]) + .build() + .execute_with(|| { + let native: BoundedVec::StringLimit> = b"NATIVE".to_vec().try_into().unwrap(); + assert_eq!(AssetRegistryPallet::asset_ids(native), None); + + let bsx: BoundedVec::StringLimit> = b"HDX".to_vec().try_into().unwrap(); + assert_eq!(AssetRegistryPallet::asset_ids(bsx).unwrap(), 0u32); + + let one: BoundedVec::StringLimit> = one.try_into().unwrap(); + assert_eq!( + AssetRegistryPallet::asset_ids(one.clone()).unwrap(), + 1u32 + SequentialIdStart::get() + ); + assert_eq!( + AssetRegistryPallet::assets(1u32 + SequentialIdStart::get()).unwrap(), + AssetDetails { + name: one, + asset_type: AssetType::Token, + existential_deposit: 1_000u128, + xcm_rate_limit: None, + } + ); + + let life: BoundedVec::StringLimit> = life.try_into().unwrap(); + assert_eq!(AssetRegistryPallet::asset_ids(life.clone()).unwrap(), 42u32); + assert_eq!( + AssetRegistryPallet::assets(42u32).unwrap(), + AssetDetails { + name: life, + asset_type: AssetType::Token, + existential_deposit: 1_000u128, + xcm_rate_limit: None, + } + ); + }); +} + +#[test] +fn set_metadata_works() { + ExtBuilder::default() + .with_assets(vec![(b"DOT".to_vec(), 1_000u128, None)]) + .build() + .execute_with(|| { + System::set_block_number(1); //TO have the ement emitted + + let dot: BoundedVec::StringLimit> = b"DOT".to_vec().try_into().unwrap(); + let dot_id = AssetRegistryPallet::asset_ids(dot).unwrap(); + let b_symbol: BoundedVec::StringLimit> = b"xDOT".to_vec().try_into().unwrap(); + + assert_ok!(AssetRegistryPallet::set_metadata( + RuntimeOrigin::root(), + dot_id, + b"xDOT".to_vec(), + 12u8 + )); + + expect_events(vec![Event::MetadataSet { + asset_id: dot_id, + symbol: b_symbol.clone(), + decimals: 12u8, + } + .into()]); + + assert_eq!( + AssetRegistryPallet::asset_metadata(dot_id).unwrap(), + AssetMetadata { + decimals: 12u8, + symbol: b_symbol.clone(), + } + ); + + assert_ok!(AssetRegistryPallet::set_metadata( + RuntimeOrigin::root(), + dot_id, + b"xDOT".to_vec(), + 30u8 + )); + + assert_eq!( + AssetRegistryPallet::asset_metadata(dot_id).unwrap(), + AssetMetadata { + decimals: 30u8, + symbol: b_symbol, + } + ); + + assert_noop!( + AssetRegistryPallet::set_metadata(RuntimeOrigin::root(), dot_id, b"JUST_TOO_LONG".to_vec(), 30u8), + Error::::TooLong + ); + + assert_noop!( + AssetRegistryPallet::set_metadata(RuntimeOrigin::root(), 100, b"NONE".to_vec(), 30u8), + Error::::AssetNotFound + ); + }); +} + +#[test] +fn update_asset() { + new_test_ext().execute_with(|| { + let ed = 1_000_000u128; + + let btc_asset_id: RegistryAssetId = + AssetRegistryPallet::get_or_create_asset(b"BTC".to_vec(), AssetType::Token, ed, None).unwrap(); + let usd_asset_id: RegistryAssetId = + AssetRegistryPallet::get_or_create_asset(b"USD".to_vec(), AssetType::Token, ed, None).unwrap(); + + let next_asset_id = AssetRegistryPallet::next_asset_id().unwrap(); + + // set a new name and type for an existing asset + assert_ok!(AssetRegistryPallet::update( + RuntimeOrigin::root(), + btc_asset_id, + b"superBTC".to_vec(), + AssetType::Token, + None, + None, + )); + let bn = AssetRegistryPallet::to_bounded_name(b"superBTC".to_vec()).unwrap(); + + expect_events(vec![Event::Updated { + asset_id: btc_asset_id, + asset_name: bn.clone(), + asset_type: AssetType::Token, + existential_deposit: 1_000_000, + xcm_rate_limit: None, + } + .into()]); + + assert_eq!( + AssetRegistryPallet::assets(btc_asset_id).unwrap(), + AssetDetails { + name: bn, + asset_type: AssetType::Token, + existential_deposit: ed, + xcm_rate_limit: None, + } + ); + + let new_btc_name: BoundedVec::StringLimit> = + b"superBTC".to_vec().try_into().unwrap(); + assert_eq!( + AssetRegistryPallet::asset_ids(new_btc_name).unwrap(), + 1u32 + SequentialIdStart::get() + ); + + // cannot set existing name for an existing asset + assert_noop!( + (AssetRegistryPallet::update( + RuntimeOrigin::root(), + usd_asset_id, + b"superBTC".to_vec(), + AssetType::Token, + None, + None, + )), + Error::::AssetAlreadyRegistered + ); + + // cannot set a new name for a non-existent asset + assert_noop!( + (AssetRegistryPallet::update( + RuntimeOrigin::root(), + next_asset_id, + b"VOID".to_vec(), + AssetType::Token, + None, + None, + )), + Error::::AssetNotFound + ); + + // corner case: change the name and also the type for an existing asset (token -> pool share) + assert_ok!(AssetRegistryPallet::update( + RuntimeOrigin::root(), + btc_asset_id, + b"BTCUSD".to_vec(), + AssetType::PoolShare(btc_asset_id, usd_asset_id), + None, + None, + )); + + // Update ED + assert_ok!(AssetRegistryPallet::update( + RuntimeOrigin::root(), + btc_asset_id, + b"BTCUSD".to_vec(), + AssetType::PoolShare(btc_asset_id, usd_asset_id), + Some(1_234_567u128), + None, + )); + + let btcusd = AssetRegistryPallet::to_bounded_name(b"BTCUSD".to_vec()).unwrap(); + + assert_eq!( + AssetRegistryPallet::assets(btc_asset_id).unwrap(), + AssetDetails { + name: btcusd, + asset_type: AssetType::PoolShare(btc_asset_id, usd_asset_id), + existential_deposit: 1_234_567u128, + xcm_rate_limit: None, + } + ); + + // corner case: change the name and also the type for an existing asset (pool share -> token) + assert_ok!(AssetRegistryPallet::update( + RuntimeOrigin::root(), + btc_asset_id, + b"superBTC".to_vec(), + AssetType::Token, + None, + None, + )); + + let superbtc_name: BoundedVec::StringLimit> = + b"superBTC".to_vec().try_into().unwrap(); + + assert_eq!( + AssetRegistryPallet::assets(1u32 + SequentialIdStart::get()).unwrap(), + AssetDetails { + name: superbtc_name, + asset_type: AssetType::Token, + existential_deposit: 1_234_567u128, + xcm_rate_limit: None, + } + ); + }); +} + +#[test] +fn update_should_update_xcm_rate_limit() { + new_test_ext().execute_with(|| { + let ed = 1_000_000u128; + + let btc_asset_id: RegistryAssetId = + AssetRegistryPallet::get_or_create_asset(b"BTC".to_vec(), AssetType::Token, ed, None).unwrap(); + + assert_ok!(AssetRegistryPallet::update( + RuntimeOrigin::root(), + btc_asset_id, + b"superBTC".to_vec(), + AssetType::Token, + None, + Some(1000 * UNIT) + )); + + let bn = AssetRegistryPallet::to_bounded_name(b"superBTC".to_vec()).unwrap(); + + assert_eq!( + AssetRegistryPallet::assets(btc_asset_id).unwrap(), + AssetDetails { + name: bn.clone(), + asset_type: AssetType::Token, + existential_deposit: ed, + xcm_rate_limit: Some(1000 * UNIT), + } + ); + + assert_eq!(XcmRateLimitsInRegistry::::get(&btc_asset_id), Some(1000 * UNIT)); + + expect_events(vec![Event::Updated { + asset_id: btc_asset_id, + asset_name: bn, + asset_type: AssetType::Token, + existential_deposit: ed, + xcm_rate_limit: Some(1000 * UNIT), + } + .into()]); + }); +} + +#[test] +fn get_ed_by_key_works() { + ExtBuilder::default() + .with_native_asset_name(b"NATIVE".to_vec()) + .with_assets(vec![ + (b"ONE".to_vec(), 1_000u128, None), + (b"TWO".to_vec(), 2_000u128, None), + ]) + .build() + .execute_with(|| { + assert_eq!(AssetRegistryPallet::get(&(1u32 + SequentialIdStart::get())), 1_000u128); + assert_eq!(AssetRegistryPallet::get(&(2u32 + SequentialIdStart::get())), 2_000u128); + assert_eq!(AssetRegistryPallet::get(&0u32), 1_000_000u128); + assert_eq!( + AssetRegistryPallet::get(&(1_000u32 + SequentialIdStart::get())), + Balance::MAX + ); // Non-existing assets are not supported + }); +} + +#[test] +fn register_asset_should_work_when_asset_is_provided() { + ExtBuilder::default() + .with_native_asset_name(b"NATIVE".to_vec()) + .build() + .execute_with(|| { + assert_ok!(AssetRegistryPallet::register( + RuntimeOrigin::root(), + b"asset_id".to_vec(), + AssetType::Token, + 1_000_000, + Some(1u32), + None, + None, + None + ),); + + let bn = AssetRegistryPallet::to_bounded_name(b"asset_id".to_vec()).unwrap(); + assert_eq!( + AssetRegistryPallet::assets(1u32).unwrap(), + AssetDetails { + name: bn, + asset_type: AssetType::Token, + existential_deposit: 1_000_000, + xcm_rate_limit: None, + } + ); + }); +} + +#[test] +fn register_asset_should_fail_when_provided_asset_is_native_asset() { + ExtBuilder::default().build().execute_with(|| { + assert_noop!( + AssetRegistryPallet::register( + RuntimeOrigin::root(), + b"asset_id".to_vec(), + AssetType::Token, + 1_000_000, + Some(NativeAssetId::get()), + None, + None, + None + ), + Error::::AssetAlreadyRegistered + ); + }); +} + +#[test] +fn register_asset_should_fail_when_provided_asset_is_already_registered() { + ExtBuilder::default().build().execute_with(|| { + assert_ok!(AssetRegistryPallet::register( + RuntimeOrigin::root(), + b"asset_id".to_vec(), + AssetType::Token, + 1_000_000, + Some(10), + None, + None, + None + )); + assert_noop!( + AssetRegistryPallet::register( + RuntimeOrigin::root(), + b"asset_id_2".to_vec(), + AssetType::Token, + 1_000_000, + Some(10), + None, + None, + None + ), + Error::::AssetAlreadyRegistered + ); + }); +} + +#[test] +fn register_asset_should_fail_when_provided_asset_is_outside_reserved_range() { + ExtBuilder::default() + .with_native_asset_name(b"NATIVE".to_vec()) + .build() + .execute_with(|| { + assert_noop!( + AssetRegistryPallet::register( + RuntimeOrigin::root(), + b"asset_id".to_vec(), + AssetType::Token, + 1_000_000, + Some(SequentialIdStart::get()), + None, + None, + None + ), + Error::::NotInReservedRange + ); + + assert_noop!( + AssetRegistryPallet::register( + RuntimeOrigin::root(), + b"asset_id".to_vec(), + AssetType::Token, + 1_000_000, + Some(SequentialIdStart::get() + 100), + None, + None, + None + ), + Error::::NotInReservedRange + ); + }); +} + +#[test] +fn register_asset_should_work_when_metadata_is_provided() { + new_test_ext().execute_with(|| { + let asset_id: RegistryAssetId = 10; + let decimals = 18; + let symbol = b"SYM".to_vec(); + let asset_name = b"asset_name".to_vec(); + let b_symbol = AssetRegistryPallet::to_bounded_name(symbol.clone()).unwrap(); + let b_asset_name = AssetRegistryPallet::to_bounded_name(asset_name.clone()).unwrap(); + + assert_ok!(AssetRegistryPallet::register( + RuntimeOrigin::root(), + asset_name, + AssetType::Token, + 1_000_000, + Some(asset_id), + Some(Metadata { symbol, decimals }), + None, + None, + )); + + expect_events(vec![ + Event::Registered { + asset_id, + asset_name: b_asset_name.clone(), + asset_type: AssetType::Token, + } + .into(), + Event::MetadataSet { + asset_id, + symbol: b_symbol.clone(), + decimals, + } + .into(), + ]); + + assert_eq!( + AssetRegistryPallet::assets(asset_id).unwrap(), + AssetDetails { + name: b_asset_name, + asset_type: AssetType::Token, + existential_deposit: 1_000_000, + xcm_rate_limit: None, + } + ); + + assert_eq!( + AssetRegistryPallet::asset_metadata(asset_id).unwrap(), + AssetMetadata { + decimals: 18u8, + symbol: b_symbol, + } + ); + }); +} + +#[test] +fn register_asset_should_work_when_location_is_provided() { + ExtBuilder::default().build().execute_with(|| { + let asset_id: RegistryAssetId = 10; + + let key = Junction::from(BoundedVec::try_from(asset_id.encode()).unwrap()); + let asset_location = AssetLocation(MultiLocation::new(0, X2(Parachain(200), key))); + + assert_ok!(AssetRegistryPallet::register( + RuntimeOrigin::root(), + b"asset_id".to_vec(), + AssetType::Token, + 1_000_000, + Some(asset_id), + None, + Some(asset_location.clone()), + None + ),); + + let bn = AssetRegistryPallet::to_bounded_name(b"asset_id".to_vec()).unwrap(); + assert_eq!( + AssetRegistryPallet::assets(asset_id).unwrap(), + AssetDetails { + name: bn, + asset_type: AssetType::Token, + existential_deposit: 1_000_000, + xcm_rate_limit: None, + } + ); + assert_eq!( + AssetRegistryPallet::location_to_asset(asset_location.clone()), + Some(asset_id) + ); + assert_eq!(AssetRegistryPallet::asset_to_location(asset_id), Some(asset_location)); + + assert!(AssetRegistryPallet::asset_metadata(asset_id).is_none(),); + }); +} + +#[test] +fn register_asset_should_fail_when_location_is_already_registered() { + ExtBuilder::default().build().execute_with(|| { + // Arrange + let asset_id: RegistryAssetId = 10; + let key = Junction::from(BoundedVec::try_from(asset_id.encode()).unwrap()); + let asset_location = AssetLocation(MultiLocation::new(0, X2(Parachain(2021), key))); + assert_ok!(AssetRegistryPallet::register( + RuntimeOrigin::root(), + b"asset_id".to_vec(), + AssetType::Token, + 1_000_000, + Some(asset_id), + None, + Some(asset_location.clone()), + None + ),); + + // Act & Assert + assert_noop!( + AssetRegistryPallet::register( + RuntimeOrigin::root(), + b"asset_id_2".to_vec(), + AssetType::Token, + 1_000_000, + Some(asset_id + 1), + None, + Some(asset_location), + None + ), + Error::::LocationAlreadyRegistered + ); + }); +} + +#[test] +fn set_location_should_fail_when_location_is_already_registered() { + ExtBuilder::default().build().execute_with(|| { + // Arrange + let asset_id: RegistryAssetId = 10; + let key = Junction::from(BoundedVec::try_from(asset_id.encode()).unwrap()); + let asset_location = AssetLocation(MultiLocation::new(0, X2(Parachain(2021), key))); + assert_ok!(AssetRegistryPallet::register( + RuntimeOrigin::root(), + b"asset_id".to_vec(), + AssetType::Token, + 1_000_000, + Some(asset_id), + None, + Some(asset_location.clone()), + None + ),); + + // Act & Assert + assert_noop!( + AssetRegistryPallet::set_location(RuntimeOrigin::root(), asset_id, asset_location), + Error::::LocationAlreadyRegistered + ); + }); +} + +#[test] +fn set_location_should_remove_old_location() { + ExtBuilder::default().build().execute_with(|| { + // Arrange + let asset_id: RegistryAssetId = 10; + let key = Junction::from(BoundedVec::try_from(asset_id.encode()).unwrap()); + let old_asset_location = AssetLocation(MultiLocation::new(0, X2(Parachain(2021), key))); + assert_ok!(AssetRegistryPallet::register( + RuntimeOrigin::root(), + b"asset_id".to_vec(), + AssetType::Token, + 1_000_000, + Some(asset_id), + None, + Some(old_asset_location.clone()), + None + ),); + + // Act + assert_ok!(AssetRegistryPallet::set_location( + RuntimeOrigin::root(), + asset_id, + AssetLocation(MultiLocation::new(0, X2(Parachain(2022), key))) + )); + + // Assert + assert_eq!(AssetRegistryPallet::location_to_asset(old_asset_location), None); + }); +} + +#[test] +fn register_asset_should_work_when_all_optional_are_provided() { + ExtBuilder::default().build().execute_with(|| { + let asset_id: RegistryAssetId = 10; + + let key = Junction::from(BoundedVec::try_from(asset_id.encode()).unwrap()); + let asset_location = AssetLocation(MultiLocation::new(0, X2(Parachain(200), key))); + + assert_ok!(AssetRegistryPallet::register( + RuntimeOrigin::root(), + b"asset_id".to_vec(), + AssetType::Token, + 1_000_000, + Some(asset_id), + Some(Metadata { + symbol: b"SYM".to_vec(), + decimals: 18 + }), + Some(asset_location.clone()), + Some(1000 * UNIT) + ),); + + let bn = AssetRegistryPallet::to_bounded_name(b"asset_id".to_vec()).unwrap(); + assert_eq!( + AssetRegistryPallet::assets(asset_id).unwrap(), + AssetDetails { + name: bn, + asset_type: AssetType::Token, + existential_deposit: 1_000_000, + xcm_rate_limit: Some(1000 * UNIT), + } + ); + assert_eq!( + AssetRegistryPallet::location_to_asset(asset_location.clone()), + Some(asset_id) + ); + assert_eq!(AssetRegistryPallet::asset_to_location(asset_id), Some(asset_location)); + let b_symbol: BoundedVec::StringLimit> = b"SYM".to_vec().try_into().unwrap(); + assert_eq!( + AssetRegistryPallet::asset_metadata(asset_id).unwrap(), + AssetMetadata { + decimals: 18u8, + symbol: b_symbol, + } + ); + }); +} diff --git a/pallets/asset-registry/src/traits.rs b/pallets/asset-registry/src/traits.rs new file mode 100644 index 00000000000..c47be509297 --- /dev/null +++ b/pallets/asset-registry/src/traits.rs @@ -0,0 +1,72 @@ +use sp_std::vec::Vec; +pub trait Registry { + fn exists(name: AssetId) -> bool; + + fn retrieve_asset(name: &AssetName) -> Result; + + fn retrieve_asset_type(asset_id: AssetId) -> Result; + + fn create_asset(name: &AssetName, existential_deposit: Balance) -> Result; + + fn get_or_create_asset(name: AssetName, existential_deposit: Balance) -> Result { + if let Ok(asset_id) = Self::retrieve_asset(&name) { + Ok(asset_id) + } else { + Self::create_asset(&name, existential_deposit) + } + } +} +// Use CreateRegistry if possible +pub trait ShareTokenRegistry: Registry { + fn retrieve_shared_asset(name: &AssetName, assets: &[AssetId]) -> Result; + + fn create_shared_asset( + name: &AssetName, + assets: &[AssetId], + existential_deposit: Balance, + ) -> Result; + + fn get_or_create_shared_asset( + name: AssetName, + assets: Vec, + existential_deposit: Balance, + ) -> Result { + if let Ok(asset_id) = Self::retrieve_shared_asset(&name, &assets) { + Ok(asset_id) + } else { + Self::create_shared_asset(&name, &assets, existential_deposit) + } + } +} + +pub trait InspectRegistry { + fn exists(asset_id: AssetId) -> bool; + fn decimals(asset_id: AssetId) -> Option; + fn asset_name(asset_id: AssetId) -> Option>; + fn asset_symbol(asset_id: AssetId) -> Option>; +} + +use hydradx_traits::AssetKind; + +pub trait CreateRegistry { + type Error; + fn create_asset(name: &[u8], kind: AssetKind, existential_deposit: Balance) -> Result; +} + +// Deprecated. +// TODO: the following macro is commented out for a reason for now - due to failing clippy in CI +// #[deprecated(since = "0.6.0", note = "Please use `AccountIdFor` instead")] +pub trait AssetPairAccountIdFor { + fn from_assets(asset_a: AssetId, asset_b: AssetId, identifier: &str) -> AccountId; +} + +/// Abstraction over account id and account name creation for `Assets` +pub trait AccountIdFor { + type AccountId; + + /// Create account id for given assets and an identifier + fn from_assets(assets: &Assets, identifier: Option<&[u8]>) -> Self::AccountId; + + /// Create a name to uniquely identify a share token for given assets and an identifier. + fn name(assets: &Assets, identifier: Option<&[u8]>) -> Vec; +} diff --git a/pallets/asset-registry/src/types.rs b/pallets/asset-registry/src/types.rs new file mode 100644 index 00000000000..f54679b6389 --- /dev/null +++ b/pallets/asset-registry/src/types.rs @@ -0,0 +1,91 @@ +// This file is part of pallet-asset-registry. + +// Copyright (C) 2020-2022 Intergalactic, Limited (GIB). +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +use frame_support::pallet_prelude::*; +use scale_info::TypeInfo; +use sp_std::vec::Vec; + +use hydradx_traits::AssetKind; +#[cfg(feature = "std")] +use serde::{Deserialize, Serialize}; + +pub type Name = BoundedVec; +pub type Symbol = BoundedVec; + +#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, TypeInfo, MaxEncodedLen)] +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +pub enum AssetType { + Token, + PoolShare(AssetId, AssetId), // Use XYX instead + XYK, + StableSwap, + Bond, + External, +} + +impl From for AssetType { + fn from(value: AssetKind) -> Self { + match value { + AssetKind::Token => Self::Token, + AssetKind::XYK => Self::XYK, + AssetKind::StableSwap => Self::StableSwap, + AssetKind::Bond => Self::Bond, + AssetKind::External => Self::External, + } + } +} + +impl From> for AssetKind { + fn from(value: AssetType) -> Self { + match value { + AssetType::Token => Self::Token, + AssetType::PoolShare(_, _) => Self::XYK, + AssetType::XYK => Self::XYK, + AssetType::StableSwap => Self::StableSwap, + AssetType::Bond => Self::Bond, + AssetType::External => Self::External, + } + } +} + +#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, TypeInfo, MaxEncodedLen)] +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +pub struct AssetDetails { + /// The name of this asset. Limited in length by `StringLimit`. + pub name: BoundedString, + + pub asset_type: AssetType, + + pub existential_deposit: Balance, + + pub xcm_rate_limit: Option, +} + +#[derive(Clone, Encode, Decode, Eq, PartialEq, Default, RuntimeDebug, TypeInfo, MaxEncodedLen)] +pub struct AssetMetadata { + /// The ticker symbol for this asset. Limited in length by `StringLimit`. + pub(super) symbol: BoundedString, + /// The number of decimals this asset uses to represent one unit. + pub(super) decimals: u8, +} + +#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, TypeInfo)] +#[cfg_attr(feature = "std", derive(Serialize, Deserialize))] +pub struct Metadata { + pub(super) symbol: Vec, + pub(super) decimals: u8, +} diff --git a/pallets/asset-registry/src/weights.rs b/pallets/asset-registry/src/weights.rs new file mode 100644 index 00000000000..046273ebdc5 --- /dev/null +++ b/pallets/asset-registry/src/weights.rs @@ -0,0 +1,93 @@ +// This file is part of pallet-asset-registry. + +// Copyright (C) 2020-2022 Intergalactic, Limited (GIB). +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//! Autogenerated weights for asset-registry +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0 +//! DATE: 2021-06-16, STEPS: [5, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: [] +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128 + +// Executed Command: +// target/release/basilisk +// benchmark +// --pallet=asset-registry +// --chain=dev +// --steps=5 +// --repeat=20 +// --extrinsic=* +// --execution=wasm +// --wasm-execution=compiled +// --heap-pages=4096 +// --template=.maintain/pallet-weight-template.hbs +// --output=lbp.rs + +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{ + traits::Get, + weights::{constants::RocksDbWeight, Weight}, +}; +use sp_std::marker::PhantomData; + +/// Weight functions needed for lbp. +pub trait WeightInfo { + fn register() -> Weight; + fn update() -> Weight; + fn set_metadata() -> Weight; + fn set_location() -> Weight; +} + +/// Weights for lbp using the hack.hydraDX node and recommended hardware. +pub struct HydraWeight(PhantomData); + +impl WeightInfo for HydraWeight { + fn register() -> Weight { + Weight::zero() + } + + fn update() -> Weight { + Weight::zero() + } + + fn set_metadata() -> Weight { + Weight::zero() + } + + fn set_location() -> Weight { + Weight::zero() + } +} + +// For backwards compatibility and tests +impl WeightInfo for () { + fn register() -> Weight { + Weight::zero() + } + + fn update() -> Weight { + Weight::zero() + } + + fn set_metadata() -> Weight { + Weight::zero() + } + + fn set_location() -> Weight { + Weight::zero() + } +} diff --git a/pallets/marketplace/Cargo.toml b/pallets/marketplace/Cargo.toml index 6721038af94..8afcac86979 100644 --- a/pallets/marketplace/Cargo.toml +++ b/pallets/marketplace/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-marketplace" -version = "5.0.17" +version = "5.0.18" authors = ["GalacticCoucil"] description = "The marketplace for trading NFTs" edition = "2018" diff --git a/pallets/marketplace/src/lib.rs b/pallets/marketplace/src/lib.rs index 8830901e4c8..e6ebc83bfeb 100644 --- a/pallets/marketplace/src/lib.rs +++ b/pallets/marketplace/src/lib.rs @@ -32,7 +32,7 @@ use sp_runtime::{ use sp_std::convert::TryInto; use types::*; -use weights::WeightInfo; +pub use weights::WeightInfo; mod types; pub mod weights; diff --git a/pallets/marketplace/src/mock.rs b/pallets/marketplace/src/mock.rs index db2af406ecb..e8a17d8bb8e 100644 --- a/pallets/marketplace/src/mock.rs +++ b/pallets/marketplace/src/mock.rs @@ -6,7 +6,6 @@ use frame_support::{ }; use frame_system as system; use pallet_nft::{CollectionType, NftPermissions}; -pub use primitives::{Amount, AssetId}; use sp_core::storage::Storage; use sp_core::{crypto::AccountId32, H256}; use sp_runtime::{ @@ -14,14 +13,8 @@ use sp_runtime::{ BuildStorage, }; use sp_std::convert::{TryFrom, TryInto}; -use std::borrow::Borrow; use system::EnsureRoot; -mod marketplace { - // Re-export needed for `impl_outer_event!`. - pub use super::super::*; -} - type Block = frame_system::mocking::MockBlock; type AccountId = AccountId32; @@ -89,8 +82,8 @@ impl pallet_balances::Config for Test { type ReserveIdentifier = (); type FreezeIdentifier = (); type MaxFreezes = (); - type MaxHolds = (); type RuntimeHoldReason = (); + type RuntimeFreezeReason = (); } impl system::Config for Test { @@ -100,6 +93,7 @@ impl system::Config for Test { type DbWeight = (); type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; + type RuntimeTask = RuntimeTask; type Nonce = u64; type Block = Block; type Hash = H256; @@ -210,7 +204,7 @@ impl ExtBuilder { .endowed_accounts .clone() .iter() - .flat_map(|(x, asset)| vec![(x.borrow().clone(), *asset)]) + .flat_map(|(x, asset)| vec![(x.clone(), *asset)]) .collect(), } .assimilate_storage(t) diff --git a/pallets/xyk-liquidity-mining/Cargo.toml b/pallets/xyk-liquidity-mining/Cargo.toml index 9a7bb2549a8..e336f9c8cef 100644 --- a/pallets/xyk-liquidity-mining/Cargo.toml +++ b/pallets/xyk-liquidity-mining/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-xyk-liquidity-mining" -version = "1.1.10" +version = "1.1.11" description = "Liquidity mining" authors = ["GalacticCouncil"] edition = "2021" diff --git a/pallets/xyk-liquidity-mining/benchmarking/Cargo.toml b/pallets/xyk-liquidity-mining/benchmarking/Cargo.toml index 8298735570f..a61baf8f038 100644 --- a/pallets/xyk-liquidity-mining/benchmarking/Cargo.toml +++ b/pallets/xyk-liquidity-mining/benchmarking/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-xyk-liquidity-mining-benchmarking" -version = "1.0.16" +version = "1.0.17" description = "Liquidity Mining Benchmarking Module" authors = ["GalacticCouncil"] edition = "2021" diff --git a/pallets/xyk-liquidity-mining/benchmarking/src/mock.rs b/pallets/xyk-liquidity-mining/benchmarking/src/mock.rs index 8bedff22248..a4ae4e691c1 100644 --- a/pallets/xyk-liquidity-mining/benchmarking/src/mock.rs +++ b/pallets/xyk-liquidity-mining/benchmarking/src/mock.rs @@ -113,6 +113,7 @@ impl system::Config for Test { type SS58Prefix = (); type OnSetCode = (); type MaxConsumers = frame_support::traits::ConstU32<16>; + type RuntimeTask = RuntimeTask; } impl crate::Config for Test {} @@ -204,8 +205,8 @@ impl pallet_balances::Config for Test { type ReserveIdentifier = (); type FreezeIdentifier = (); type MaxFreezes = (); - type MaxHolds = (); type RuntimeHoldReason = (); + type RuntimeFreezeReason = (); } parameter_types! { diff --git a/pallets/xyk-liquidity-mining/src/lib.rs b/pallets/xyk-liquidity-mining/src/lib.rs index 0be69c6ac96..8537d6016ea 100644 --- a/pallets/xyk-liquidity-mining/src/lib.rs +++ b/pallets/xyk-liquidity-mining/src/lib.rs @@ -51,6 +51,7 @@ use hydradx_traits::liquidity_mining::{GlobalFarmId, Mutate as LiquidityMiningMu use pallet_liquidity_mining::{FarmMultiplier, LoyaltyCurve}; use pallet_xyk::types::{AssetId, AssetPair, Balance}; +pub use crate::weights::WeightInfo; use frame_support::{pallet_prelude::*, sp_runtime::traits::AccountIdConversion}; use frame_system::{ensure_signed, pallet_prelude::OriginFor}; use hydradx_traits::{ @@ -73,11 +74,10 @@ type PeriodOf = BlockNumberFor; #[allow(clippy::too_many_arguments)] pub mod pallet { use super::*; - use crate::weights::WeightInfo; use frame_system::pallet_prelude::BlockNumberFor; use hydradx_traits::pools::DustRemovalAccountWhitelist; - const STORAGE_VERSION: StorageVersion = StorageVersion::new(0); + const STORAGE_VERSION: StorageVersion = StorageVersion::new(1); #[pallet::pallet] #[pallet::storage_version(STORAGE_VERSION)] diff --git a/pallets/xyk-liquidity-mining/src/tests/mock.rs b/pallets/xyk-liquidity-mining/src/tests/mock.rs index f3b95b18f6c..ac1d0b920a7 100644 --- a/pallets/xyk-liquidity-mining/src/tests/mock.rs +++ b/pallets/xyk-liquidity-mining/src/tests/mock.rs @@ -121,6 +121,7 @@ impl system::Config for Test { type DbWeight = DbWeight; type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; + type RuntimeTask = RuntimeTask; type Nonce = u64; type Block = Block; type Hash = H256; @@ -802,8 +803,8 @@ impl pallet_balances::Config for Test { type ReserveIdentifier = (); type FreezeIdentifier = (); type MaxFreezes = (); - type MaxHolds = (); type RuntimeHoldReason = (); + type RuntimeFreezeReason = (); } parameter_type_with_key! { diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 22a89bdec8a..4e83f9f0a8b 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "primitives" -version = "6.6.0" +version = "6.6.1" authors = ["GalacticCouncil"] edition = "2021" repository = "https://github.com/galacticcouncil/Basilisk-node" diff --git a/primitives/src/constants.rs b/primitives/src/constants.rs index 78deede9cee..2334bb795e4 100644 --- a/primitives/src/constants.rs +++ b/primitives/src/constants.rs @@ -91,7 +91,7 @@ pub mod chain { /// We allow for pub const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_parts( WEIGHT_REF_TIME_PER_SECOND.saturating_div(2), - polkadot_primitives::v5::MAX_POV_SIZE as u64, + polkadot_primitives::v6::MAX_POV_SIZE as u64, ); /// Discounted XYK fee diff --git a/runtime/basilisk/Cargo.toml b/runtime/basilisk/Cargo.toml index 625b84cd2c8..dbead241d78 100644 --- a/runtime/basilisk/Cargo.toml +++ b/runtime/basilisk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "basilisk-runtime" -version = "112.0.0" +version = "113.0.0" authors = ["GalacticCouncil"] edition = "2021" homepage = "https://github.com/galacticcouncil/Basilisk-node" @@ -23,9 +23,9 @@ log = { workspace = true } # local dependencies primitives = { default-features = false, path = "../../primitives" } -pallet-marketplace = { path = '../../pallets/marketplace', default-features = false } -pallet-xyk-liquidity-mining = { path = "../../pallets/xyk-liquidity-mining", default-features = false } -pallet-xyk-liquidity-mining-benchmarking = { path = "../../pallets/xyk-liquidity-mining/benchmarking", optional = true, default-features = false } +pallet-marketplace = { workspace = true, default-features = false } +pallet-xyk-liquidity-mining = { workspace = true , default-features = false } +pallet-xyk-liquidity-mining-benchmarking = { workspace = true, optional = true, default-features = false } pallet-treasury = { workspace = true } pallet-democracy = { workspace = true } @@ -50,7 +50,6 @@ warehouse-liquidity-mining = { workspace = true } pallet-ema-oracle = { workspace = true } pallet-duster = { workspace = true } pallet-collator-rewards = { workspace = true } -pallet-xcm-rate-limiter = { workspace = true } pallet-xyk = { workspace = true } pallet-lbp = { workspace = true } @@ -75,12 +74,12 @@ cumulus-pallet-aura-ext = { workspace = true } cumulus-pallet-parachain-system = { workspace = true } cumulus-pallet-xcm = { workspace = true } cumulus-pallet-xcmp-queue = { workspace = true } -cumulus-pallet-dmp-queue = { workspace = true } cumulus-primitives-core = { workspace = true } cumulus-primitives-utility = { workspace = true } cumulus-primitives-parachain-inherent = { workspace = true } cumulus-primitives-timestamp = { workspace = true } -parachain-info = { workspace = true } +staging-parachain-info = { workspace = true } +parachains-common = { workspace = true } # Polkadot dependencies polkadot-parachain = { workspace = true } @@ -88,6 +87,7 @@ xcm-builder = { workspace = true } pallet-xcm = { workspace = true } xcm-executor = { workspace = true } polkadot-xcm = { workspace = true } +polkadot-runtime-common= { workspace = true } # Substrate dependencies primitive-types = { workspace = true } @@ -110,6 +110,8 @@ pallet-transaction-payment = { workspace = true } pallet-transaction-payment-rpc-runtime-api = { workspace = true } pallet-uniques = { workspace = true } pallet-utility = { workspace = true } +pallet-message-queue = { workspace = true } + sp-api = { workspace = true } sp-block-builder = { workspace = true } sp-consensus-aura = { workspace = true } @@ -153,6 +155,7 @@ runtime-benchmarks = [ "pallet-tips/runtime-benchmarks", "pallet-proxy/runtime-benchmarks", "pallet-multisig/runtime-benchmarks", + "pallet-preimage/runtime-benchmarks", "pallet-xyk-liquidity-mining-benchmarking/runtime-benchmarks", "pallet-uniques/runtime-benchmarks", "orml-benchmarking", @@ -160,9 +163,10 @@ runtime-benchmarks = [ "pallet-ema-oracle/runtime-benchmarks", "cumulus-pallet-xcmp-queue/runtime-benchmarks", "cumulus-pallet-parachain-system/runtime-benchmarks", - "pallet-xcm-rate-limiter/runtime-benchmarks", "pallet-elections-phragmen/runtime-benchmarks", "pallet-state-trie-migration/runtime-benchmarks", + "pallet-message-queue/runtime-benchmarks", + "cumulus-pallet-parachain-system/runtime-benchmarks", ] std = [ "codec/std", @@ -192,7 +196,7 @@ std = [ "xcm-builder/std", "xcm-executor/std", "pallet-xcm/std", - "parachain-info/std", + "staging-parachain-info/std", "pallet-xyk/std", "pallet-duster/std", "pallet-asset-registry/std", @@ -239,8 +243,11 @@ std = [ "pallet-preimage/std", "pallet-identity/std", "pallet-ema-oracle/std", - "pallet-xcm-rate-limiter/std", "pallet-state-trie-migration/std", + "cumulus-primitives-utility/std", + "parachains-common/std", + "pallet-message-queue/std", + "polkadot-runtime-common/std", ] try-runtime= [ "frame-try-runtime", @@ -256,7 +263,7 @@ try-runtime= [ "cumulus-pallet-aura-ext/try-runtime", "cumulus-pallet-xcm/try-runtime", "cumulus-pallet-xcmp-queue/try-runtime", - "parachain-info/try-runtime", + "staging-parachain-info/try-runtime", "pallet-aura/try-runtime", "pallet-balances/try-runtime", "pallet-elections-phragmen/try-runtime", @@ -278,7 +285,6 @@ try-runtime= [ "pallet-preimage/try-runtime", "pallet-identity/try-runtime", "pallet-xcm/try-runtime", - "cumulus-pallet-dmp-queue/try-runtime", "pallet-asset-registry/try-runtime", "pallet-xyk/try-runtime", "pallet-duster/try-runtime", @@ -292,6 +298,6 @@ try-runtime= [ "warehouse-liquidity-mining/try-runtime", "pallet-ema-oracle/try-runtime", "pallet-collator-rewards/try-runtime", - "pallet-xcm-rate-limiter/try-runtime", "pallet-state-trie-migration/try-runtime", + "pallet-message-queue/try-runtime", ] diff --git a/runtime/basilisk/src/assets.rs b/runtime/basilisk/src/assets.rs index 1e4177794f2..e7c95cb6efb 100644 --- a/runtime/basilisk/src/assets.rs +++ b/runtime/basilisk/src/assets.rs @@ -86,14 +86,14 @@ impl pallet_balances::Config for Runtime { /// The ubiquitous event type. type ExistentialDeposit = NativeExistentialDeposit; type AccountStore = System; - type WeightInfo = weights::balances::BasiliskWeight; + type WeightInfo = weights::pallet_balances::BasiliskWeight; type MaxLocks = MaxLocks; type MaxReserves = MaxReserves; type ReserveIdentifier = (); type FreezeIdentifier = (); type MaxFreezes = (); - type MaxHolds = (); - type RuntimeHoldReason = (); + type RuntimeHoldReason = RuntimeHoldReason; + type RuntimeFreezeReason = RuntimeFreezeReason; } pub struct CurrencyHooks; @@ -120,7 +120,7 @@ impl orml_tokens::Config for Runtime { type Balance = Balance; type Amount = Amount; type CurrencyId = AssetId; - type WeightInfo = weights::tokens::BasiliskWeight; + type WeightInfo = weights::orml_tokens::BasiliskWeight; type ExistentialDeposits = AssetRegistry; type CurrencyHooks = CurrencyHooks; type MaxLocks = MaxLocks; @@ -137,7 +137,7 @@ impl pallet_currencies::Config for Runtime { type MultiCurrency = Tokens; type NativeCurrency = BasicCurrencyAdapter; type GetNativeCurrencyId = NativeAssetId; - type WeightInfo = weights::currencies::BasiliskWeight; + type WeightInfo = weights::pallet_currencies::BasiliskWeight; } parameter_types! { @@ -152,7 +152,7 @@ impl pallet_asset_registry::Config for Runtime { type StringLimit = RegistryStrLimit; type SequentialIdStartAt = SequentialIdOffset; type NativeAssetId = NativeAssetId; - type WeightInfo = weights::asset_registry::BasiliskWeight; + type WeightInfo = weights::pallet_asset_registry::BasiliskWeight; } parameter_types! { @@ -169,7 +169,7 @@ impl pallet_duster::Config for Runtime { type Reward = DustingReward; type NativeCurrencyId = NativeAssetId; type BlacklistUpdateOrigin = MajorityTechCommitteeOrRoot; - type WeightInfo = weights::duster::BasiliskWeight; + type WeightInfo = weights::pallet_duster::BasiliskWeight; } pub struct AssetPairAccountId(PhantomData); @@ -208,14 +208,14 @@ impl pallet_xyk::Config for Runtime { type AssetPairAccountId = AssetPairAccountId; type Currency = Currencies; type NativeAssetId = NativeAssetId; - type WeightInfo = weights::xyk::BasiliskWeight; + type WeightInfo = weights::pallet_xyk::BasiliskWeight; type GetExchangeFee = ExchangeFee; type MinTradingLimit = MinTradingLimit; type MinPoolLiquidity = MinPoolLiquidity; type MaxInRatio = MaxInRatio; type MaxOutRatio = MaxOutRatio; type OracleSource = XYKOracleSourceIdentifier; - type CanCreatePool = pallet_lbp::DisallowWhenLBPPoolRunning; + type CanCreatePool = hydradx_adapters::xyk::AllowPoolCreation; type AMMHandler = pallet_ema_oracle::OnActivityHandler; type DiscountedFee = DiscountedFee; type NonDustableWhitelistHandler = Duster; @@ -262,7 +262,7 @@ impl pallet_lbp::Config for Runtime { type CreatePoolOrigin = SuperMajorityTechCommitteeOrRoot; type LBPWeightFunction = pallet_lbp::LBPWeightFunction; type AssetPairAccountId = AssetPairAccountId; - type WeightInfo = weights::lbp::BasiliskWeight; + type WeightInfo = weights::pallet_lbp::BasiliskWeight; type MinTradingLimit = MinTradingLimit; type MinPoolLiquidity = MinPoolLiquidity; type MaxInRatio = MaxInRatio; @@ -272,6 +272,7 @@ impl pallet_lbp::Config for Runtime { #[cfg(feature = "runtime-benchmarks")] use codec::Decode; +use frame_support::traits::Everything; pub struct RootAsVestingPallet; impl EnsureOrigin for RootAsVestingPallet { @@ -303,7 +304,7 @@ impl orml_vesting::Config for Runtime { type Currency = Balances; type MinVestedTransfer = MinVestedTransfer; type VestedTransferOrigin = RootAsVestingPallet; - type WeightInfo = weights::vesting::BasiliskWeight; + type WeightInfo = weights::orml_vesting::BasiliskWeight; type MaxVestingSchedules = MaxVestingSchedules; type BlockNumberProvider = RelayChainBlockNumberProvider; } @@ -316,7 +317,7 @@ parameter_types! { impl pallet_marketplace::Config for Runtime { type RuntimeEvent = RuntimeEvent; type Currency = KusamaCurrency; - type WeightInfo = pallet_marketplace::weights::BasiliskWeight; + type WeightInfo = weights::pallet_marketplace::BasiliskWeight; type MinimumOfferAmount = MinimumOfferAmount; type RoyaltyBondAmount = RoyaltyBondAmount; } @@ -380,7 +381,7 @@ impl pallet_xyk_liquidity_mining::Config for Runtime { type NFTHandler = NFT; type LiquidityMiningHandler = XYKWarehouseLM; type NonDustableWhitelistHandler = Duster; - type WeightInfo = weights::xyk_liquidity_mining::BasiliskWeight; + type WeightInfo = weights::pallet_xyk_liquidity_mining::BasiliskWeight; } parameter_types! { @@ -418,8 +419,8 @@ impl RouterWeightInfo { num_of_calc_sell: u32, num_of_execute_sell: u32, ) -> Weight { - weights::route_executor::BasiliskWeight::::calculate_and_execute_sell_in_lbp(num_of_calc_sell) - .saturating_sub(weights::lbp::BasiliskWeight::::router_execution_sell( + weights::pallet_route_executor::BasiliskWeight::::calculate_and_execute_sell_in_lbp(num_of_calc_sell) + .saturating_sub(weights::pallet_lbp::BasiliskWeight::::router_execution_sell( num_of_calc_sell.saturating_add(num_of_execute_sell), num_of_execute_sell, )) @@ -429,15 +430,15 @@ impl RouterWeightInfo { num_of_calc_buy: u32, num_of_execute_buy: u32, ) -> Weight { - let router_weight = weights::route_executor::BasiliskWeight::::calculate_and_execute_buy_in_lbp( + let router_weight = weights::pallet_route_executor::BasiliskWeight::::calculate_and_execute_buy_in_lbp( num_of_calc_buy, num_of_execute_buy, ); // Handle this case separately. router_execution_buy provides incorrect weight for the case when only calculate_buy is executed. let lbp_weight = if (num_of_calc_buy, num_of_execute_buy) == (1, 0) { - weights::lbp::BasiliskWeight::::calculate_buy() + weights::pallet_lbp::BasiliskWeight::::calculate_buy() } else { - weights::lbp::BasiliskWeight::::router_execution_buy( + weights::pallet_lbp::BasiliskWeight::::router_execution_buy( num_of_calc_buy.saturating_add(num_of_execute_buy), num_of_execute_buy, ) @@ -449,9 +450,9 @@ impl RouterWeightInfo { let number_of_times_calculate_sell_amounts_executed = 5; //4 calculations + in the validation let number_of_times_execute_sell_amounts_executed = 0; //We do have it once executed in the validation of the route, but it is without writing to database (as rolled back), and since we pay back successful set_route, we just keep this overhead - let set_route_overweight = weights::route_executor::BasiliskWeight::::set_route_for_xyk(); + let set_route_overweight = weights::pallet_route_executor::BasiliskWeight::::set_route_for_xyk(); - set_route_overweight.saturating_sub(weights::xyk::BasiliskWeight::::router_execution_sell( + set_route_overweight.saturating_sub(weights::pallet_xyk::BasiliskWeight::::router_execution_sell( number_of_times_calculate_sell_amounts_executed, number_of_times_execute_sell_amounts_executed, )) @@ -468,8 +469,8 @@ impl AmmTradeWeights> for RouterWeightInfo { for trade in route { weight.saturating_accrue(Self::sell_and_calculate_sell_trade_amounts_overhead_weight(0, 1)); - let lbp_weight = weights::lbp::BasiliskWeight::::router_execution_sell(c, e); - let xyk_weight = weights::xyk::BasiliskWeight::::router_execution_sell(c, e) + let lbp_weight = weights::pallet_lbp::BasiliskWeight::::router_execution_sell(c, e); + let xyk_weight = weights::pallet_xyk::BasiliskWeight::::router_execution_sell(c, e) .saturating_add(::AMMHandler::on_trade_weight()); let amm_weight = match trade.pool { @@ -492,8 +493,8 @@ impl AmmTradeWeights> for RouterWeightInfo { for trade in route { weight.saturating_accrue(Self::buy_and_calculate_buy_trade_amounts_overhead_weight(0, 1)); - let lbp_weight = weights::lbp::BasiliskWeight::::router_execution_buy(c, e); - let xyk_weight = weights::xyk::BasiliskWeight::::router_execution_buy(c, e) + let lbp_weight = weights::pallet_lbp::BasiliskWeight::::router_execution_buy(c, e); + let xyk_weight = weights::pallet_xyk::BasiliskWeight::::router_execution_buy(c, e) .saturating_add(::AMMHandler::on_trade_weight()); let amm_weight = match trade.pool { @@ -516,8 +517,8 @@ impl AmmTradeWeights> for RouterWeightInfo { for trade in route { weight.saturating_accrue(Self::buy_and_calculate_buy_trade_amounts_overhead_weight(1, 0)); - let lbp_weight = weights::lbp::BasiliskWeight::::router_execution_buy(c, e); - let xyk_weight = weights::xyk::BasiliskWeight::::router_execution_buy(c, e) + let lbp_weight = weights::pallet_lbp::BasiliskWeight::::router_execution_buy(c, e); + let xyk_weight = weights::pallet_xyk::BasiliskWeight::::router_execution_buy(c, e) .saturating_add(::AMMHandler::on_trade_weight()); let amm_weight = match trade.pool { @@ -540,8 +541,8 @@ impl AmmTradeWeights> for RouterWeightInfo { for trade in route { weight.saturating_accrue(Self::sell_and_calculate_sell_trade_amounts_overhead_weight(1, 1)); - let lbp_weight = weights::lbp::BasiliskWeight::::router_execution_sell(c, e); - let xyk_weight = weights::xyk::BasiliskWeight::::router_execution_sell(c, e) + let lbp_weight = weights::pallet_lbp::BasiliskWeight::::router_execution_sell(c, e); + let xyk_weight = weights::pallet_xyk::BasiliskWeight::::router_execution_sell(c, e) .saturating_add(::AMMHandler::on_trade_weight()); let amm_weight = match trade.pool { @@ -564,8 +565,8 @@ impl AmmTradeWeights> for RouterWeightInfo { for trade in route { weight.saturating_accrue(Self::buy_and_calculate_buy_trade_amounts_overhead_weight(2, 1)); - let lbp_weight = weights::lbp::BasiliskWeight::::router_execution_buy(c, e); - let xyk_weight = weights::xyk::BasiliskWeight::::router_execution_buy(c, e) + let lbp_weight = weights::pallet_lbp::BasiliskWeight::::router_execution_buy(c, e); + let xyk_weight = weights::pallet_xyk::BasiliskWeight::::router_execution_buy(c, e) .saturating_add(::AMMHandler::on_trade_weight()); let amm_weight = match trade.pool { @@ -592,11 +593,11 @@ impl AmmTradeWeights> for RouterWeightInfo { //For the stored route we expect a worst case with max number of trades in the most expensive pool which is LBP //We have have two sell calculation for that, normal and inverse - weights::lbp::BasiliskWeight::::router_execution_sell(2, 0) + weights::pallet_lbp::BasiliskWeight::::router_execution_sell(2, 0) .checked_mul(pallet_route_executor::MAX_NUMBER_OF_TRADES.into()); - let lbp_weight = weights::lbp::BasiliskWeight::::router_execution_sell(1, 0); - let xyk_weight = weights::xyk::BasiliskWeight::::router_execution_sell(1, 0); + let lbp_weight = weights::pallet_lbp::BasiliskWeight::::router_execution_sell(1, 0); + let xyk_weight = weights::pallet_xyk::BasiliskWeight::::router_execution_sell(1, 0); //Calculate sell amounts for the new route for trade in route { @@ -620,6 +621,11 @@ impl AmmTradeWeights> for RouterWeightInfo { weight } + + fn force_insert_route_weight() -> Weight { + //Since we don't have any AMM specific thing in the extrinsic, we just return the plain weight + weights::pallet_route_executor::BasiliskWeight::::force_insert_route() + } } parameter_types! { @@ -634,6 +640,8 @@ impl pallet_route_executor::Config for Runtime { type NativeAssetId = NativeAssetId; type DefaultRoutePoolType = DefaultRoutePoolType; type WeightInfo = RouterWeightInfo; + type InspectRegistry = AssetRegistry; + type TechnicalOrigin = SuperMajorityTechCommitteeOrRoot; } parameter_types! { @@ -647,10 +655,14 @@ parameter_types! { impl pallet_ema_oracle::Config for Runtime { type RuntimeEvent = RuntimeEvent; - type WeightInfo = weights::ema_oracle::BasiliskWeight; + type WeightInfo = weights::pallet_ema_oracle::BasiliskWeight; + type AuthorityOrigin = SuperMajorityTechCommitteeOrRoot; type BlockNumberProvider = RelayChainBlockNumberProvider; type SupportedPeriods = SupportedPeriods; + type OracleWhitelist = Everything; type MaxUniqueEntries = MaxUniqueOracleEntries; + #[cfg(feature = "runtime-benchmarks")] + type BenchmarkHelper = benchmarking::BenchmarkHelper; } parameter_types! { @@ -659,7 +671,7 @@ parameter_types! { impl pallet_nft::Config for Runtime { type RuntimeEvent = RuntimeEvent; - type WeightInfo = weights::nft::BasiliskWeight; + type WeightInfo = weights::pallet_nft::BasiliskWeight; type NftCollectionId = CollectionId; type NftItemId = ItemId; type CollectionType = pallet_nft::CollectionType; diff --git a/runtime/basilisk/src/benchmarking/helper.rs b/runtime/basilisk/src/benchmarking/helper.rs new file mode 100644 index 00000000000..8e7277b7a28 --- /dev/null +++ b/runtime/basilisk/src/benchmarking/helper.rs @@ -0,0 +1,36 @@ +use crate::AssetRegistry; +use frame_support::dispatch::DispatchResult; +use pallet_asset_registry::traits::InspectRegistry; +use pallet_ema_oracle::BenchmarkHelper as EmaOracleBenchmarkHelper; +use pallet_treasury::ArgumentsFactory; +use primitives::{AccountId, AssetId}; + +pub struct BenchmarkHelper; + +// Support for pallet treasury benchmarking +impl ArgumentsFactory<(), AccountId> for BenchmarkHelper { + fn create_asset_kind(_seed: u32) {} + + fn create_beneficiary(seed: [u8; 32]) -> AccountId { + AccountId::from(seed) + } +} + +// Ema oracle helper +impl EmaOracleBenchmarkHelper for BenchmarkHelper { + fn register_asset(asset_id: AssetId) -> DispatchResult { + if AssetRegistry::exists(asset_id) { + return Ok(()); + } + + let name = asset_id.to_ne_bytes().to_vec(); + let _ = AssetRegistry::register_asset( + AssetRegistry::to_bounded_name(name)?, + pallet_asset_registry::AssetType::::Token, + 1u128, + Some(asset_id), + None, + )?; + Ok(()) + } +} diff --git a/runtime/basilisk/src/benchmarking/marketplace.rs b/runtime/basilisk/src/benchmarking/marketplace.rs index e2b019c01e7..f6e64b822b6 100644 --- a/runtime/basilisk/src/benchmarking/marketplace.rs +++ b/runtime/basilisk/src/benchmarking/marketplace.rs @@ -9,8 +9,8 @@ use frame_support::{ BoundedVec, }; use frame_system::RawOrigin; -use hydradx_traits::registry::Registry; use orml_benchmarking::runtime_benchmarks; +use pallet_asset_registry::traits::Registry; use pallet_nft::BoundedVecOfUnq; use primitives::{constants::currency::UNITS, CollectionId, ItemId}; use sp_std::convert::TryInto; diff --git a/runtime/basilisk/src/benchmarking/mod.rs b/runtime/basilisk/src/benchmarking/mod.rs index 881b47b8512..e4fe75d5442 100644 --- a/runtime/basilisk/src/benchmarking/mod.rs +++ b/runtime/basilisk/src/benchmarking/mod.rs @@ -2,11 +2,15 @@ pub mod currencies; pub mod duster; +mod helper; pub mod marketplace; pub mod multi_payment; pub mod route_executor; pub mod tokens; pub mod vesting; +pub mod xyk; + +pub use helper::BenchmarkHelper; use crate::AssetRegistry; diff --git a/runtime/basilisk/src/benchmarking/multi_payment.rs b/runtime/basilisk/src/benchmarking/multi_payment.rs index 0cfec81ebb5..5291af10789 100644 --- a/runtime/basilisk/src/benchmarking/multi_payment.rs +++ b/runtime/basilisk/src/benchmarking/multi_payment.rs @@ -1,6 +1,6 @@ // This file is part of Basilisk-node -// Copyright (C) 2020-2022 Intergalactic, Limited (GIB). +// Copyright (C) 2020-2021 Intergalactic, Limited (GIB). // SPDX-License-Identifier: Apache-2.0 // Licensed under the Apache License, Version 2.0 (the "License"); @@ -17,28 +17,47 @@ use super::*; use crate::{AccountId, AssetId, Balance, Currencies, EmaOracle, Runtime, System}; -use hydradx_traits::{ - router::{AssetPair, PoolType, RouteProvider, Trade}, - OraclePeriod, PriceOracle, -}; -use pallet_route_executor::MAX_NUMBER_OF_TRADES; -use primitives::{constants::currency::UNITS, BlockNumber, Price}; - -use frame_benchmarking::{account, BenchmarkError}; -use frame_support::{ - assert_ok, - traits::{OnFinalize, OnInitialize}, -}; +use frame_benchmarking::account; +use frame_benchmarking::BenchmarkError; +use frame_support::traits::{OnFinalize, OnInitialize}; +use frame_support::{assert_ok, parameter_types}; use frame_system::RawOrigin; +use hydradx_traits::router::PoolType; +use hydradx_traits::router::RouteProvider; +use hydradx_traits::PriceOracle; use orml_benchmarking::runtime_benchmarks; -use sp_runtime::FixedU128; +use orml_traits::MultiCurrencyExtended; +use pallet_route_executor::MAX_NUMBER_OF_TRADES; +use primitives::{BlockNumber, Price}; +use sp_runtime::traits::SaturatedConversion; +use sp_runtime::{FixedPointNumber, FixedU128}; type MultiPaymentPallet = pallet_transaction_multi_payment::Pallet; type XykPallet = pallet_xyk::Pallet; type Router = pallet_route_executor::Pallet; +use hydradx_traits::router::AssetPair; +use hydradx_traits::router::Trade; +use hydradx_traits::OraclePeriod; + +parameter_types! { + //NOTE: This should always be > 1 otherwise we will payout more than we collected as ED for + //insufficient assets. + pub InsufficientEDinBSX: Balance = FixedU128::from_rational(11, 10) + .saturating_mul_int(::ExistentialDeposit::get()); +} const SEED: u32 = 1; +const UNITS: Balance = 1_000_000_000_000; + +pub fn update_balance(currency_id: AssetId, who: &AccountId, balance: Balance) { + assert_ok!(>::update_balance( + currency_id, + who, + balance.saturated_into() + )); +} + runtime_benchmarks! { { Runtime, pallet_transaction_multi_payment} @@ -59,6 +78,7 @@ runtime_benchmarks! { set_currency { let maker: AccountId = account("maker", 0, SEED); let caller: AccountId = account("caller", 0, SEED); + let fallback_account: AccountId = account("fallback_account", 1, SEED); let asset_id = register_asset(b"TST".to_vec(), 100u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; @@ -140,6 +160,13 @@ runtime_benchmarks! { verify{ assert!(_price.is_some()); } + + reset_payment_currency { + let caller: AccountId = account("caller", 0, SEED); + }: { MultiPaymentPallet::::reset_payment_currency(RawOrigin::Root.into(), caller.clone())? } + verify{ + assert_eq!(MultiPaymentPallet::::get_currency(caller), None); + } } fn create_xyk_pool(asset_a: AssetId, amount_a: Balance, asset_b: AssetId, amount_b: Balance) @@ -148,6 +175,13 @@ where { let maker: AccountId = account("xyk-maker", 0, SEED); + assert_ok!(Currencies::update_balance( + RawOrigin::Root.into(), + maker.clone(), + 0_u32, + InsufficientEDinBSX::get() as i128, + )); + assert_ok!(Currencies::update_balance( RawOrigin::Root.into(), maker.clone(), diff --git a/runtime/basilisk/src/benchmarking/route_executor.rs b/runtime/basilisk/src/benchmarking/route_executor.rs index 493f40ffa38..56d603d7330 100644 --- a/runtime/basilisk/src/benchmarking/route_executor.rs +++ b/runtime/basilisk/src/benchmarking/route_executor.rs @@ -16,25 +16,37 @@ // limitations under the License. #![allow(clippy::result_large_err)] -use crate::{AccountId, AssetId, AssetRegistry, Balance, Currencies, Router, Runtime, RuntimeOrigin, System, LBP, XYK}; +use crate::{AccountId, AssetId, Balance, Currencies, Router, Runtime, RuntimeOrigin, System, LBP, XYK}; -use frame_benchmarking::account; +use super::*; +use frame_benchmarking::{account, BenchmarkError}; use frame_support::dispatch::DispatchResult; -use frame_support::sp_runtime::traits::One; -use frame_support::{assert_ok, ensure}; +use frame_support::{assert_ok, ensure, parameter_types}; use frame_system::RawOrigin; +use hydradx_traits::router::inverse_route; use hydradx_traits::router::AssetPair; use hydradx_traits::router::{PoolType, RouterT, Trade}; -use hydradx_traits::Registry; use orml_benchmarking::runtime_benchmarks; use orml_traits::{MultiCurrency, MultiCurrencyExtended}; use primitives::constants::currency::UNITS; +use sp_runtime::{FixedPointNumber, FixedU128}; use sp_std::vec; - pub const INITIAL_BALANCE: Balance = 10_000_000 * UNITS; +const HDX: AssetId = 0; + +parameter_types! { + //NOTE: This should always be > 1 otherwise we will payout more than we collected as ED for + //insufficient assets. + pub InsufficientEDinBSX: Balance = FixedU128::from_rational(11, 10) + .saturating_mul_int(::ExistentialDeposit::get()); +} + fn funded_account(name: &'static str, index: u32, assets: &[AssetId]) -> AccountId { let account: AccountId = account(name, index, 0); + //Necessary to pay ED for insufficient assets. + >::update_balance(0, &account, INITIAL_BALANCE as i128).unwrap(); + for asset in assets { assert_ok!(>::update_balance( *asset, @@ -96,7 +108,14 @@ fn setup_lbp(caller: AccountId, asset_in: AssetId, asset_out: AssetId) -> Dispat } fn create_xyk_pool(asset_a: u32, asset_b: u32) { - let caller: AccountId = funded_account("caller", 0, &[asset_a, asset_b]); + let caller: AccountId = funded_account("caller", 3, &[asset_a, asset_b]); + + assert_ok!(Currencies::update_balance( + RawOrigin::Root.into(), + caller.clone(), + 0_u32, + InsufficientEDinBSX::get() as i128, + )); let amount = 100000 * UNITS; assert_ok!(Currencies::update_balance( @@ -129,8 +148,8 @@ runtime_benchmarks! { calculate_and_execute_sell_in_lbp { let c in 0..1; // if c == 1, calculate_sell_trade_amounts is executed - let asset_in = 1u32; - let asset_out = 2u32; + let asset_in = register_asset(b"FCA".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + let asset_out = register_asset(b"FCB".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; let caller: AccountId = funded_account("caller", 7, &[asset_in, asset_out]); let seller: AccountId = funded_account("seller", 8, &[asset_in, asset_out]); @@ -162,8 +181,8 @@ runtime_benchmarks! { let c in 1..2; // number of times `calculate_buy_trade_amounts` is executed let b in 0..1; // if e == 1, buy is executed - let asset_in = 1u32; - let asset_out = 2u32; + let asset_in = register_asset(b"FCA".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + let asset_out = register_asset(b"FCB".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; let caller: AccountId = funded_account("caller", 0, &[asset_in, asset_out]); let buyer: AccountId = funded_account("buyer", 1, &[asset_in, asset_out]); @@ -196,21 +215,24 @@ runtime_benchmarks! { // Calculates the weight of xyk set route. Used in the calculation to determine the weight of the overhead. set_route_for_xyk { - let asset_1 = 1u32; - let asset_2 = AssetRegistry::create_asset(&b"FCA".to_vec(), Balance::one())?; - let asset_3 = AssetRegistry::create_asset(&b"FCB".to_vec(), Balance::one())?; - let asset_4 = AssetRegistry::create_asset(&b"FCC".to_vec(), Balance::one())?; - - let caller: AccountId = funded_account("caller", 0, &[asset_1, asset_2, asset_3, asset_4]); - let buyer: AccountId = funded_account("buyer", 1, &[asset_1, asset_2, asset_3, asset_4]); - create_xyk_pool(asset_1, asset_2); + let asset_1 = register_asset(b"AS1".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + let asset_2 = register_asset(b"AS2".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + let asset_3 = register_asset(b"AS3".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + let asset_4 = register_asset(b"AS4".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + let asset_5 = register_asset(b"AS5".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + let asset_6 = register_asset(b"AS6".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + + let caller: AccountId = funded_account("caller", 0, &[asset_1, asset_2,asset_3]); + create_xyk_pool(HDX, asset_2); create_xyk_pool(asset_2, asset_3); create_xyk_pool(asset_3, asset_4); - create_xyk_pool(asset_1, asset_3); + create_xyk_pool(asset_4, asset_5); + create_xyk_pool(asset_5, asset_6); + let route = vec![Trade { pool: PoolType::XYK, - asset_in: asset_1, + asset_in: HDX, asset_out: asset_2 },Trade { pool: PoolType::XYK, @@ -220,35 +242,91 @@ runtime_benchmarks! { pool: PoolType::XYK, asset_in: asset_3, asset_out: asset_4 + },Trade { + pool: PoolType::XYK, + asset_in: asset_4, + asset_out: asset_5 + },Trade { + pool: PoolType::XYK, + asset_in: asset_5, + asset_out: asset_6 }]; Router::set_route( RawOrigin::Signed(caller.clone()).into(), - AssetPair::new(asset_1, asset_4), + AssetPair::new(HDX, asset_6), route, )?; + create_xyk_pool(HDX, asset_6); + let better_route = vec![Trade { pool: PoolType::XYK, - asset_in: asset_1, - asset_out: asset_3 - },Trade { - pool: PoolType::XYK, - asset_in: asset_3, - asset_out: asset_4 - }]; + asset_in: HDX, + asset_out: asset_6 + },]; }: { Router::set_route( RawOrigin::Signed(caller.clone()).into(), - AssetPair::new(asset_1, asset_4), + AssetPair::new(HDX, asset_6), better_route.clone(), )?; } verify { - let stored_route = Router::route(AssetPair::new(asset_1, asset_4)).unwrap(); + let stored_route = Router::route(AssetPair::new(HDX, asset_6)).unwrap(); assert_eq!(stored_route, better_route); } + + force_insert_route { + let asset_1 = register_asset(b"AS1".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + let asset_2 = register_asset(b"AS2".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + let asset_3 = register_asset(b"AS3".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + let asset_4 = register_asset(b"AS4".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + let asset_5 = register_asset(b"AS5".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + let asset_6 = register_asset(b"AS6".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + + let caller: AccountId = funded_account("caller", 0, &[asset_1, asset_2,asset_3]); + create_xyk_pool(HDX, asset_2); + create_xyk_pool(asset_2, asset_3); + create_xyk_pool(asset_3, asset_4); + create_xyk_pool(asset_4, asset_5); + create_xyk_pool(asset_5, asset_6); + create_xyk_pool(HDX, asset_6); + + let route = vec![Trade { + pool: PoolType::XYK, + asset_in: asset_6, + asset_out: asset_5 + },Trade { + pool: PoolType::XYK, + asset_in: asset_5, + asset_out: asset_4 + },Trade { + pool: PoolType::XYK, + asset_in: asset_4, + asset_out: asset_3 + },Trade { + pool: PoolType::XYK, + asset_in: asset_3, + asset_out: asset_2 + },Trade { + pool: PoolType::XYK, + asset_in: asset_2, + asset_out: HDX + }]; + }: { + Router::force_insert_route( + RawOrigin::Root.into(), + AssetPair::new(asset_6, HDX), + route.clone(), + )?; + } + verify { + + let stored_route = Router::route(AssetPair::new(HDX, asset_6)).unwrap(); + assert_eq!(inverse_route(stored_route.to_vec()), route); + } } #[cfg(test)] @@ -263,11 +341,8 @@ mod tests { .build_storage() .unwrap(); - pallet_asset_registry::GenesisConfig:: { - registered_assets: vec![ - (b"LRNA".to_vec(), 1_000u128, Some(1)), - (b"DAI".to_vec(), 1_000u128, Some(2)), - ], + pallet_asset_registry::GenesisConfig:: { + registered_assets: vec![(b"DAI".to_vec(), 1_000, Some(2))], native_asset_name: b"BSX".to_vec(), native_existential_deposit: NativeExistentialDeposit::get(), } diff --git a/runtime/basilisk/src/benchmarking/xyk.rs b/runtime/basilisk/src/benchmarking/xyk.rs new file mode 100644 index 00000000000..aef3a014072 --- /dev/null +++ b/runtime/basilisk/src/benchmarking/xyk.rs @@ -0,0 +1,286 @@ +use crate::{AccountId, AssetId, Balance, Currencies, MultiTransactionPayment, Price, Runtime, RuntimeOrigin, XYK}; + +use super::*; + +use frame_benchmarking::{account, BenchmarkError}; +use frame_system::RawOrigin; +use orml_benchmarking::runtime_benchmarks; +use orml_traits::{MultiCurrency, MultiCurrencyExtended}; +use sp_std::prelude::*; + +use hydradx_traits::router::{PoolType, TradeExecution}; + +const SEED: u32 = 1; + +const INITIAL_BALANCE: Balance = 1_000_000_000_000_000; + +fn funded_account(name: &'static str, index: u32, assets: &[AssetId]) -> T::AccountId { + let caller: T::AccountId = account(name, index, SEED); + //Necessary for ED for insufficient assets. + T::Currency::update_balance(0, &caller, INITIAL_BALANCE as i128).unwrap(); + + for a in assets { + T::Currency::update_balance(*a, &caller, INITIAL_BALANCE as i128).unwrap(); + } + + caller +} + +#[allow(clippy::result_large_err)] +fn init_fee_asset(fee_asset: AssetId) -> Result<(), BenchmarkError> { + MultiTransactionPayment::add_currency(RawOrigin::Root.into(), fee_asset, Price::from(1)) + .map_err(|_| BenchmarkError::Stop("Failed to add fee asset as supported currency"))?; + + pallet_transaction_multi_payment::pallet::AcceptedCurrencyPrice::::insert(fee_asset, Price::from(1)); + + Ok(()) +} + +runtime_benchmarks! { + { Runtime, pallet_xyk } + + create_pool { + let asset_a = register_asset(b"TKNA".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + let asset_b = register_asset(b"TKNB".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + let fee_asset = register_asset(b"FEE".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + + let caller = funded_account::("caller", 0, &[asset_a, asset_b, fee_asset]); + + init_fee_asset(fee_asset)?; + MultiTransactionPayment::set_currency(RawOrigin::Signed(caller.clone()).into(), fee_asset)?; + + let amount_a : Balance = INITIAL_BALANCE; + let amount_b : Balance = INITIAL_BALANCE; + + assert_eq!(frame_system::Pallet::::account(caller.clone()).sufficients, 0); + }: _(RawOrigin::Signed(caller.clone()), asset_a, amount_a, asset_b, amount_b) + verify { + assert_eq!(Currencies::free_balance(asset_a, &caller), 0); + assert_eq!(Currencies::free_balance(asset_b, &caller), 0); + + assert!(!orml_tokens::Accounts::::contains_key(caller.clone(), asset_a)); + assert!(!orml_tokens::Accounts::::contains_key(caller.clone(), asset_b)); + + //NOTE: xyk shares are insufficinet so that's why not 0. + assert_eq!(frame_system::Pallet::::account(caller).sufficients, 0); + } + + add_liquidity { + + let asset_a = register_asset(b"TKNA".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + let asset_b = register_asset(b"TKNB".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + let fee_asset = register_asset(b"FEE".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + + let caller = funded_account::("caller", 0, &[asset_a, asset_b, fee_asset]); + let maker = funded_account::("maker", 1, &[asset_a, asset_b, fee_asset]); + + init_fee_asset(fee_asset)?; + MultiTransactionPayment::set_currency(RawOrigin::Signed(maker.clone()).into(), fee_asset)?; + MultiTransactionPayment::set_currency(RawOrigin::Signed(caller.clone()).into(), fee_asset)?; + + let amount_a : Balance = INITIAL_BALANCE; + let amount_b : Balance = INITIAL_BALANCE; + + let amount : Balance = INITIAL_BALANCE/2; + let max_limit : Balance = INITIAL_BALANCE; + + + XYK::create_pool(RawOrigin::Signed(maker.clone()).into(), asset_a, INITIAL_BALANCE - 10, asset_b, INITIAL_BALANCE - 10)?; + + >::transfer(asset_a, &caller, &maker, INITIAL_BALANCE - amount)?; + + assert_eq!(frame_system::Pallet::::account(caller.clone()).sufficients, 0); + }: _(RawOrigin::Signed(caller.clone()), asset_a, asset_b, amount, max_limit) + verify { + assert_eq!(Currencies::free_balance(asset_a, &caller), 0); + assert_eq!(Currencies::free_balance(asset_b, &caller), 499_999_999_999_999_u128);// Due to rounding in favor of pool + + //NOTE: xyk shares are insufficinet. + assert_eq!(frame_system::Pallet::::account(caller).sufficients, 0); + } + + remove_liquidity { + + let asset_a = register_asset(b"TKNA".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + let asset_b = register_asset(b"TKNB".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + let fee_asset = register_asset(b"FEE".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + + let maker = funded_account::("maker", 0, &[asset_a, asset_b, fee_asset]); + + + init_fee_asset(fee_asset)?; + MultiTransactionPayment::set_currency(RawOrigin::Signed(maker.clone()).into(), fee_asset)?; + + XYK::create_pool(RawOrigin::Signed(maker.clone()).into(), asset_a, INITIAL_BALANCE, asset_b, INITIAL_BALANCE)?; + + //Only for XYK shares + assert_eq!(frame_system::Pallet::::account(maker.clone()).sufficients, 0); + }: _(RawOrigin::Signed(maker.clone()), asset_a, asset_b, INITIAL_BALANCE) + verify { + assert_eq!(Currencies::free_balance(asset_a, &maker), INITIAL_BALANCE); + assert_eq!(Currencies::free_balance(asset_b, &maker), INITIAL_BALANCE); + + assert_eq!(frame_system::Pallet::::account(maker).sufficients, 0); + } + + sell { + let asset_a = register_asset(b"TKNA".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + let asset_b = register_asset(b"TKNB".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + let fee_asset = register_asset(b"FEE".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + + let maker = funded_account::("maker", 0, &[asset_a, asset_b, fee_asset]); + let caller = funded_account::("caller", 1, &[asset_a, fee_asset]); + + + init_fee_asset(fee_asset)?; + MultiTransactionPayment::set_currency(RawOrigin::Signed(maker.clone()).into(), fee_asset)?; + MultiTransactionPayment::set_currency(RawOrigin::Signed(caller.clone()).into(), fee_asset)?; + + let discount = false; + let amount: Balance = 250_000_000_000_000; + let min_bought: Balance = 1; + + XYK::create_pool(RawOrigin::Signed(maker.clone()).into(), asset_a, INITIAL_BALANCE, asset_b, INITIAL_BALANCE)?; + + >::transfer(asset_a, &caller, &maker, INITIAL_BALANCE - amount)?; + + assert_eq!(frame_system::Pallet::::account(caller.clone()).sufficients, 0); + }: _(RawOrigin::Signed(caller.clone()), asset_a, asset_b, amount, min_bought, discount) + verify{ + assert_eq!(Currencies::free_balance(asset_a, &caller), 0); + assert_eq!(Currencies::free_balance(asset_b, &caller), 199400000000000); + + //NOTE: `asset_a`'s ED was released `asset_b`'s ED was collected. + assert_eq!(frame_system::Pallet::::account(caller).sufficients, 0); + } + + buy { + let asset_a = register_asset(b"TKNA".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + let asset_b = register_asset(b"TKNB".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + let fee_asset = register_asset(b"FEE".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + + let maker = funded_account::("maker", 0, &[asset_a, asset_b, fee_asset]); + let caller = funded_account::("caller", 1, &[asset_a, fee_asset]); + + + init_fee_asset(fee_asset)?; + MultiTransactionPayment::set_currency(RawOrigin::Signed(maker.clone()).into(), fee_asset)?; + MultiTransactionPayment::set_currency(RawOrigin::Signed(caller.clone()).into(), fee_asset)?; + + let discount = false; + let amount: Balance = 200_000_000_000_000; + let max_sold: Balance = INITIAL_BALANCE; + + XYK::create_pool(RawOrigin::Signed(maker.clone()).into(), asset_a, INITIAL_BALANCE, asset_b, INITIAL_BALANCE)?; + + >::transfer(asset_a, &caller, &maker, 749_249_999_999_999_u128)?; + + assert_eq!(frame_system::Pallet::::account(caller.clone()).sufficients, 0); + }: _(RawOrigin::Signed(caller.clone()), asset_b, asset_a, amount, max_sold, discount) + verify{ + assert_eq!(Currencies::free_balance(asset_a, &caller), 0); + assert_eq!(Currencies::free_balance(asset_b, &caller), amount); + + assert_eq!(frame_system::Pallet::::account(caller).sufficients, 0); + } + + router_execution_sell { + let c in 1..2; // if c == 1, calculate_sell is executed + let e in 0..1; // if e == 1, execute_sell is executed + + let asset_a = register_asset(b"TKNA".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + let asset_b = register_asset(b"TKNB".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + + let fee_asset = register_asset(b"FEE".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + + let maker = funded_account::("maker", 0, &[asset_a, asset_b, fee_asset]); + let caller = funded_account::("caller", 1, &[asset_a, fee_asset]); + + + init_fee_asset(fee_asset)?; + MultiTransactionPayment::set_currency(RawOrigin::Signed(maker.clone()).into(), fee_asset)?; + MultiTransactionPayment::set_currency(RawOrigin::Signed(caller.clone()).into(), fee_asset)?; + + let discount = false; + let amount: Balance = 250_000_000_000_000; + let min_bought: Balance = 1; + + XYK::create_pool(RawOrigin::Signed(maker.clone()).into(), asset_a, INITIAL_BALANCE, asset_b, INITIAL_BALANCE)?; + + >::transfer(asset_a, &caller, &maker, INITIAL_BALANCE - amount)?; + assert_eq!(frame_system::Pallet::::account(caller.clone()).sufficients, 0); + }: { + for _ in 1..c { + assert!(>::calculate_sell(PoolType::XYK, asset_a, asset_b, amount).is_ok()); + } + if e != 0 { + assert!(>::execute_sell(RawOrigin::Signed(caller.clone()).into(), PoolType::XYK, asset_a, asset_b, amount, min_bought).is_ok()); + } + } + verify{ + if e != 0 { + assert_eq!(Currencies::free_balance(asset_a, &caller), 0); + assert_eq!(Currencies::free_balance(asset_b, &caller), 199400000000000); + + assert_eq!(frame_system::Pallet::::account(caller).sufficients, 0); + } + } + + router_execution_buy { + let c in 1..3; // number of times calculate_buy is executed + let e in 0..1; // if e == 1, execute_buy is executed + + let asset_a = register_asset(b"TKNA".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + let asset_b = register_asset(b"TKNB".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + let fee_asset = register_asset(b"FEE".to_vec(), 1u128).map_err(|_| BenchmarkError::Stop("Failed to register asset"))?; + + let maker = funded_account::("maker", 0, &[asset_a, asset_b, fee_asset]); + let caller = funded_account::("caller", 1, &[asset_a, fee_asset]); + + + init_fee_asset(fee_asset)?; + MultiTransactionPayment::set_currency(RawOrigin::Signed(maker.clone()).into(), fee_asset)?; + MultiTransactionPayment::set_currency(RawOrigin::Signed(caller.clone()).into(), fee_asset)?; + + let discount = false; + let amount: Balance = 200_000_000_000_000; + let max_sold: Balance = INITIAL_BALANCE; + + XYK::create_pool(RawOrigin::Signed(maker.clone()).into(), asset_a, INITIAL_BALANCE, asset_b, INITIAL_BALANCE)?; + + >::transfer(asset_a, &caller, &maker, 749_249_999_999_999_u128)?; + + assert_eq!(frame_system::Pallet::::account(caller.clone()).sufficients, 0); + }: { + for _ in 1..c { + assert!(>::calculate_buy(PoolType::XYK, asset_a, asset_b, amount).is_ok()); + } + if e != 0 { + assert!(>::execute_buy(RawOrigin::Signed(caller.clone()).into(), PoolType::XYK, asset_a, asset_b, amount, max_sold).is_ok()); + } + } + verify{ + if e != 0 { + assert_eq!(Currencies::free_balance(asset_a, &caller), 0); + assert_eq!(Currencies::free_balance(asset_b, &caller), amount); + + assert_eq!(frame_system::Pallet::::account(caller).sufficients, 0); + } + } +} + +#[cfg(test)] +mod tests { + use super::*; + use orml_benchmarking::impl_benchmark_test_suite; + use sp_runtime::BuildStorage; + + fn new_test_ext() -> sp_io::TestExternalities { + frame_system::GenesisConfig::::default() + .build_storage() + .unwrap() + .into() + } + + impl_benchmark_test_suite!(new_test_ext(),); +} diff --git a/runtime/basilisk/src/governance.rs b/runtime/basilisk/src/governance.rs index be48ba60147..c657560c9e0 100644 --- a/runtime/basilisk/src/governance.rs +++ b/runtime/basilisk/src/governance.rs @@ -17,18 +17,23 @@ use super::*; use primitives::constants::{ - currency::{deposit, CENTS, DOLLARS}, + currency::{deposit, CENTS, DOLLARS, UNITS}, time::{DAYS, HOURS}, }; +use frame_support::traits::fungible::HoldConsideration; +use frame_support::traits::tokens::{Pay, PaymentStatus, Preservation, UnityAssetBalanceConversion}; +use frame_support::traits::{fungible, LinearStoragePrice}; use frame_support::{ parameter_types, sp_runtime::{Perbill, Percent, Permill}, - traits::{EitherOfDiverse, EqualPrivilegeOnly, LockIdentifier, NeverEnsureOrigin}, + traits::{EitherOfDiverse, EqualPrivilegeOnly, LockIdentifier}, PalletId, }; use frame_system::{EnsureRoot, EnsureSigned}; use pallet_collective::EnsureProportionAtLeast; +use sp_runtime::traits::IdentityLookup; +use sp_runtime::DispatchError; use sp_staking::currency_to_vote::U128CurrencyToVote; pub type MajorityCouncilOrRoot = @@ -59,7 +64,7 @@ parameter_types! { } impl pallet_democracy::Config for Runtime { - type WeightInfo = weights::democracy::BasiliskWeight; + type WeightInfo = weights::pallet_democracy::BasiliskWeight; type RuntimeEvent = RuntimeEvent; type Scheduler = Scheduler; type Preimages = Preimage; @@ -135,7 +140,7 @@ impl pallet_elections_phragmen::Config for Runtime { type MaxCandidates = MaxElectionCandidates; type MaxVoters = MaxElectionVoters; type MaxVotesPerVoter = MaxVotesPerVoter; - type WeightInfo = weights::elections::BasiliskWeight; + type WeightInfo = weights::pallet_elections_phragmen::BasiliskWeight; } parameter_types! { @@ -154,7 +159,7 @@ impl pallet_collective::Config for Runtime { type MaxProposals = CouncilMaxProposals; type MaxMembers = CouncilMaxMembers; type DefaultVote = pallet_collective::PrimeDefaultVote; - type WeightInfo = weights::collective::BasiliskWeight; // use the weights from TechnicalCommittee because we are not able to benchmark both pallets + type WeightInfo = weights::pallet_collective::BasiliskWeight; // use the weights from TechnicalCommittee because we are not able to benchmark both pallets type MaxProposalWeight = MaxProposalWeight; type SetMembersOrigin = EnsureRoot; } @@ -174,7 +179,7 @@ impl pallet_collective::Config for Runtime { type MaxProposals = TechnicalMaxProposals; type MaxMembers = TechnicalMaxMembers; type DefaultVote = pallet_collective::PrimeDefaultVote; - type WeightInfo = weights::collective::BasiliskWeight; + type WeightInfo = weights::pallet_collective::BasiliskWeight; type MaxProposalWeight = MaxProposalWeight; type SetMembersOrigin = EnsureRoot; } @@ -186,6 +191,7 @@ parameter_types! { pub const TipReportDepositBase: Balance = 10 * DOLLARS; pub const TipReportDepositPerByte: Balance = CENTS; pub const MaximumReasonLength: u32 = 1024; + pub const MaxTipAmount: u128 = 200_000_000 * UNITS; } impl pallet_tips::Config for Runtime { @@ -195,23 +201,29 @@ impl pallet_tips::Config for Runtime { type TipCountdown = TipCountdown; type TipFindersFee = TipFindersFee; type TipReportDepositBase = TipReportDepositBase; + type MaxTipAmount = MaxTipAmount; type Tippers = Elections; - type WeightInfo = weights::tips::BasiliskWeight; + type WeightInfo = weights::pallet_tips::BasiliskWeight; } parameter_types! { pub const PreimageMaxSize: u32 = 4096 * 1024; pub PreimageBaseDeposit: Balance = deposit(2, 64); pub PreimageByteDeposit: Balance = deposit(0, 1); + pub const PreimageHoldReason: RuntimeHoldReason = RuntimeHoldReason::Preimage(pallet_preimage::HoldReason::Preimage); } impl pallet_preimage::Config for Runtime { type RuntimeEvent = RuntimeEvent; - type WeightInfo = (); + type WeightInfo = weights::pallet_preimage::BasiliskWeight; type Currency = Balances; type ManagerOrigin = EnsureRoot; - type BaseDeposit = PreimageBaseDeposit; - type ByteDeposit = PreimageByteDeposit; + type Consideration = HoldConsideration< + AccountId, + Balances, + PreimageHoldReason, + LinearStoragePrice, + >; } parameter_types! { @@ -228,7 +240,7 @@ impl pallet_scheduler::Config for Runtime { type ScheduleOrigin = EnsureRoot; type OriginPrivilegeCmp = EqualPrivilegeOnly; type MaxScheduledPerBlock = MaxScheduledPerBlock; - type WeightInfo = weights::scheduler::BasiliskWeight; + type WeightInfo = weights::pallet_scheduler::BasiliskWeight; type Preimages = Preimage; } @@ -241,8 +253,65 @@ parameter_types! { pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry"); pub const MaxApprovals: u32 = 100; pub TreasuryAccount: AccountId = Treasury::account_id(); + pub const TreasuryPayoutPeriod: u32 = 30 * DAYS; } +pub struct PayFromTreasuryAccount; + +impl Pay for PayFromTreasuryAccount { + type Balance = Balance; + type Beneficiary = AccountId; + type AssetKind = (); + type Id = (); + type Error = DispatchError; + + #[cfg(not(feature = "runtime-benchmarks"))] + fn pay( + who: &Self::Beneficiary, + _asset_kind: Self::AssetKind, + amount: Self::Balance, + ) -> Result { + let _ = >::transfer( + &TreasuryAccount::get(), + who, + amount, + Preservation::Expendable, + )?; + Ok(()) + } + + #[cfg(feature = "runtime-benchmarks")] + fn pay( + who: &Self::Beneficiary, + _asset_kind: Self::AssetKind, + amount: Self::Balance, + ) -> Result { + // In case of benchmarks, we adjust the value by multiplying it by 1_000_000_000_000, otherwise it fails with BelowMinimum limit error, because + // treasury benchmarks uses only 100 as the amount. + let _ = >::transfer( + &TreasuryAccount::get(), + who, + amount * 1_000_000_000_000, + Preservation::Expendable, + )?; + Ok(()) + } + + fn check_payment(_id: Self::Id) -> PaymentStatus { + PaymentStatus::Success + } + + #[cfg(feature = "runtime-benchmarks")] + fn ensure_successful(_: &Self::Beneficiary, _: Self::AssetKind, amount: Self::Balance) { + >::mint_into(&TreasuryAccount::get(), amount * 1_000_000_000_000).unwrap(); + } + #[cfg(feature = "runtime-benchmarks")] + fn ensure_concluded(_: Self::Id) {} +} + +#[cfg(not(feature = "runtime-benchmarks"))] +use frame_support::traits::NeverEnsureOrigin; + impl pallet_treasury::Config for Runtime { type Currency = Balances; type ApproveOrigin = SuperMajorityCouncilOrRoot; @@ -256,8 +325,20 @@ impl pallet_treasury::Config for Runtime { type Burn = Burn; type PalletId = TreasuryPalletId; type BurnDestination = (); - type WeightInfo = weights::treasury::BasiliskWeight; + type WeightInfo = weights::pallet_treasury::BasiliskWeight; type SpendFunds = (); type MaxApprovals = MaxApprovals; - type SpendOrigin = NeverEnsureOrigin; + #[cfg(not(feature = "runtime-benchmarks"))] + type SpendOrigin = NeverEnsureOrigin; // Disabled, no spending + #[cfg(feature = "runtime-benchmarks")] + type SpendOrigin = + frame_system::EnsureWithSuccess, AccountId, crate::benches::BenchmarkMaxBalance>; + type AssetKind = (); + type Beneficiary = AccountId; + type BeneficiaryLookup = IdentityLookup; + type Paymaster = PayFromTreasuryAccount; + type BalanceConverter = UnityAssetBalanceConversion; + type PayoutPeriod = TreasuryPayoutPeriod; + #[cfg(feature = "runtime-benchmarks")] + type BenchmarkHelper = benchmarking::BenchmarkHelper; } diff --git a/runtime/basilisk/src/lib.rs b/runtime/basilisk/src/lib.rs index 4069ba9b17a..8cdd6ac1886 100644 --- a/runtime/basilisk/src/lib.rs +++ b/runtime/basilisk/src/lib.rs @@ -33,7 +33,6 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); mod tests; mod benchmarking; -mod migrations; pub mod weights; mod adapter; @@ -67,7 +66,7 @@ use sp_version::NativeVersion; use sp_version::RuntimeVersion; // A few exports that help ease life for downstream crates. -use frame_support::{construct_runtime, weights::Weight}; +use frame_support::{construct_runtime, parameter_types, weights::Weight}; /// Opaque types. These are used by the CLI to instantiate machinery that don't need to know /// the specifics of the runtime. They can then be made to be agnostic over specific formats @@ -102,7 +101,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("basilisk"), impl_name: create_runtime_str!("basilisk"), authoring_version: 1, - spec_version: 112, + spec_version: 113, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, @@ -179,9 +178,10 @@ construct_runtime!( Proxy: pallet_proxy = 12, Tips: pallet_tips = 13, + // The order of next 4 is important, and it cannot change. Authorship: pallet_authorship = 14, CollatorSelection: pallet_collator_selection = 15, - Session: pallet_session = 16, // Session must be after collator and before aura + Session: pallet_session = 16, Aura: pallet_aura = 17, AuraExt: cumulus_pallet_aura_ext exclude_parts { Storage } = 18, Preimage: pallet_preimage = 19, @@ -192,7 +192,7 @@ construct_runtime!( // Parachain and XCM - starts at index 50 ParachainSystem: cumulus_pallet_parachain_system exclude_parts { Config } = 50, - ParachainInfo: parachain_info = 51, + ParachainInfo: staging_parachain_info = 51, //NOTE: Scheduler must be after ParachainSystem otherwise RelayChainBlockNumberProvider //will return 0 as current block number when used with Scheduler(democracy). @@ -201,7 +201,8 @@ construct_runtime!( PolkadotXcm: pallet_xcm = 52, CumulusXcm: cumulus_pallet_xcm = 53, XcmpQueue: cumulus_pallet_xcmp_queue exclude_parts { Call } = 54, - DmpQueue: cumulus_pallet_dmp_queue = 55, + // 55 was used by DmpQueue which is now replaced by MessageQueue + MessageQueue: pallet_message_queue = 56, // Basilisk - runtime module index for basilisk's pallets starts at 100 AssetRegistry: pallet_asset_registry = 100, @@ -217,7 +218,7 @@ construct_runtime!( XYKLiquidityMining: pallet_xyk_liquidity_mining = 112, XYKWarehouseLM: warehouse_liquidity_mining:: = 113, CollatorRewards: pallet_collator_rewards = 114, - XcmRateLimiter: pallet_xcm_rate_limiter = 115, + // Note: 115 was used by rate limiter which is now removed EmaOracle: pallet_ema_oracle = 120, @@ -262,13 +263,20 @@ pub type Executive = frame_executive::Executive< Block, frame_system::ChainContext, Runtime, - AllPalletsReversedWithSystemFirst, + AllPalletsWithSystem, ( - migrations::OnRuntimeUpgradeMigration, - pallet_transaction_pause::migration::v1::Migration, + frame_support::migrations::RemovePallet::DbWeight>, + frame_support::migrations::RemovePallet::DbWeight>, + cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4, + pallet_identity::migration::versioned::V0ToV1, // We have currently 89 identities in basllisk, so limit of 200 should be enough ), >; +parameter_types! { + pub const DmpQueuePalletName: &'static str = "DmpQueue"; + pub const XcmRateLimiterPalletName: &'static str = "XcmRateLimiter"; +} + impl_runtime_apis! { impl sp_api::Core for Runtime { fn version() -> RuntimeVersion { @@ -417,47 +425,25 @@ impl_runtime_apis! { Vec, Vec, ) { - use frame_benchmarking::{list_benchmark, Benchmarking, BenchmarkList}; + use frame_benchmarking::{Benchmarking, BenchmarkList}; use frame_support::traits::StorageInfoTrait; use orml_benchmarking::list_benchmark as orml_list_benchmark; use frame_system_benchmarking::Pallet as SystemBench; use pallet_xyk_liquidity_mining_benchmarking::Pallet as XYKLiquidityMiningBench; + use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsiscsBenchmark; let mut list = Vec::::new(); - - list_benchmark!(list, extra, pallet_xyk, XYK); - list_benchmark!(list, extra, pallet_lbp, LBP); - list_benchmark!(list, extra, pallet_nft, NFT); - list_benchmark!(list, extra, pallet_asset_registry, AssetRegistry); - list_benchmark!(list, extra, pallet_xyk_liquidity_mining, XYKLiquidityMiningBench::); - list_benchmark!(list, extra, pallet_transaction_pause, TransactionPause); - list_benchmark!(list, extra, pallet_ema_oracle, EmaOracle); - - list_benchmark!(list, extra, frame_system, SystemBench::); - list_benchmark!(list, extra, pallet_balances, Balances); - list_benchmark!(list, extra, pallet_collator_selection, CollatorSelection); - list_benchmark!(list, extra, pallet_timestamp, Timestamp); - list_benchmark!(list, extra, pallet_democracy, Democracy); - list_benchmark!(list, extra, pallet_elections_phragmen, Elections); - list_benchmark!(list, extra, pallet_treasury, Treasury); - list_benchmark!(list, extra, pallet_scheduler, Scheduler); - list_benchmark!(list, extra, pallet_utility, Utility); - list_benchmark!(list, extra, pallet_tips, Tips); - list_benchmark!(list, extra, pallet_collective, TechnicalCommittee); - list_benchmark!(list, extra, pallet_state_trie_migration, StateTrieMigration); - - list_benchmark!(list, extra, cumulus_pallet_xcmp_queue, XcmpQueue); - list_benchmark!(list, extra, pallet_xcm, PolkadotXcm); + list_benchmarks!(list, extra); orml_list_benchmark!(list, extra, pallet_currencies, benchmarking::currencies); + orml_list_benchmark!(list, extra, pallet_xyk, benchmarking::xyk); orml_list_benchmark!(list, extra, orml_tokens, benchmarking::tokens); orml_list_benchmark!(list, extra, orml_vesting, benchmarking::vesting); orml_list_benchmark!(list, extra, pallet_duster, benchmarking::duster); orml_list_benchmark!(list, extra, pallet_transaction_multi_payment, benchmarking::multi_payment); orml_list_benchmark!(list, extra, pallet_route_executor, benchmarking::route_executor); orml_list_benchmark!(list, extra, pallet_marketplace, benchmarking::marketplace); - let storage_info = AllPalletsWithSystem::storage_info(); (list, storage_info) @@ -466,13 +452,14 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result, sp_runtime::RuntimeString> { - use frame_benchmarking::{BenchmarkError, Benchmarking, BenchmarkBatch, add_benchmark}; + use frame_benchmarking::{BenchmarkError, Benchmarking, BenchmarkBatch}; use frame_support::traits::TrackedStorageKey; use orml_benchmarking::add_benchmark as orml_add_benchmark; use frame_system_benchmarking::Pallet as SystemBench; use pallet_xyk_liquidity_mining_benchmarking::Pallet as XYKLiquidityMiningBench; + use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsiscsBenchmark; impl frame_system_benchmarking::Config for Runtime { fn setup_set_code_requirements(code: &sp_std::vec::Vec) -> Result<(), BenchmarkError> { @@ -484,6 +471,41 @@ impl_runtime_apis! { System::assert_last_event(cumulus_pallet_parachain_system::Event::::ValidationFunctionStored.into()); } } + + parameter_types! { + pub const RandomParaId: ParaId = ParaId::new(22222222); + pub const ExistentialDeposit: u128= 0; + } + + use cumulus_primitives_core::ParaId; + use polkadot_xcm::latest::prelude::{Location, AssetId, Fungible, Asset, ParentThen, Parachain, Parent}; + + impl pallet_xcm::benchmarking::Config for Runtime { + fn reachable_dest() -> Option { + Some(Parent.into()) + } + + fn teleportable_asset_and_dest() -> Option<(Asset, Location)> { + Some(( + Asset { + fun: Fungible(ExistentialDeposit::get()), + id: AssetId(Parent.into()) + }, + Parent.into(), + )) + } + + fn reserve_transferable_asset_and_dest() -> Option<(Asset, Location)> { + Some(( + Asset { + fun: Fungible(ExistentialDeposit::get()), + id: AssetId(Parent.into()) + }, + ParentThen(Parachain(RandomParaId::get().into()).into()).into(), + )) + } + } + impl pallet_xyk_liquidity_mining_benchmarking::Config for Runtime {} let whitelist: Vec = vec![ @@ -503,33 +525,9 @@ impl_runtime_apis! { let mut batches = Vec::::new(); let params = (&config, &whitelist); + add_benchmarks!(params, batches); - // Basilisk pallets - add_benchmark!(params, batches, pallet_xyk, XYK); - add_benchmark!(params, batches, pallet_lbp, LBP); - add_benchmark!(params, batches, pallet_nft, NFT); - add_benchmark!(params, batches, pallet_asset_registry, AssetRegistry); - add_benchmark!(params, batches, pallet_xyk_liquidity_mining, XYKLiquidityMiningBench::); - add_benchmark!(params, batches, pallet_transaction_pause, TransactionPause); - add_benchmark!(params, batches, pallet_ema_oracle, EmaOracle); - - // Substrate pallets - add_benchmark!(params, batches, frame_system, SystemBench::); - add_benchmark!(params, batches, pallet_balances, Balances); - add_benchmark!(params, batches, pallet_collator_selection, CollatorSelection); - add_benchmark!(params, batches, pallet_timestamp, Timestamp); - add_benchmark!(params, batches, pallet_democracy, Democracy); - add_benchmark!(params, batches, pallet_elections_phragmen, Elections); - add_benchmark!(params, batches, pallet_treasury, Treasury); - add_benchmark!(params, batches, pallet_scheduler, Scheduler); - add_benchmark!(params, batches, pallet_utility, Utility); - add_benchmark!(params, batches, pallet_tips, Tips); - add_benchmark!(params, batches, pallet_collective, TechnicalCommittee); - add_benchmark!(params, batches, pallet_state_trie_migration, StateTrieMigration); - - add_benchmark!(params, batches, cumulus_pallet_xcmp_queue, XcmpQueue); - add_benchmark!(params, batches, pallet_xcm, PolkadotXcm); - + orml_add_benchmark!(params, batches, pallet_xyk, benchmarking::xyk); orml_add_benchmark!(params, batches, pallet_currencies, benchmarking::currencies); orml_add_benchmark!(params, batches, orml_tokens, benchmarking::tokens); orml_add_benchmark!(params, batches, orml_vesting, benchmarking::vesting); @@ -544,6 +542,41 @@ impl_runtime_apis! { } } +#[cfg(feature = "runtime-benchmarks")] +mod benches { + frame_support::parameter_types! { + pub const BenchmarkMaxBalance: crate::Balance = crate::Balance::max_value(); + } + frame_benchmarking::define_benchmarks!( + [pallet_lbp, LBP] + [pallet_nft, NFT] + [pallet_asset_registry, AssetRegistry] + [pallet_xyk_liquidity_mining, XYKLiquidityMiningBench::] + [pallet_transaction_pause, TransactionPause] + [pallet_ema_oracle, EmaOracle] + [frame_system, SystemBench::] + [pallet_balances, Balances] + [pallet_timestamp, Timestamp] + [pallet_democracy, Democracy] + [pallet_elections_phragmen, Elections] + [pallet_treasury, Treasury] + [pallet_scheduler, Scheduler] + [pallet_utility, Utility] + [pallet_tips, Tips] + [pallet_identity, Identity] + [pallet_collective, TechnicalCommittee] + [cumulus_pallet_xcmp_queue, XcmpQueue] + [pallet_message_queue, MessageQueue] + [pallet_preimage, Preimage] + [pallet_multisig, Multisig] + [pallet_proxy, Proxy] + [cumulus_pallet_parachain_system, ParachainSystem] + [pallet_state_trie_migration, StateTrieMigration] + [pallet_collator_selection, CollatorSelection] + [pallet_xcm, PalletXcmExtrinsiscsBenchmark::] + ); +} + struct CheckInherents; impl cumulus_pallet_parachain_system::CheckInherents for CheckInherents { diff --git a/runtime/basilisk/src/migrations.rs b/runtime/basilisk/src/migrations.rs deleted file mode 100644 index 73fcb8e3e2e..00000000000 --- a/runtime/basilisk/src/migrations.rs +++ /dev/null @@ -1,52 +0,0 @@ -use crate::Runtime; -use frame_support::{traits::OnRuntimeUpgrade, weights::Weight}; -#[cfg(feature = "try-runtime")] -use sp_std::prelude::*; - -pub struct OnRuntimeUpgradeMigration; -impl OnRuntimeUpgrade for OnRuntimeUpgradeMigration { - #[cfg(feature = "try-runtime")] - fn pre_upgrade() -> Result, sp_runtime::DispatchError> { - log::info!("PreMigrate Collator Selection Pallet start"); - let number_of_invulnerables = pallet_collator_selection::migration::v1::MigrateToV1::::pre_upgrade()?; - log::info!("PreMigrate Collator Selection Pallet end"); - - log::info!("PreMigrate Collator Rewards Pallet start"); - pallet_collator_rewards::migration::v1::pre_migrate::(); - log::info!("PreMigrate Collator Rewards Pallet end"); - - Ok(number_of_invulnerables) - } - - fn on_runtime_upgrade() -> Weight { - let mut weight: Weight = Weight::zero(); - - log::info!("Migrate Collator Selection Pallet to v1 start"); - weight = weight - .saturating_add(pallet_collator_selection::migration::v1::MigrateToV1::::on_runtime_upgrade()); - log::info!("Migrate Collator Selection Pallet to v1 end"); - - log::info!("Migrate Collator Rewards Pallet to v1 start"); - weight = weight.saturating_add(pallet_collator_rewards::migration::v1::migrate::()); - log::info!("Migrate Collator Rewards Pallet to v1 end"); - - log::info!("Migrate Unknown Tokens Pallet to v2 start"); - weight = weight.saturating_add(orml_unknown_tokens::Migration::::on_runtime_upgrade()); - log::info!("Migrate Unknown Tokens Pallet to v2 end"); - - weight - } - - #[cfg(feature = "try-runtime")] - fn post_upgrade(state: Vec) -> Result<(), sp_runtime::DispatchError> { - log::info!("PostMigrate Collator Selection Pallet start"); - let migration_result = pallet_collator_selection::migration::v1::MigrateToV1::::post_upgrade(state); - log::info!("PostMigrate Collator Selection Pallet end"); - - log::info!("PostMigrate Collator Rewards Pallet start"); - pallet_collator_rewards::migration::v1::post_migrate::(); - log::info!("PostMigrate Collator Rewards Pallet end"); - - migration_result - } -} diff --git a/runtime/basilisk/src/system.rs b/runtime/basilisk/src/system.rs index 0f6cc4bac86..a866388dc97 100644 --- a/runtime/basilisk/src/system.rs +++ b/runtime/basilisk/src/system.rs @@ -27,6 +27,8 @@ use primitives::constants::{ }; use codec::{Decode, Encode, MaxEncodedLen}; +use frame_support::pallet_prelude::Get; +use frame_support::traits::Defensive; use frame_support::{ dispatch::DispatchClass, parameter_types, @@ -38,8 +40,10 @@ use frame_support::{ }, PalletId, }; -use frame_system::EnsureSignedBy; +use frame_system::EnsureRoot; use hydradx_adapters::RelayChainBlockNumberProvider; +use hydradx_traits::evm::InspectEvmAccounts; +use primitives::constants::time::DAYS; use scale_info::TypeInfo; /// We assume that an on-initialize consumes 2.5% of the weight on average, hence a single extrinsic @@ -109,6 +113,8 @@ parameter_types! { } impl frame_system::Config for Runtime { + /// The ubiquitous event type. + type RuntimeEvent = RuntimeEvent; /// The basic call filter to use in dispatchable. type BaseCallFilter = BaseFilter; type BlockWeights = BlockWeights; @@ -117,10 +123,9 @@ impl frame_system::Config for Runtime { type RuntimeOrigin = RuntimeOrigin; /// The aggregated dispatch type that is available for extrinsics. type RuntimeCall = RuntimeCall; + type RuntimeTask = RuntimeTask; /// The index type for storing how many extrinsics an account has signed. type Nonce = Index; - /// The index type for blocks. - type Block = Block; /// The type for hashing blocks and tries. type Hash = Hash; /// The hashing algorithm used. @@ -129,8 +134,8 @@ impl frame_system::Config for Runtime { type AccountId = AccountId; /// The lookup mechanism to get account ID from whatever is passed in dispatchers. type Lookup = IdentityLookup; - /// The ubiquitous event type. - type RuntimeEvent = RuntimeEvent; + /// The index type for blocks. + type Block = Block; /// Maximum number of block number to block hash mappings to keep (oldest pruned first). type BlockHashCount = BlockHashCount; /// The weight of database operations that the runtime can invoke. @@ -150,7 +155,7 @@ impl frame_system::Config for Runtime { /// What to do if an account is fully reaped from the system. type OnKilledAccount = (); /// Weight information for the extrinsics of this pallet. - type SystemWeightInfo = weights::system::BasiliskWeight; + type SystemWeightInfo = weights::frame_system::BasiliskWeight; type SS58Prefix = SS58Prefix; type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode; type MaxConsumers = frame_support::traits::ConstU32<16>; @@ -166,7 +171,7 @@ impl pallet_timestamp::Config for Runtime { type Moment = u64; type OnTimestampSet = (); type MinimumPeriod = MinimumPeriod; - type WeightInfo = weights::timestamp::BasiliskWeight; + type WeightInfo = weights::pallet_timestamp::BasiliskWeight; } pub struct WeightToFee; @@ -224,15 +229,51 @@ impl pallet_transaction_payment::Config for Runtime { type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; } +pub struct WethAssetId; +impl Get for WethAssetId { + fn get() -> AssetId { + pallet_asset_registry::Pallet::::next_asset_id().defensive_unwrap_or(AssetId::MAX) + } +} + +pub struct EvmAccounts; +impl InspectEvmAccounts for EvmAccounts { + fn is_evm_account(_account_id: AccountId) -> bool { + false + } + + fn evm_address(_account_id: &impl AsRef<[u8; 32]>) -> sp_core::H160 { + sp_core::H160::default() + } + + fn truncated_account_id(_evm_address: sp_core::H160) -> AccountId { + AccountId::new([0u8; 32]) + } + + fn bound_account_id(_evm_address: sp_core::H160) -> Option { + None + } + + fn account_id(_evm_address: sp_core::H160) -> AccountId { + AccountId::new([0u8; 32]) + } + + fn can_deploy_contracts(_evm_address: sp_core::H160) -> bool { + false + } +} + impl pallet_transaction_multi_payment::Config for Runtime { type RuntimeEvent = RuntimeEvent; type AcceptedCurrencyOrigin = MajorityTechCommitteeOrRoot; type Currencies = Currencies; type RouteProvider = Router; type OraclePriceProvider = adapter::OraclePriceProvider; - type WeightInfo = weights::payment::BasiliskWeight; + type WeightInfo = weights::pallet_transaction_multi_payment::BasiliskWeight; type WeightToFee = WeightToFee; type NativeAssetId = NativeAssetId; + type EvmAssetId = WethAssetId; + type InspectEvmAccounts = EvmAccounts; } /// The type used to represent the kinds of proxying allowed. @@ -300,7 +341,7 @@ impl pallet_proxy::Config for Runtime { type ProxyDepositBase = ProxyDepositBase; type ProxyDepositFactor = ProxyDepositFactor; type MaxProxies = MaxProxies; - type WeightInfo = (); + type WeightInfo = weights::pallet_proxy::BasiliskWeight; type MaxPending = MaxPending; type CallHasher = BlakeTwo256; type AnnouncementDepositBase = AnnouncementDepositBase; @@ -317,11 +358,12 @@ impl cumulus_pallet_parachain_system::Config for Runtime { type OnSystemEvent = pallet_relaychain_info::OnValidationDataHandler; type SelfParaId = ParachainInfo; type OutboundXcmpMessageSource = XcmpQueue; - type DmpMessageHandler = DmpQueue; type ReservedDmpWeight = ReservedDmpWeight; type XcmpMessageHandler = XcmpQueue; type ReservedXcmpWeight = ReservedXcmpWeight; type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases; + type DmpQueue = frame_support::traits::EnqueueWithOrigin; + type WeightInfo = weights::cumulus_pallet_parachain_system::BasiliskWeight; } parameter_types! { @@ -339,7 +381,7 @@ impl pallet_utility::Config for Runtime { type RuntimeEvent = RuntimeEvent; type RuntimeCall = RuntimeCall; type PalletsOrigin = OriginCaller; - type WeightInfo = weights::utility::BasiliskWeight; + type WeightInfo = weights::pallet_utility::BasiliskWeight; } parameter_types! { @@ -369,7 +411,10 @@ impl pallet_collator_selection::Config for Runtime { type ValidatorId = ::AccountId; type ValidatorIdOf = pallet_collator_selection::IdentityCollator; type ValidatorRegistration = Session; - type WeightInfo = weights::collator_selection::BasiliskWeight; + #[cfg(feature = "runtime-benchmarks")] + type WeightInfo = (); + #[cfg(not(feature = "runtime-benchmarks"))] + type WeightInfo = weights::pallet_collator_selection::BasiliskWeight; type MinEligibleCollators = ConstU32<4>; } @@ -392,7 +437,7 @@ impl pallet_session::Config for Runtime { type WeightInfo = (); } -impl parachain_info::Config for Runtime {} +impl staging_parachain_info::Config for Runtime {} impl cumulus_pallet_aura_ext::Config for Runtime {} @@ -404,7 +449,7 @@ impl pallet_relaychain_info::Config for Runtime { impl pallet_transaction_pause::Config for Runtime { type RuntimeEvent = RuntimeEvent; type UpdateOrigin = MajorityTechCommitteeOrRoot; - type WeightInfo = weights::transaction_pause::BasiliskWeight; + type WeightInfo = weights::pallet_transaction_pause::BasiliskWeight; } parameter_types! { @@ -432,26 +477,35 @@ impl pallet_collator_rewards::Config for Runtime { parameter_types! { pub const BasicDeposit: Balance = 5 * DOLLARS; - pub const FieldDeposit: Balance = DOLLARS; + pub const ByteDeposit: Balance = DOLLARS / 10; pub const SubAccountDeposit: Balance = 5 * DOLLARS; pub const MaxSubAccounts: u32 = 100; pub const MaxAdditionalFields: u32 = 100; pub const MaxRegistrars: u32 = 20; + pub const PendingUserNameExpiration: u32 = 7 * DAYS; + pub const MaxSuffixLength: u32 = 7; + pub const MaxUsernameLength: u32 = 32; } impl pallet_identity::Config for Runtime { type RuntimeEvent = RuntimeEvent; type Currency = Balances; type BasicDeposit = BasicDeposit; - type FieldDeposit = FieldDeposit; + type ByteDeposit = ByteDeposit; type SubAccountDeposit = SubAccountDeposit; type MaxSubAccounts = MaxSubAccounts; - type MaxAdditionalFields = MaxAdditionalFields; + type IdentityInformation = pallet_identity::legacy::IdentityInfo; type MaxRegistrars = MaxRegistrars; type Slashed = Treasury; type ForceOrigin = MajorityCouncilOrRoot; type RegistrarOrigin = MajorityCouncilOrRoot; - type WeightInfo = (); + type OffchainSignature = Signature; + type SigningPublicKey = ::Signer; + type UsernameAuthorityOrigin = EnsureRoot; + type PendingUsernameExpiration = PendingUserNameExpiration; + type MaxSuffixLength = MaxSuffixLength; + type MaxUsernameLength = MaxUsernameLength; + type WeightInfo = weights::pallet_identity::BasiliskWeight; } parameter_types! { @@ -467,7 +521,7 @@ impl pallet_multisig::Config for Runtime { type DepositBase = DepositBase; type DepositFactor = DepositFactor; type MaxSignatories = MaxSignatories; - type WeightInfo = (); + type WeightInfo = weights::pallet_multisig::BasiliskWeight; } pub struct TechCommAccounts; @@ -484,13 +538,23 @@ parameter_types! { pub const MaxKeyLen: u32 = 512; // 144, but use the default value } +#[cfg(feature = "runtime-benchmarks")] +use frame_system::EnsureSigned; + +#[cfg(not(feature = "runtime-benchmarks"))] +use frame_system::EnsureSignedBy; + impl pallet_state_trie_migration::Config for Runtime { type ControlOrigin = SuperMajorityTechCommitteeOrRoot; + #[cfg(feature = "runtime-benchmarks")] + type SignedFilter = EnsureSigned; + #[cfg(not(feature = "runtime-benchmarks"))] type SignedFilter = EnsureSignedBy; type RuntimeEvent = RuntimeEvent; type Currency = Balances; + type RuntimeHoldReason = RuntimeHoldReason; type MaxKeyLen = MaxKeyLen; type SignedDepositPerItem = MigrationSignedDepositPerItem; type SignedDepositBase = MigrationSignedDepositBase; - type WeightInfo = weights::state_trie::BasiliskWeight; + type WeightInfo = weights::pallet_state_trie_migration::BasiliskWeight; } diff --git a/runtime/basilisk/src/tests.rs b/runtime/basilisk/src/tests.rs index 6179dc291da..98d5d63b591 100644 --- a/runtime/basilisk/src/tests.rs +++ b/runtime/basilisk/src/tests.rs @@ -47,7 +47,7 @@ fn extrinsic_base_fee_is_correct() { #[test] // Useful to calculate how much single transfer costs in native currency with fee components breakdown fn transfer_cost() { - let call = pallet_balances::Call::::transfer { + let call = pallet_balances::Call::::transfer_keep_alive { dest: AccountId::new([0; 32]), value: Default::default(), }; diff --git a/runtime/basilisk/src/weights/collator_selection.rs b/runtime/basilisk/src/weights/collator_selection.rs deleted file mode 100644 index f72f3da12ab..00000000000 --- a/runtime/basilisk/src/weights/collator_selection.rs +++ /dev/null @@ -1,215 +0,0 @@ -// This file is part of Basilisk. - -// Copyright (C) 2020-2023 Intergalactic, Limited (GIB). -// SPDX-License-Identifier: Apache-2.0 - -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//! Autogenerated weights for `pallet_collator_selection` -//! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-12-06, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` - -// Executed Command: -// target/release/basilisk -// benchmark -// pallet -// --chain=dev -// --steps=10 -// --repeat=30 -// --wasm-execution=compiled -// --heap-pages=4096 -// --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=pallet-collator-selection -// --output=weights-1.1.0/collator_selection.rs -// --extrinsic=* - -#![allow(unused_parens)] -#![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] - -use frame_support::{ - traits::Get, - weights::{constants::RocksDbWeight, Weight}, -}; -use sp_std::marker::PhantomData; - -use pallet_collator_selection::weights::WeightInfo; - -pub struct BasiliskWeight(PhantomData); - -impl WeightInfo for BasiliskWeight { - /// Storage: `Session::NextKeys` (r:50 w:0) - /// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `CollatorSelection::Invulnerables` (r:0 w:1) - /// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`) - /// The range of component `b` is `[1, 50]`. - fn set_invulnerables(b: u32) -> Weight { - // Proof Size summary in bytes: - // Measured: `205 + b * (79 ±0)` - // Estimated: `1194 + b * (2554 ±0)` - // Minimum execution time: 20_642_000 picoseconds. - Weight::from_parts(19_678_835, 1194) - // Standard Error: 8_717 - .saturating_add(Weight::from_parts(3_466_810, 0).saturating_mul(b.into())) - .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(b.into()))) - .saturating_add(T::DbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_parts(0, 2554).saturating_mul(b.into())) - } - /// Storage: `Session::NextKeys` (r:1 w:0) - /// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `CollatorSelection::Invulnerables` (r:1 w:1) - /// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`) - /// Storage: `CollatorSelection::Candidates` (r:1 w:1) - /// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(961), added: 1456, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:1 w:1) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - /// The range of component `b` is `[1, 49]`. - /// The range of component `c` is `[1, 19]`. - fn add_invulnerable(b: u32, c: u32) -> Weight { - // Proof Size summary in bytes: - // Measured: `853 + b * (42 ±0) + c * (48 ±0)` - // Estimated: `4355 + b * (42 ±0) + c * (46 ±0)` - // Minimum execution time: 59_791_000 picoseconds. - Weight::from_parts(58_869_820, 4355) - // Standard Error: 4_211 - .saturating_add(Weight::from_parts(159_294, 0).saturating_mul(b.into())) - // Standard Error: 11_302 - .saturating_add(Weight::from_parts(46_107, 0).saturating_mul(c.into())) - .saturating_add(T::DbWeight::get().reads(4_u64)) - .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_parts(0, 42).saturating_mul(b.into())) - .saturating_add(Weight::from_parts(0, 46).saturating_mul(c.into())) - } - /// Storage: `CollatorSelection::Candidates` (r:1 w:0) - /// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(961), added: 1456, mode: `MaxEncodedLen`) - /// Storage: `CollatorSelection::Invulnerables` (r:1 w:1) - /// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`) - /// The range of component `b` is `[5, 50]`. - fn remove_invulnerable(b: u32) -> Weight { - // Proof Size summary in bytes: - // Measured: `186 + b * (32 ±0)` - // Estimated: `3086` - // Minimum execution time: 21_930_000 picoseconds. - Weight::from_parts(22_391_375, 3086) - // Standard Error: 1_204 - .saturating_add(Weight::from_parts(46_963, 0).saturating_mul(b.into())) - .saturating_add(T::DbWeight::get().reads(2_u64)) - .saturating_add(T::DbWeight::get().writes(1_u64)) - } - /// Storage: `CollatorSelection::DesiredCandidates` (r:0 w:1) - /// Proof: `CollatorSelection::DesiredCandidates` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - fn set_desired_candidates() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 11_158_000 picoseconds. - Weight::from_parts(11_428_000, 0).saturating_add(T::DbWeight::get().writes(1_u64)) - } - /// Storage: `CollatorSelection::CandidacyBond` (r:0 w:1) - /// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`) - fn set_candidacy_bond() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 11_250_000 picoseconds. - Weight::from_parts(11_503_000, 0).saturating_add(T::DbWeight::get().writes(1_u64)) - } - /// Storage: `CollatorSelection::Candidates` (r:1 w:1) - /// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(961), added: 1456, mode: `MaxEncodedLen`) - /// Storage: `CollatorSelection::DesiredCandidates` (r:1 w:0) - /// Proof: `CollatorSelection::DesiredCandidates` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `CollatorSelection::Invulnerables` (r:1 w:0) - /// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`) - /// Storage: `Session::NextKeys` (r:1 w:0) - /// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `CollatorSelection::CandidacyBond` (r:1 w:0) - /// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`) - /// Storage: `CollatorSelection::LastAuthoredBlock` (r:0 w:1) - /// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`) - /// The range of component `c` is `[1, 19]`. - fn register_as_candidate(c: u32) -> Weight { - // Proof Size summary in bytes: - // Measured: `621 + c * (61 ±0)` - // Estimated: `4091 + c * (61 ±0)` - // Minimum execution time: 57_862_000 picoseconds. - Weight::from_parts(58_635_556, 4091) - // Standard Error: 4_827 - .saturating_add(Weight::from_parts(158_468, 0).saturating_mul(c.into())) - .saturating_add(T::DbWeight::get().reads(5_u64)) - .saturating_add(T::DbWeight::get().writes(2_u64)) - .saturating_add(Weight::from_parts(0, 61).saturating_mul(c.into())) - } - /// Storage: `CollatorSelection::Candidates` (r:1 w:1) - /// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(961), added: 1456, mode: `MaxEncodedLen`) - /// Storage: `CollatorSelection::Invulnerables` (r:1 w:0) - /// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`) - /// Storage: `CollatorSelection::LastAuthoredBlock` (r:0 w:1) - /// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`) - /// The range of component `c` is `[3, 20]`. - fn leave_intent(c: u32) -> Weight { - // Proof Size summary in bytes: - // Measured: `448 + c * (47 ±0)` - // Estimated: `3086` - // Minimum execution time: 45_364_000 picoseconds. - Weight::from_parts(46_297_183, 3086) - // Standard Error: 6_548 - .saturating_add(Weight::from_parts(81_304, 0).saturating_mul(c.into())) - .saturating_add(T::DbWeight::get().reads(2_u64)) - .saturating_add(T::DbWeight::get().writes(2_u64)) - } - /// Storage: `System::Account` (r:2 w:2) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - /// Storage: `System::BlockWeight` (r:1 w:1) - /// Proof: `System::BlockWeight` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`) - /// Storage: `CollatorSelection::LastAuthoredBlock` (r:0 w:1) - /// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`) - fn note_author() -> Weight { - // Proof Size summary in bytes: - // Measured: `102` - // Estimated: `6196` - // Minimum execution time: 62_641_000 picoseconds. - Weight::from_parts(63_217_000, 6196) - .saturating_add(T::DbWeight::get().reads(3_u64)) - .saturating_add(T::DbWeight::get().writes(4_u64)) - } - /// Storage: `CollatorSelection::Candidates` (r:1 w:0) - /// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(961), added: 1456, mode: `MaxEncodedLen`) - /// Storage: `CollatorSelection::LastAuthoredBlock` (r:20 w:0) - /// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`) - /// Storage: `CollatorSelection::Invulnerables` (r:1 w:0) - /// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`) - /// Storage: `System::BlockWeight` (r:1 w:1) - /// Proof: `System::BlockWeight` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:17 w:17) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - /// The range of component `r` is `[1, 20]`. - /// The range of component `c` is `[1, 20]`. - fn new_session(r: u32, c: u32) -> Weight { - // Proof Size summary in bytes: - // Measured: `312 + c * (98 ±0) + r * (117 ±0)` - // Estimated: `3086 + c * (2519 ±0) + r * (2603 ±0)` - // Minimum execution time: 28_271_000 picoseconds. - Weight::from_parts(28_435_000, 3086) - // Standard Error: 692_426 - .saturating_add(Weight::from_parts(17_239_787, 0).saturating_mul(c.into())) - .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into()))) - .saturating_add(T::DbWeight::get().writes(1_u64)) - .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into()))) - .saturating_add(Weight::from_parts(0, 2519).saturating_mul(c.into())) - .saturating_add(Weight::from_parts(0, 2603).saturating_mul(r.into())) - } -} diff --git a/runtime/basilisk/src/weights/cumulus_pallet_parachain_system.rs b/runtime/basilisk/src/weights/cumulus_pallet_parachain_system.rs new file mode 100644 index 00000000000..d74908eae25 --- /dev/null +++ b/runtime/basilisk/src/weights/cumulus_pallet_parachain_system.rs @@ -0,0 +1,85 @@ +// This file is part of Basilisk. + +// Copyright (C) 2020-2023 Intergalactic, Limited (GIB). +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + + +//! Autogenerated weights for `cumulus_pallet_parachain_system` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` + +// Executed Command: +// ./target/release/basilisk +// benchmark +// pallet +// --wasm-execution=compiled +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 +// --template=.maintain/pallet-weight-template-no-back.hbs +// --json-file +// raw.json +// --output +// weights/ + +#![cfg_attr(rustfmt, rustfmt_skip)] +#![allow(unused_parens)] +#![allow(unused_imports)] +#![allow(missing_docs)] + +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; + +/// Weights for `cumulus_pallet_parachain_system`. +pub struct WeightInfo(PhantomData); + +/// Weights for `cumulus_pallet_parachain_system` using the Basilisk node and recommended hardware. +pub struct BasiliskWeight(PhantomData); +impl cumulus_pallet_parachain_system::WeightInfo for BasiliskWeight { + /// Storage: `ParachainSystem::LastDmqMqcHead` (r:1 w:1) + /// Proof: `ParachainSystem::LastDmqMqcHead` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) + /// Storage: `MessageQueue::BookStateFor` (r:1 w:1) + /// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) + /// Storage: `MessageQueue::ServiceHead` (r:1 w:1) + /// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`) + /// Storage: `ParachainSystem::ProcessedDownwardMessages` (r:0 w:1) + /// Proof: `ParachainSystem::ProcessedDownwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) + /// Storage: `MessageQueue::Pages` (r:0 w:1000) + /// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(134193), added: 136668, mode: `MaxEncodedLen`) + /// The range of component `n` is `[0, 1000]`. + fn enqueue_inbound_downward_messages(n: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `156` + // Estimated: `3517` + // Minimum execution time: 2_740_000 picoseconds. + Weight::from_parts(7_630_634_002, 3517) + // Standard Error: 1_392_681 + .saturating_add(Weight::from_parts(274_384_874, 0).saturating_mul(n.into())) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into()))) + } +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/cumulus_pallet_xcmp_queue.rs b/runtime/basilisk/src/weights/cumulus_pallet_xcmp_queue.rs new file mode 100644 index 00000000000..60dc8bf1d65 --- /dev/null +++ b/runtime/basilisk/src/weights/cumulus_pallet_xcmp_queue.rs @@ -0,0 +1,167 @@ +// This file is part of Basilisk. + +// Copyright (C) 2020-2023 Intergalactic, Limited (GIB). +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + + +//! Autogenerated weights for `cumulus_pallet_xcmp_queue` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` + +// Executed Command: +// ./target/release/basilisk +// benchmark +// pallet +// --wasm-execution=compiled +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 +// --template=.maintain/pallet-weight-template-no-back.hbs +// --json-file +// raw.json +// --output +// weights/ + +#![cfg_attr(rustfmt, rustfmt_skip)] +#![allow(unused_parens)] +#![allow(unused_imports)] +#![allow(missing_docs)] + +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; + +/// Weights for `cumulus_pallet_xcmp_queue`. +pub struct WeightInfo(PhantomData); + +/// Weights for `cumulus_pallet_xcmp_queue` using the Basilisk node and recommended hardware. +pub struct BasiliskWeight(PhantomData); +impl cumulus_pallet_xcmp_queue::WeightInfo for BasiliskWeight { + /// Storage: `XcmpQueue::QueueConfig` (r:1 w:1) + /// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) + fn set_config_with_u32() -> Weight { + // Proof Size summary in bytes: + // Measured: `109` + // Estimated: `1594` + // Minimum execution time: 6_560_000 picoseconds. + Weight::from_parts(6_920_000, 1594) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `XcmpQueue::QueueConfig` (r:1 w:0) + /// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) + /// Storage: `MessageQueue::BookStateFor` (r:1 w:1) + /// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) + /// Storage: `MessageQueue::ServiceHead` (r:1 w:1) + /// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`) + /// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0) + /// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) + /// Storage: `MessageQueue::Pages` (r:0 w:1) + /// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(134193), added: 136668, mode: `MaxEncodedLen`) + fn enqueue_xcmp_message() -> Weight { + // Proof Size summary in bytes: + // Measured: `189` + // Estimated: `3517` + // Minimum execution time: 13_570_000 picoseconds. + Weight::from_parts(14_390_000, 3517) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) + } + /// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1) + /// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) + fn suspend_channel() -> Weight { + // Proof Size summary in bytes: + // Measured: `109` + // Estimated: `1594` + // Minimum execution time: 3_230_000 picoseconds. + Weight::from_parts(3_480_000, 1594) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1) + /// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) + fn resume_channel() -> Weight { + // Proof Size summary in bytes: + // Measured: `144` + // Estimated: `1629` + // Minimum execution time: 4_190_000 picoseconds. + Weight::from_parts(4_420_000, 1629) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + fn take_first_concatenated_xcm() -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 8_340_000 picoseconds. + Weight::from_parts(8_491_000, 0) + } + /// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1) + /// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1) + /// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6bedc49980ba3aa32b0a189290fd036649` (r:1 w:1) + /// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6bedc49980ba3aa32b0a189290fd036649` (r:1 w:1) + /// Storage: `MessageQueue::BookStateFor` (r:1 w:1) + /// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) + /// Storage: `MessageQueue::ServiceHead` (r:1 w:1) + /// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`) + /// Storage: `XcmpQueue::QueueConfig` (r:1 w:0) + /// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) + /// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0) + /// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) + /// Storage: `MessageQueue::Pages` (r:0 w:1) + /// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(134193), added: 136668, mode: `MaxEncodedLen`) + fn on_idle_good_msg() -> Weight { + // Proof Size summary in bytes: + // Measured: `134426` + // Estimated: `137891` + // Minimum execution time: 150_231_000 picoseconds. + Weight::from_parts(153_131_000, 137891) + .saturating_add(T::DbWeight::get().reads(6_u64)) + .saturating_add(T::DbWeight::get().writes(5_u64)) + } + /// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1) + /// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1) + /// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6bedc49980ba3aa32b0a189290fd036649` (r:1 w:1) + /// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6bedc49980ba3aa32b0a189290fd036649` (r:1 w:1) + /// Storage: `MessageQueue::BookStateFor` (r:1 w:1) + /// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) + /// Storage: `MessageQueue::ServiceHead` (r:1 w:1) + /// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`) + /// Storage: `XcmpQueue::QueueConfig` (r:1 w:0) + /// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) + /// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0) + /// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) + /// Storage: `MessageQueue::Pages` (r:0 w:1) + /// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(134193), added: 136668, mode: `MaxEncodedLen`) + fn on_idle_large_msg() -> Weight { + // Proof Size summary in bytes: + // Measured: `65823` + // Estimated: `69288` + // Minimum execution time: 85_311_000 picoseconds. + Weight::from_parts(89_330_000, 69288) + .saturating_add(T::DbWeight::get().reads(6_u64)) + .saturating_add(T::DbWeight::get().writes(5_u64)) + } +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/ema_oracle.rs b/runtime/basilisk/src/weights/ema_oracle.rs deleted file mode 100644 index 311c9d40924..00000000000 --- a/runtime/basilisk/src/weights/ema_oracle.rs +++ /dev/null @@ -1,120 +0,0 @@ -// This file is part of Basilisk. - -// Copyright (C) 2020-2023 Intergalactic, Limited (GIB). -// SPDX-License-Identifier: Apache-2.0 - -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//! Autogenerated weights for `pallet_ema_oracle` -//! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-12-06, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` - -// Executed Command: -// target/release/basilisk -// benchmark -// pallet -// --chain=dev -// --steps=10 -// --repeat=30 -// --wasm-execution=compiled -// --heap-pages=4096 -// --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=pallet-ema-oracle -// --output=weights-1.1.0/ema_oracle.rs -// --extrinsic=* - -#![allow(unused_parens)] -#![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] - -use frame_support::{ - traits::Get, - weights::{constants::RocksDbWeight, Weight}, -}; -use sp_std::marker::PhantomData; - -use pallet_ema_oracle::weights::WeightInfo; - -pub struct BasiliskWeight(PhantomData); - -impl WeightInfo for BasiliskWeight { - /// Storage: `EmaOracle::Accumulator` (r:1 w:0) - /// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(4441), added: 4936, mode: `MaxEncodedLen`) - fn on_finalize_no_entry() -> Weight { - // Proof Size summary in bytes: - // Measured: `109` - // Estimated: `5926` - // Minimum execution time: 3_917_000 picoseconds. - Weight::from_parts(4_081_000, 5926).saturating_add(T::DbWeight::get().reads(1_u64)) - } - /// Storage: `EmaOracle::Accumulator` (r:1 w:1) - /// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(4441), added: 4936, mode: `MaxEncodedLen`) - /// Storage: `EmaOracle::Oracles` (r:145 w:145) - /// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`) - /// The range of component `b` is `[1, 29]`. - fn on_finalize_multiple_tokens(b: u32) -> Weight { - // Proof Size summary in bytes: - // Measured: `170 + b * (933 ±0)` - // Estimated: `5926 + b * (13260 ±0)` - // Minimum execution time: 75_545_000 picoseconds. - Weight::from_parts(14_265_997, 5926) - // Standard Error: 32_211 - .saturating_add(Weight::from_parts(62_973_426, 0).saturating_mul(b.into())) - .saturating_add(T::DbWeight::get().reads(1_u64)) - .saturating_add(T::DbWeight::get().reads((5_u64).saturating_mul(b.into()))) - .saturating_add(T::DbWeight::get().writes(1_u64)) - .saturating_add(T::DbWeight::get().writes((5_u64).saturating_mul(b.into()))) - .saturating_add(Weight::from_parts(0, 13260).saturating_mul(b.into())) - } - /// Storage: `EmaOracle::Accumulator` (r:1 w:1) - /// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(4441), added: 4936, mode: `MaxEncodedLen`) - /// The range of component `b` is `[1, 29]`. - fn on_trade_multiple_tokens(b: u32) -> Weight { - // Proof Size summary in bytes: - // Measured: `171 + b * (148 ±0)` - // Estimated: `5926` - // Minimum execution time: 9_626_000 picoseconds. - Weight::from_parts(9_727_215, 5926) - // Standard Error: 2_561 - .saturating_add(Weight::from_parts(398_934, 0).saturating_mul(b.into())) - .saturating_add(T::DbWeight::get().reads(1_u64)) - .saturating_add(T::DbWeight::get().writes(1_u64)) - } - /// Storage: `EmaOracle::Accumulator` (r:1 w:1) - /// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(4441), added: 4936, mode: `MaxEncodedLen`) - /// The range of component `b` is `[1, 29]`. - fn on_liquidity_changed_multiple_tokens(b: u32) -> Weight { - // Proof Size summary in bytes: - // Measured: `171 + b * (148 ±0)` - // Estimated: `5926` - // Minimum execution time: 9_684_000 picoseconds. - Weight::from_parts(9_869_189, 5926) - // Standard Error: 2_507 - .saturating_add(Weight::from_parts(395_300, 0).saturating_mul(b.into())) - .saturating_add(T::DbWeight::get().reads(1_u64)) - .saturating_add(T::DbWeight::get().writes(1_u64)) - } - /// Storage: `EmaOracle::Oracles` (r:2 w:0) - /// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`) - fn get_entry() -> Weight { - // Proof Size summary in bytes: - // Measured: `575` - // Estimated: `6294` - // Minimum execution time: 20_401_000 picoseconds. - Weight::from_parts(20_592_000, 6294).saturating_add(T::DbWeight::get().reads(2_u64)) - } -} diff --git a/runtime/basilisk/src/weights/system.rs b/runtime/basilisk/src/weights/frame_system.rs similarity index 50% rename from runtime/basilisk/src/weights/system.rs rename to runtime/basilisk/src/weights/frame_system.rs index 6b444748f33..27cefe21b4a 100644 --- a/runtime/basilisk/src/weights/system.rs +++ b/runtime/basilisk/src/weights/frame_system.rs @@ -15,62 +15,69 @@ // See the License for the specific language governing permissions and // limitations under the License. + //! Autogenerated weights for `frame_system` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-12-06, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// target/release/basilisk +// ./target/release/basilisk // benchmark // pallet -// --chain=dev -// --steps=10 -// --repeat=30 // --wasm-execution=compiled -// --heap-pages=4096 +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 // --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=frame-system -// --output=weights-1.1.0/system.rs -// --extrinsic=* +// --json-file +// raw.json +// --output +// weights/ +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] +#![allow(missing_docs)] -use frame_support::{ - traits::Get, - weights::{constants::RocksDbWeight, Weight}, -}; -use sp_std::marker::PhantomData; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; -use frame_system::weights::WeightInfo; +/// Weights for `frame_system`. +pub struct WeightInfo(PhantomData); +/// Weights for `frame_system` using the Basilisk node and recommended hardware. pub struct BasiliskWeight(PhantomData); - -impl WeightInfo for BasiliskWeight { +impl frame_system::WeightInfo for BasiliskWeight { /// The range of component `b` is `[0, 3932160]`. - fn remark(b: u32) -> Weight { + fn remark(b: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 3_616_000 picoseconds. - Weight::from_parts(3_685_000, 0) + // Minimum execution time: 2_290_000 picoseconds. + Weight::from_parts(4_217_175, 0) // Standard Error: 0 - .saturating_add(Weight::from_parts(410, 0).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(217, 0).saturating_mul(b.into())) } /// The range of component `b` is `[0, 3932160]`. - fn remark_with_event(b: u32) -> Weight { + fn remark_with_event(b: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 11_748_000 picoseconds. - Weight::from_parts(11_887_000, 0) - // Standard Error: 2 - .saturating_add(Weight::from_parts(1_408, 0).saturating_mul(b.into())) + // Minimum execution time: 5_611_000 picoseconds. + Weight::from_parts(24_068_250, 0) + // Standard Error: 0 + .saturating_add(Weight::from_parts(1_142, 0).saturating_mul(b.into())) } /// Storage: `System::Digest` (r:1 w:1) /// Proof: `System::Digest` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) @@ -80,8 +87,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `1485` - // Minimum execution time: 6_909_000 picoseconds. - Weight::from_parts(7_056_000, 1485) + // Minimum execution time: 3_690_000 picoseconds. + Weight::from_parts(3_920_000, 1485) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -101,50 +108,83 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `198` // Estimated: `1683` - // Minimum execution time: 118_445_234_000 picoseconds. - Weight::from_parts(121_210_429_000, 1683) + // Minimum execution time: 111_713_366_000 picoseconds. + Weight::from_parts(114_232_690_000, 1683) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } /// Storage: `Skipped::Metadata` (r:0 w:0) /// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`) /// The range of component `i` is `[0, 1000]`. - fn set_storage(i: u32) -> Weight { + fn set_storage(i: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 3_890_000 picoseconds. - Weight::from_parts(4_013_000, 0) - // Standard Error: 4_442 - .saturating_add(Weight::from_parts(944_461, 0).saturating_mul(i.into())) + // Minimum execution time: 2_160_000 picoseconds. + Weight::from_parts(2_340_000, 0) + // Standard Error: 1_638 + .saturating_add(Weight::from_parts(781_946, 0).saturating_mul(i.into())) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into()))) } /// Storage: `Skipped::Metadata` (r:0 w:0) /// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`) /// The range of component `i` is `[0, 1000]`. - fn kill_storage(i: u32) -> Weight { + fn kill_storage(i: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 3_984_000 picoseconds. - Weight::from_parts(4_015_000, 0) - // Standard Error: 1_473 - .saturating_add(Weight::from_parts(634_355, 0).saturating_mul(i.into())) + // Minimum execution time: 2_280_000 picoseconds. + Weight::from_parts(2_350_000, 0) + // Standard Error: 763 + .saturating_add(Weight::from_parts(510_910, 0).saturating_mul(i.into())) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into()))) } /// Storage: `Skipped::Metadata` (r:0 w:0) /// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`) /// The range of component `p` is `[0, 1000]`. - fn kill_prefix(p: u32) -> Weight { + fn kill_prefix(p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `96 + p * (69 ±0)` - // Estimated: `84 + p * (70 ±0)` - // Minimum execution time: 7_026_000 picoseconds. - Weight::from_parts(7_078_000, 84) - // Standard Error: 1_506 - .saturating_add(Weight::from_parts(1_097_197, 0).saturating_mul(p.into())) + // Measured: `130 + p * (69 ±0)` + // Estimated: `120 + p * (70 ±0)` + // Minimum execution time: 4_350_000 picoseconds. + Weight::from_parts(4_490_000, 120) + // Standard Error: 1_080 + .saturating_add(Weight::from_parts(920_441, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into()))) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into()))) .saturating_add(Weight::from_parts(0, 70).saturating_mul(p.into())) } -} + /// Storage: `System::AuthorizedUpgrade` (r:0 w:1) + /// Proof: `System::AuthorizedUpgrade` (`max_values`: Some(1), `max_size`: Some(33), added: 528, mode: `MaxEncodedLen`) + fn authorize_upgrade() -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 8_700_000 picoseconds. + Weight::from_parts(9_320_000, 0) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `System::AuthorizedUpgrade` (r:1 w:1) + /// Proof: `System::AuthorizedUpgrade` (`max_values`: Some(1), `max_size`: Some(33), added: 528, mode: `MaxEncodedLen`) + /// Storage: `ParachainSystem::ValidationData` (r:1 w:0) + /// Proof: `ParachainSystem::ValidationData` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) + /// Storage: `ParachainSystem::UpgradeRestrictionSignal` (r:1 w:0) + /// Proof: `ParachainSystem::UpgradeRestrictionSignal` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) + /// Storage: `ParachainSystem::PendingValidationCode` (r:1 w:1) + /// Proof: `ParachainSystem::PendingValidationCode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) + /// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0) + /// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) + /// Storage: `ParachainSystem::NewValidationCode` (r:0 w:1) + /// Proof: `ParachainSystem::NewValidationCode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) + /// Storage: `ParachainSystem::DidSetValidationCode` (r:0 w:1) + /// Proof: `ParachainSystem::DidSetValidationCode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) + fn apply_authorized_upgrade() -> Weight { + // Proof Size summary in bytes: + // Measured: `220` + // Estimated: `1705` + // Minimum execution time: 115_999_484_000 picoseconds. + Weight::from_parts(118_079_575_000, 1705) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) + } +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/mod.rs b/runtime/basilisk/src/weights/mod.rs index a7ed2c33318..53f8c668108 100644 --- a/runtime/basilisk/src/weights/mod.rs +++ b/runtime/basilisk/src/weights/mod.rs @@ -1,28 +1,34 @@ -pub mod asset_registry; -pub mod balances; -pub mod collator_selection; -pub mod collective; -pub mod currencies; -pub mod democracy; -pub mod duster; -pub mod elections; -pub mod ema_oracle; -pub mod lbp; -pub mod marketplace; -pub mod nft; -pub mod payment; -pub mod route_executor; -pub mod scheduler; -pub mod state_trie; -pub mod system; -pub mod timestamp; -pub mod tips; -pub mod tokens; -pub mod transaction_pause; -pub mod treasury; -pub mod utility; -pub mod vesting; -pub mod xcm; -pub mod xcmp_queue; -pub mod xyk; -pub mod xyk_liquidity_mining; +pub mod cumulus_pallet_parachain_system; +pub mod cumulus_pallet_xcmp_queue; +pub mod frame_system; +pub mod orml_tokens; +pub mod orml_vesting; +pub mod pallet_asset_registry; +pub mod pallet_balances; +pub mod pallet_collator_selection; +pub mod pallet_collective; +pub mod pallet_currencies; +pub mod pallet_democracy; +pub mod pallet_duster; +pub mod pallet_elections_phragmen; +pub mod pallet_ema_oracle; +pub mod pallet_identity; +pub mod pallet_lbp; +pub mod pallet_marketplace; +pub mod pallet_message_queue; +pub mod pallet_multisig; +pub mod pallet_nft; +pub mod pallet_preimage; +pub mod pallet_proxy; +pub mod pallet_route_executor; +pub mod pallet_scheduler; +pub mod pallet_state_trie_migration; +pub mod pallet_timestamp; +pub mod pallet_tips; +pub mod pallet_transaction_multi_payment; +pub mod pallet_transaction_pause; +pub mod pallet_treasury; +pub mod pallet_utility; +pub mod pallet_xcm; +pub mod pallet_xyk; +pub mod pallet_xyk_liquidity_mining; diff --git a/runtime/basilisk/src/weights/tokens.rs b/runtime/basilisk/src/weights/orml_tokens.rs similarity index 82% rename from runtime/basilisk/src/weights/tokens.rs rename to runtime/basilisk/src/weights/orml_tokens.rs index 2eea647dc06..0e879e0898c 100644 --- a/runtime/basilisk/src/weights/tokens.rs +++ b/runtime/basilisk/src/weights/orml_tokens.rs @@ -15,43 +15,50 @@ // See the License for the specific language governing permissions and // limitations under the License. + //! Autogenerated weights for `orml_tokens` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-12-06, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// target/release/basilisk +// ./target/release/basilisk // benchmark // pallet -// --chain=dev -// --steps=10 -// --repeat=30 // --wasm-execution=compiled -// --heap-pages=4096 +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 // --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=orml-tokens -// --output=weights-1.1.0/tokens.rs -// --extrinsic=** +// --json-file +// raw.json +// --output +// weights/ +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] +#![allow(missing_docs)] -use frame_support::{ - traits::Get, - weights::{constants::RocksDbWeight, Weight}, -}; -use sp_std::marker::PhantomData; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; -use orml_tokens::WeightInfo; +/// Weights for `orml_tokens`. +pub struct WeightInfo(PhantomData); +/// Weights for `orml_tokens` using the Basilisk node and recommended hardware. pub struct BasiliskWeight(PhantomData); - -impl WeightInfo for BasiliskWeight { +impl orml_tokens::WeightInfo for BasiliskWeight { /// Storage: `Tokens::Accounts` (r:2 w:2) /// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) /// Storage: `AssetRegistry::Assets` (r:1 w:0) @@ -64,10 +71,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`) fn transfer() -> Weight { // Proof Size summary in bytes: - // Measured: `2106` + // Measured: `2135` // Estimated: `6156` - // Minimum execution time: 87_635_000 picoseconds. - Weight::from_parts(88_923_000, 6156) + // Minimum execution time: 58_701_000 picoseconds. + Weight::from_parts(60_741_000, 6156) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -83,10 +90,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`) fn transfer_all() -> Weight { // Proof Size summary in bytes: - // Measured: `2106` + // Measured: `2135` // Estimated: `6156` - // Minimum execution time: 91_552_000 picoseconds. - Weight::from_parts(92_683_000, 6156) + // Minimum execution time: 62_261_000 picoseconds. + Weight::from_parts(63_620_000, 6156) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -102,10 +109,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`) fn transfer_keep_alive() -> Weight { // Proof Size summary in bytes: - // Measured: `1966` + // Measured: `1995` // Estimated: `6156` - // Minimum execution time: 72_439_000 picoseconds. - Weight::from_parts(72_911_000, 6156) + // Minimum execution time: 48_860_000 picoseconds. + Weight::from_parts(49_881_000, 6156) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -121,10 +128,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`) fn force_transfer() -> Weight { // Proof Size summary in bytes: - // Measured: `2099` + // Measured: `2128` // Estimated: `6196` - // Minimum execution time: 75_225_000 picoseconds. - Weight::from_parts(76_079_000, 6196) + // Minimum execution time: 51_291_000 picoseconds. + Weight::from_parts(52_661_000, 6196) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -142,11 +149,11 @@ impl WeightInfo for BasiliskWeight { /// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`) fn set_balance() -> Weight { // Proof Size summary in bytes: - // Measured: `1897` + // Measured: `1926` // Estimated: `3593` - // Minimum execution time: 64_677_000 picoseconds. - Weight::from_parts(65_382_000, 3593) + // Minimum execution time: 42_550_000 picoseconds. + Weight::from_parts(43_950_000, 3593) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } -} +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/vesting.rs b/runtime/basilisk/src/weights/orml_vesting.rs similarity index 70% rename from runtime/basilisk/src/weights/vesting.rs rename to runtime/basilisk/src/weights/orml_vesting.rs index e2511268bf7..79235058035 100644 --- a/runtime/basilisk/src/weights/vesting.rs +++ b/runtime/basilisk/src/weights/orml_vesting.rs @@ -15,43 +15,50 @@ // See the License for the specific language governing permissions and // limitations under the License. + //! Autogenerated weights for `orml_vesting` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-12-06, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// target/release/basilisk +// ./target/release/basilisk // benchmark // pallet -// --chain=dev -// --steps=10 -// --repeat=30 // --wasm-execution=compiled -// --heap-pages=4096 +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 // --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=orml-vesting -// --output=weights-1.1.0/vesting.rs -// --extrinsic=* +// --json-file +// raw.json +// --output +// weights/ +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] +#![allow(missing_docs)] -use frame_support::{ - traits::Get, - weights::{constants::RocksDbWeight, Weight}, -}; -use sp_std::marker::PhantomData; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; -use orml_vesting::WeightInfo; +/// Weights for `orml_vesting`. +pub struct WeightInfo(PhantomData); +/// Weights for `orml_vesting` using the Basilisk node and recommended hardware. pub struct BasiliskWeight(PhantomData); - -impl WeightInfo for BasiliskWeight { +impl orml_vesting::WeightInfo for BasiliskWeight { /// Storage: `Vesting::VestingSchedules` (r:1 w:1) /// Proof: `Vesting::VestingSchedules` (`max_values`: None, `max_size`: Some(469), added: 2944, mode: `MaxEncodedLen`) /// Storage: `System::Account` (r:2 w:2) @@ -62,10 +69,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`) fn vested_transfer() -> Weight { // Proof Size summary in bytes: - // Measured: `1699` + // Measured: `1661` // Estimated: `6196` - // Minimum execution time: 126_454_000 picoseconds. - Weight::from_parts(127_586_000, 6196) + // Minimum execution time: 80_650_000 picoseconds. + Weight::from_parts(83_291_000, 6196) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -76,14 +83,14 @@ impl WeightInfo for BasiliskWeight { /// Storage: `Balances::Freezes` (r:1 w:0) /// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`) /// The range of component `i` is `[1, 15]`. - fn claim(i: u32) -> Weight { + fn claim(i: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `1840 + i * (18 ±0)` + // Measured: `1802 + i * (18 ±0)` // Estimated: `4764` - // Minimum execution time: 70_242_000 picoseconds. - Weight::from_parts(72_046_048, 4764) - // Standard Error: 8_526 - .saturating_add(Weight::from_parts(113_690, 0).saturating_mul(i.into())) + // Minimum execution time: 44_440_000 picoseconds. + Weight::from_parts(46_242_717, 4764) + // Standard Error: 7_730 + .saturating_add(Weight::from_parts(168_492, 0).saturating_mul(i.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -96,15 +103,15 @@ impl WeightInfo for BasiliskWeight { /// Storage: `Vesting::VestingSchedules` (r:0 w:1) /// Proof: `Vesting::VestingSchedules` (`max_values`: None, `max_size`: Some(469), added: 2944, mode: `MaxEncodedLen`) /// The range of component `i` is `[1, 15]`. - fn update_vesting_schedules(i: u32) -> Weight { + fn update_vesting_schedules(i: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `1492` + // Measured: `1454` // Estimated: `4764` - // Minimum execution time: 60_347_000 picoseconds. - Weight::from_parts(61_015_266, 4764) - // Standard Error: 3_669 - .saturating_add(Weight::from_parts(96_340, 0).saturating_mul(i.into())) + // Minimum execution time: 37_180_000 picoseconds. + Weight::from_parts(38_449_462, 4764) + // Standard Error: 4_718 + .saturating_add(Weight::from_parts(66_299, 0).saturating_mul(i.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } -} +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/asset_registry.rs b/runtime/basilisk/src/weights/pallet_asset_registry.rs similarity index 76% rename from runtime/basilisk/src/weights/asset_registry.rs rename to runtime/basilisk/src/weights/pallet_asset_registry.rs index 7899805e181..8d9fc4d3d25 100644 --- a/runtime/basilisk/src/weights/asset_registry.rs +++ b/runtime/basilisk/src/weights/pallet_asset_registry.rs @@ -15,43 +15,50 @@ // See the License for the specific language governing permissions and // limitations under the License. + //! Autogenerated weights for `pallet_asset_registry` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-12-06, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// target/release/basilisk +// ./target/release/basilisk // benchmark // pallet -// --chain=dev -// --steps=10 -// --repeat=30 // --wasm-execution=compiled -// --heap-pages=4096 +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 // --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=pallet-asset-registry -// --output=weights-1.1.0/asset_registry.rs -// --extrinsic=* +// --json-file +// raw.json +// --output +// weights/ +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] +#![allow(missing_docs)] -use frame_support::{ - traits::Get, - weights::{constants::RocksDbWeight, Weight}, -}; -use sp_std::marker::PhantomData; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; -use pallet_asset_registry::weights::WeightInfo; +/// Weights for `pallet_asset_registry`. +pub struct WeightInfo(PhantomData); +/// Weights for `pallet_asset_registry` using the Basilisk node and recommended hardware. pub struct BasiliskWeight(PhantomData); - -impl WeightInfo for BasiliskWeight { +impl pallet_asset_registry::WeightInfo for BasiliskWeight { /// Storage: `AssetRegistry::AssetIds` (r:1 w:1) /// Proof: `AssetRegistry::AssetIds` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`) /// Storage: `AssetRegistry::NextAssetId` (r:1 w:1) @@ -66,10 +73,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`) fn register() -> Weight { // Proof Size summary in bytes: - // Measured: `305` + // Measured: `338` // Estimated: `4087` - // Minimum execution time: 46_391_000 picoseconds. - Weight::from_parts(47_096_000, 4087) + // Minimum execution time: 28_370_000 picoseconds. + Weight::from_parts(29_210_000, 4087) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(6_u64)) } @@ -79,10 +86,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `AssetRegistry::AssetIds` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`) fn update() -> Weight { // Proof Size summary in bytes: - // Measured: `372` + // Measured: `405` // Estimated: `3552` - // Minimum execution time: 28_884_000 picoseconds. - Weight::from_parts(29_304_000, 3552) + // Minimum execution time: 18_680_000 picoseconds. + Weight::from_parts(19_361_000, 3552) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -92,10 +99,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `AssetRegistry::AssetMetadataMap` (`max_values`: None, `max_size`: Some(46), added: 2521, mode: `MaxEncodedLen`) fn set_metadata() -> Weight { // Proof Size summary in bytes: - // Measured: `300` + // Measured: `333` // Estimated: `3552` - // Minimum execution time: 21_653_000 picoseconds. - Weight::from_parts(21_923_000, 3552) + // Minimum execution time: 13_800_000 picoseconds. + Weight::from_parts(14_220_000, 3552) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -107,11 +114,11 @@ impl WeightInfo for BasiliskWeight { /// Proof: `AssetRegistry::AssetLocations` (`max_values`: None, `max_size`: Some(614), added: 3089, mode: `MaxEncodedLen`) fn set_location() -> Weight { // Proof Size summary in bytes: - // Measured: `274` + // Measured: `307` // Estimated: `4087` - // Minimum execution time: 26_980_000 picoseconds. - Weight::from_parts(27_406_000, 4087) + // Minimum execution time: 18_070_000 picoseconds. + Weight::from_parts(18_691_000, 4087) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } -} +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/balances.rs b/runtime/basilisk/src/weights/pallet_balances.rs similarity index 66% rename from runtime/basilisk/src/weights/balances.rs rename to runtime/basilisk/src/weights/pallet_balances.rs index 5589ea246f9..380f9098e27 100644 --- a/runtime/basilisk/src/weights/balances.rs +++ b/runtime/basilisk/src/weights/pallet_balances.rs @@ -15,51 +15,58 @@ // See the License for the specific language governing permissions and // limitations under the License. + //! Autogenerated weights for `pallet_balances` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-12-06, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// target/release/basilisk +// ./target/release/basilisk // benchmark // pallet -// --chain=dev -// --steps=10 -// --repeat=30 // --wasm-execution=compiled -// --heap-pages=4096 +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 // --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=pallet-balances -// --output=weights-1.1.0/balances.rs -// --extrinsic=* +// --json-file +// raw.json +// --output +// weights/ +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] +#![allow(missing_docs)] -use frame_support::{ - traits::Get, - weights::{constants::RocksDbWeight, Weight}, -}; -use sp_std::marker::PhantomData; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; -use pallet_balances::weights::WeightInfo; +/// Weights for `pallet_balances`. +pub struct WeightInfo(PhantomData); +/// Weights for `pallet_balances` using the Basilisk node and recommended hardware. pub struct BasiliskWeight(PhantomData); - -impl WeightInfo for BasiliskWeight { +impl pallet_balances::WeightInfo for BasiliskWeight { /// Storage: `System::Account` (r:1 w:1) /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn transfer_allow_death() -> Weight { // Proof Size summary in bytes: // Measured: `52` // Estimated: `3593` - // Minimum execution time: 97_341_000 picoseconds. - Weight::from_parts(98_092_000, 3593) + // Minimum execution time: 59_921_000 picoseconds. + Weight::from_parts(61_911_000, 3593) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -69,8 +76,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `52` // Estimated: `3593` - // Minimum execution time: 60_573_000 picoseconds. - Weight::from_parts(61_238_000, 3593) + // Minimum execution time: 40_260_000 picoseconds. + Weight::from_parts(41_070_000, 3593) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -80,8 +87,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `103` // Estimated: `3593` - // Minimum execution time: 23_050_000 picoseconds. - Weight::from_parts(23_439_000, 3593) + // Minimum execution time: 14_120_000 picoseconds. + Weight::from_parts(14_450_000, 3593) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -91,8 +98,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `103` // Estimated: `3593` - // Minimum execution time: 33_216_000 picoseconds. - Weight::from_parts(33_836_000, 3593) + // Minimum execution time: 18_890_000 picoseconds. + Weight::from_parts(19_941_000, 3593) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -102,8 +109,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `155` // Estimated: `6196` - // Minimum execution time: 100_377_000 picoseconds. - Weight::from_parts(100_813_000, 6196) + // Minimum execution time: 62_050_000 picoseconds. + Weight::from_parts(63_100_000, 6196) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -113,8 +120,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `52` // Estimated: `3593` - // Minimum execution time: 74_755_000 picoseconds. - Weight::from_parts(75_577_000, 3593) + // Minimum execution time: 50_600_000 picoseconds. + Weight::from_parts(51_440_000, 3593) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -124,24 +131,34 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `103` // Estimated: `3593` - // Minimum execution time: 26_716_000 picoseconds. - Weight::from_parts(27_432_000, 3593) + // Minimum execution time: 17_370_000 picoseconds. + Weight::from_parts(18_110_000, 3593) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } - /// Storage: `System::Account` (r:1000 w:1000) + /// Storage: `System::Account` (r:999 w:999) /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) /// The range of component `u` is `[1, 1000]`. - fn upgrade_accounts(u: u32) -> Weight { + fn upgrade_accounts(u: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `0 + u * (135 ±0)` // Estimated: `990 + u * (2603 ±0)` - // Minimum execution time: 26_372_000 picoseconds. - Weight::from_parts(26_734_000, 990) - // Standard Error: 19_513 - .saturating_add(Weight::from_parts(19_513_626, 0).saturating_mul(u.into())) + // Minimum execution time: 17_060_000 picoseconds. + Weight::from_parts(17_350_000, 990) + // Standard Error: 10_383 + .saturating_add(Weight::from_parts(14_348_343, 0).saturating_mul(u.into())) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(u.into()))) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(u.into()))) .saturating_add(Weight::from_parts(0, 2603).saturating_mul(u.into())) } -} + /// Storage: `Balances::InactiveIssuance` (r:1 w:0) + /// Proof: `Balances::InactiveIssuance` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`) + fn force_adjust_total_issuance() -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `1501` + // Minimum execution time: 6_110_000 picoseconds. + Weight::from_parts(6_390_000, 1501) + .saturating_add(T::DbWeight::get().reads(1_u64)) + } +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/pallet_collator_selection.rs b/runtime/basilisk/src/weights/pallet_collator_selection.rs new file mode 100644 index 00000000000..ae0858e4524 --- /dev/null +++ b/runtime/basilisk/src/weights/pallet_collator_selection.rs @@ -0,0 +1,283 @@ +// This file is part of Basilisk. + +// Copyright (C) 2020-2023 Intergalactic, Limited (GIB). +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + + +//! Autogenerated weights for `pallet_collator_selection` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` + +// Executed Command: +// ./target/release/basilisk +// benchmark +// pallet +// --wasm-execution=compiled +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 +// --template=.maintain/pallet-weight-template-no-back.hbs +// --json-file +// raw.json +// --output +// weights/ + +#![cfg_attr(rustfmt, rustfmt_skip)] +#![allow(unused_parens)] +#![allow(unused_imports)] +#![allow(missing_docs)] + +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; + +/// Weights for `pallet_collator_selection`. +pub struct WeightInfo(PhantomData); + +/// Weights for `pallet_collator_selection` using the Basilisk node and recommended hardware. +pub struct BasiliskWeight(PhantomData); +impl pallet_collator_selection::WeightInfo for BasiliskWeight { + /// Storage: `Session::NextKeys` (r:50 w:0) + /// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`) + /// Storage: `CollatorSelection::Invulnerables` (r:0 w:1) + /// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`) + /// The range of component `b` is `[1, 50]`. + fn set_invulnerables(b: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `208 + b * (79 ±0)` + // Estimated: `1196 + b * (2554 ±0)` + // Minimum execution time: 12_240_000 picoseconds. + Weight::from_parts(11_347_235, 1196) + // Standard Error: 6_043 + .saturating_add(Weight::from_parts(2_931_655, 0).saturating_mul(b.into())) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(b.into()))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(Weight::from_parts(0, 2554).saturating_mul(b.into())) + } + /// Storage: `Session::NextKeys` (r:1 w:0) + /// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`) + /// Storage: `CollatorSelection::Invulnerables` (r:1 w:1) + /// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`) + /// Storage: `CollatorSelection::CandidateList` (r:1 w:1) + /// Proof: `CollatorSelection::CandidateList` (`max_values`: Some(1), `max_size`: Some(961), added: 1456, mode: `MaxEncodedLen`) + /// Storage: `System::Account` (r:1 w:1) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// The range of component `b` is `[1, 49]`. + /// The range of component `c` is `[1, 19]`. + fn add_invulnerable(b: u32, c: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `870 + b * (40 ±0) + c * (48 ±0)` + // Estimated: `4383 + b * (42 ±0) + c * (44 ±0)` + // Minimum execution time: 38_110_000 picoseconds. + Weight::from_parts(38_314_047, 4383) + // Standard Error: 2_548 + .saturating_add(Weight::from_parts(140_704, 0).saturating_mul(b.into())) + // Standard Error: 6_713 + .saturating_add(Weight::from_parts(26_773, 0).saturating_mul(c.into())) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) + .saturating_add(Weight::from_parts(0, 42).saturating_mul(b.into())) + .saturating_add(Weight::from_parts(0, 44).saturating_mul(c.into())) + } + /// Storage: `CollatorSelection::CandidateList` (r:1 w:0) + /// Proof: `CollatorSelection::CandidateList` (`max_values`: Some(1), `max_size`: Some(961), added: 1456, mode: `MaxEncodedLen`) + /// Storage: `CollatorSelection::Invulnerables` (r:1 w:1) + /// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`) + /// The range of component `b` is `[5, 50]`. + fn remove_invulnerable(b: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `186 + b * (32 ±0)` + // Estimated: `3086` + // Minimum execution time: 11_550_000 picoseconds. + Weight::from_parts(12_594_896, 3086) + // Standard Error: 1_627 + .saturating_add(Weight::from_parts(67_798, 0).saturating_mul(b.into())) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `CollatorSelection::DesiredCandidates` (r:0 w:1) + /// Proof: `CollatorSelection::DesiredCandidates` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) + fn set_desired_candidates() -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 5_050_000 picoseconds. + Weight::from_parts(5_220_000, 0) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `CollatorSelection::CandidacyBond` (r:1 w:1) + /// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`) + /// Storage: `CollatorSelection::CandidateList` (r:1 w:1) + /// Proof: `CollatorSelection::CandidateList` (`max_values`: Some(1), `max_size`: Some(961), added: 1456, mode: `MaxEncodedLen`) + /// Storage: `System::Account` (r:20 w:20) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// Storage: `CollatorSelection::LastAuthoredBlock` (r:0 w:20) + /// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`) + /// The range of component `c` is `[0, 20]`. + /// The range of component `k` is `[0, 20]`. + fn set_candidacy_bond(c: u32, k: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `0 + c * (168 ±0) + k * (119 ±0)` + // Estimated: `3593 + c * (848 ±30) + k * (848 ±30)` + // Minimum execution time: 9_450_000 picoseconds. + Weight::from_parts(9_770_000, 3593) + // Standard Error: 161_573 + .saturating_add(Weight::from_parts(5_432_825, 0).saturating_mul(c.into())) + // Standard Error: 161_573 + .saturating_add(Weight::from_parts(5_209_781, 0).saturating_mul(k.into())) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into()))) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(k.into()))) + .saturating_add(Weight::from_parts(0, 848).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(0, 848).saturating_mul(k.into())) + } + /// Storage: `CollatorSelection::CandidacyBond` (r:1 w:0) + /// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`) + /// Storage: `CollatorSelection::CandidateList` (r:1 w:1) + /// Proof: `CollatorSelection::CandidateList` (`max_values`: Some(1), `max_size`: Some(961), added: 1456, mode: `MaxEncodedLen`) + /// The range of component `c` is `[3, 20]`. + fn update_bond(c: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `396 + c * (47 ±0)` + // Estimated: `2446` + // Minimum execution time: 23_970_000 picoseconds. + Weight::from_parts(25_146_327, 2446) + // Standard Error: 4_873 + .saturating_add(Weight::from_parts(154_276, 0).saturating_mul(c.into())) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `CollatorSelection::CandidateList` (r:1 w:1) + /// Proof: `CollatorSelection::CandidateList` (`max_values`: Some(1), `max_size`: Some(961), added: 1456, mode: `MaxEncodedLen`) + /// Storage: `CollatorSelection::Invulnerables` (r:1 w:0) + /// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`) + /// Storage: `Session::NextKeys` (r:1 w:0) + /// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`) + /// Storage: `CollatorSelection::CandidacyBond` (r:1 w:0) + /// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`) + /// Storage: `CollatorSelection::LastAuthoredBlock` (r:0 w:1) + /// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`) + /// The range of component `c` is `[1, 19]`. + fn register_as_candidate(c: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `617 + c * (61 ±0)` + // Estimated: `4082 + c * (61 ±0)` + // Minimum execution time: 32_280_000 picoseconds. + Weight::from_parts(33_192_934, 4082) + // Standard Error: 7_668 + .saturating_add(Weight::from_parts(400_903, 0).saturating_mul(c.into())) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + .saturating_add(Weight::from_parts(0, 61).saturating_mul(c.into())) + } + /// Storage: `CollatorSelection::Invulnerables` (r:1 w:0) + /// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`) + /// Storage: `CollatorSelection::CandidacyBond` (r:1 w:0) + /// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`) + /// Storage: `Session::NextKeys` (r:1 w:0) + /// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`) + /// Storage: `CollatorSelection::CandidateList` (r:1 w:1) + /// Proof: `CollatorSelection::CandidateList` (`max_values`: Some(1), `max_size`: Some(961), added: 1456, mode: `MaxEncodedLen`) + /// Storage: `System::Account` (r:1 w:1) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// Storage: `CollatorSelection::LastAuthoredBlock` (r:0 w:2) + /// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`) + /// The range of component `c` is `[3, 20]`. + fn take_candidate_slot(c: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `717 + c * (61 ±0)` + // Estimated: `4182 + c * (61 ±0)` + // Minimum execution time: 50_530_000 picoseconds. + Weight::from_parts(52_887_528, 4182) + // Standard Error: 7_318 + .saturating_add(Weight::from_parts(198_882, 0).saturating_mul(c.into())) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) + .saturating_add(Weight::from_parts(0, 61).saturating_mul(c.into())) + } + /// Storage: `CollatorSelection::CandidateList` (r:1 w:1) + /// Proof: `CollatorSelection::CandidateList` (`max_values`: Some(1), `max_size`: Some(961), added: 1456, mode: `MaxEncodedLen`) + /// Storage: `CollatorSelection::Invulnerables` (r:1 w:0) + /// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`) + /// Storage: `CollatorSelection::LastAuthoredBlock` (r:0 w:1) + /// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`) + /// The range of component `c` is `[3, 20]`. + fn leave_intent(c: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `408 + c * (48 ±0)` + // Estimated: `3086` + // Minimum execution time: 28_231_000 picoseconds. + Weight::from_parts(29_751_583, 3086) + // Standard Error: 5_387 + .saturating_add(Weight::from_parts(184_583, 0).saturating_mul(c.into())) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + } + /// Storage: `System::Account` (r:2 w:2) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// Storage: `System::BlockWeight` (r:1 w:1) + /// Proof: `System::BlockWeight` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`) + /// Storage: `CollatorSelection::LastAuthoredBlock` (r:0 w:1) + /// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`) + fn note_author() -> Weight { + // Proof Size summary in bytes: + // Measured: `102` + // Estimated: `6196` + // Minimum execution time: 44_410_000 picoseconds. + Weight::from_parts(45_270_000, 6196) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(4_u64)) + } + /// Storage: `CollatorSelection::CandidateList` (r:1 w:0) + /// Proof: `CollatorSelection::CandidateList` (`max_values`: Some(1), `max_size`: Some(961), added: 1456, mode: `MaxEncodedLen`) + /// Storage: `CollatorSelection::LastAuthoredBlock` (r:20 w:0) + /// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`) + /// Storage: `CollatorSelection::Invulnerables` (r:1 w:0) + /// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`) + /// Storage: `CollatorSelection::DesiredCandidates` (r:1 w:0) + /// Proof: `CollatorSelection::DesiredCandidates` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) + /// Storage: `System::BlockWeight` (r:1 w:1) + /// Proof: `System::BlockWeight` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`) + /// Storage: `System::Account` (r:18 w:18) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// The range of component `r` is `[1, 20]`. + /// The range of component `c` is `[1, 20]`. + fn new_session(r: u32, c: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `391 + c * (98 ±0) + r * (118 ±0)` + // Estimated: `2188621418662104 + c * (2519 ±0) + r * (2571 ±5)` + // Minimum execution time: 19_150_000 picoseconds. + Weight::from_parts(19_770_000, 2188621418662104) + // Standard Error: 271_834 + .saturating_add(Weight::from_parts(12_365_193, 0).saturating_mul(c.into())) + .saturating_add(T::DbWeight::get().reads(5_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into()))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into()))) + .saturating_add(Weight::from_parts(0, 2519).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(0, 2571).saturating_mul(r.into())) + } +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/collective.rs b/runtime/basilisk/src/weights/pallet_collective.rs similarity index 66% rename from runtime/basilisk/src/weights/collective.rs rename to runtime/basilisk/src/weights/pallet_collective.rs index 66e20f44708..5f29c55ee06 100644 --- a/runtime/basilisk/src/weights/collective.rs +++ b/runtime/basilisk/src/weights/pallet_collective.rs @@ -15,43 +15,50 @@ // See the License for the specific language governing permissions and // limitations under the License. + //! Autogenerated weights for `pallet_collective` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-12-06, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// target/release/basilisk +// ./target/release/basilisk // benchmark // pallet -// --chain=dev -// --steps=10 -// --repeat=30 // --wasm-execution=compiled -// --heap-pages=4096 +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 // --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=pallet-collective -// --output=weights-1.1.0/collective.rs -// --extrinsic=* +// --json-file +// raw.json +// --output +// weights/ +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] +#![allow(missing_docs)] -use frame_support::{ - traits::Get, - weights::{constants::RocksDbWeight, Weight}, -}; -use sp_std::marker::PhantomData; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; -use pallet_collective::weights::WeightInfo; +/// Weights for `pallet_collective`. +pub struct WeightInfo(PhantomData); +/// Weights for `pallet_collective` using the Basilisk node and recommended hardware. pub struct BasiliskWeight(PhantomData); - -impl WeightInfo for BasiliskWeight { +impl pallet_collective::WeightInfo for BasiliskWeight { /// Storage: `TechnicalCommittee::Members` (r:1 w:1) /// Proof: `TechnicalCommittee::Members` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) /// Storage: `TechnicalCommittee::Proposals` (r:1 w:0) @@ -63,37 +70,37 @@ impl WeightInfo for BasiliskWeight { /// The range of component `m` is `[0, 10]`. /// The range of component `n` is `[0, 10]`. /// The range of component `p` is `[0, 20]`. - fn set_members(m: u32, _n: u32, p: u32) -> Weight { + fn set_members(m: u32, _n: u32, p: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `0 + m * (672 ±0) + p * (310 ±0)` - // Estimated: `7085 + m * (396 ±7) + p * (2539 ±3)` - // Minimum execution time: 14_131_000 picoseconds. - Weight::from_parts(14_533_000, 7085) - // Standard Error: 152_332 - .saturating_add(Weight::from_parts(2_671_121, 0).saturating_mul(m.into())) - // Standard Error: 76_518 - .saturating_add(Weight::from_parts(4_088_462, 0).saturating_mul(p.into())) + // Estimated: `4294 + m * (398 ±4) + p * (2602 ±2)` + // Minimum execution time: 8_220_000 picoseconds. + Weight::from_parts(8_950_000, 4294) + // Standard Error: 106_091 + .saturating_add(Weight::from_parts(3_329_157, 0).saturating_mul(m.into())) + // Standard Error: 53_649 + .saturating_add(Weight::from_parts(3_273_244, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into()))) .saturating_add(T::DbWeight::get().writes(2_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into()))) - .saturating_add(Weight::from_parts(0, 396).saturating_mul(m.into())) - .saturating_add(Weight::from_parts(0, 2539).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 398).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 2602).saturating_mul(p.into())) } /// Storage: `TechnicalCommittee::Members` (r:1 w:0) /// Proof: `TechnicalCommittee::Members` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) /// The range of component `b` is `[2, 1024]`. /// The range of component `m` is `[1, 10]`. - fn execute(b: u32, m: u32) -> Weight { + fn execute(b: u32, m: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `70 + m * (32 ±0)` - // Estimated: `1555 + m * (32 ±0)` - // Minimum execution time: 21_477_000 picoseconds. - Weight::from_parts(21_571_584, 1555) - // Standard Error: 27 - .saturating_add(Weight::from_parts(1_340, 0).saturating_mul(b.into())) - // Standard Error: 3_076 - .saturating_add(Weight::from_parts(28_991, 0).saturating_mul(m.into())) + // Estimated: `1554 + m * (32 ±0)` + // Minimum execution time: 12_711_000 picoseconds. + Weight::from_parts(10_419_199, 1554) + // Standard Error: 267 + .saturating_add(Weight::from_parts(3_359, 0).saturating_mul(b.into())) + // Standard Error: 28_537 + .saturating_add(Weight::from_parts(266_703, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into())) } @@ -103,16 +110,12 @@ impl WeightInfo for BasiliskWeight { /// Proof: `TechnicalCommittee::ProposalOf` (`max_values`: None, `max_size`: None, mode: `Measured`) /// The range of component `b` is `[2, 1024]`. /// The range of component `m` is `[1, 10]`. - fn propose_execute(b: u32, m: u32) -> Weight { + fn propose_execute(_b: u32, m: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `70 + m * (32 ±0)` - // Estimated: `3535 + m * (32 ±0)` - // Minimum execution time: 25_333_000 picoseconds. - Weight::from_parts(25_044_584, 3535) - // Standard Error: 60 - .saturating_add(Weight::from_parts(1_891, 0).saturating_mul(b.into())) - // Standard Error: 6_890 - .saturating_add(Weight::from_parts(71_568, 0).saturating_mul(m.into())) + // Estimated: `3534 + m * (32 ±0)` + // Minimum execution time: 15_620_000 picoseconds. + Weight::from_parts(20_815_556, 3534) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into())) } @@ -129,21 +132,21 @@ impl WeightInfo for BasiliskWeight { /// The range of component `b` is `[2, 1024]`. /// The range of component `m` is `[2, 10]`. /// The range of component `p` is `[1, 20]`. - fn propose_proposed(b: u32, m: u32, p: u32) -> Weight { + fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `128 + m * (32 ±0) + p * (52 ±0)` - // Estimated: `3529 + m * (36 ±0) + p * (54 ±0)` - // Minimum execution time: 33_376_000 picoseconds. - Weight::from_parts(33_502_707, 3529) - // Standard Error: 106 - .saturating_add(Weight::from_parts(1_928, 0).saturating_mul(b.into())) - // Standard Error: 12_618 - .saturating_add(Weight::from_parts(29_934, 0).saturating_mul(m.into())) - // Standard Error: 5_629 - .saturating_add(Weight::from_parts(335_390, 0).saturating_mul(p.into())) + // Measured: `60 + m * (32 ±0) + p * (55 ±0)` + // Estimated: `3486 + m * (38 ±0) + p * (54 ±0)` + // Minimum execution time: 19_770_000 picoseconds. + Weight::from_parts(17_760_614, 3486) + // Standard Error: 139 + .saturating_add(Weight::from_parts(2_808, 0).saturating_mul(b.into())) + // Standard Error: 16_461 + .saturating_add(Weight::from_parts(122_243, 0).saturating_mul(m.into())) + // Standard Error: 7_251 + .saturating_add(Weight::from_parts(388_188, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) - .saturating_add(Weight::from_parts(0, 36).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 38).saturating_mul(m.into())) .saturating_add(Weight::from_parts(0, 54).saturating_mul(p.into())) } /// Storage: `TechnicalCommittee::Members` (r:1 w:0) @@ -151,14 +154,14 @@ impl WeightInfo for BasiliskWeight { /// Storage: `TechnicalCommittee::Voting` (r:1 w:1) /// Proof: `TechnicalCommittee::Voting` (`max_values`: None, `max_size`: None, mode: `Measured`) /// The range of component `m` is `[5, 10]`. - fn vote(m: u32) -> Weight { + fn vote(m: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `610 + m * (64 ±0)` // Estimated: `4075 + m * (64 ±0)` - // Minimum execution time: 26_938_000 picoseconds. - Weight::from_parts(27_018_173, 4075) - // Standard Error: 6_530 - .saturating_add(Weight::from_parts(72_199, 0).saturating_mul(m.into())) + // Minimum execution time: 17_581_000 picoseconds. + Weight::from_parts(17_993_943, 4075) + // Standard Error: 39_176 + .saturating_add(Weight::from_parts(204_075, 0).saturating_mul(m.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) .saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into())) @@ -173,16 +176,16 @@ impl WeightInfo for BasiliskWeight { /// Proof: `TechnicalCommittee::ProposalOf` (`max_values`: None, `max_size`: None, mode: `Measured`) /// The range of component `m` is `[4, 10]`. /// The range of component `p` is `[1, 20]`. - fn close_early_disapproved(m: u32, p: u32) -> Weight { + fn close_early_disapproved(m: u32, p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `164 + m * (64 ±0) + p * (55 ±0)` - // Estimated: `3623 + m * (66 ±0) + p * (55 ±0)` - // Minimum execution time: 34_392_000 picoseconds. - Weight::from_parts(34_795_912, 3623) - // Standard Error: 13_268 - .saturating_add(Weight::from_parts(67_179, 0).saturating_mul(m.into())) - // Standard Error: 4_357 - .saturating_add(Weight::from_parts(290_784, 0).saturating_mul(p.into())) + // Measured: `155 + m * (64 ±0) + p * (55 ±0)` + // Estimated: `3620 + m * (66 ±0) + p * (55 ±0)` + // Minimum execution time: 20_720_000 picoseconds. + Weight::from_parts(17_014_196, 3620) + // Standard Error: 42_807 + .saturating_add(Weight::from_parts(438_103, 0).saturating_mul(m.into())) + // Standard Error: 14_423 + .saturating_add(Weight::from_parts(401_740, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) .saturating_add(Weight::from_parts(0, 66).saturating_mul(m.into())) @@ -199,21 +202,21 @@ impl WeightInfo for BasiliskWeight { /// The range of component `b` is `[2, 1024]`. /// The range of component `m` is `[4, 10]`. /// The range of component `p` is `[1, 20]`. - fn close_early_approved(b: u32, m: u32, p: u32) -> Weight { + fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `66 + b * (1 ±0) + m * (64 ±0) + p * (79 ±0)` - // Estimated: `3612 + b * (1 ±0) + m * (59 ±1) + p * (76 ±0)` - // Minimum execution time: 50_177_000 picoseconds. - Weight::from_parts(50_853_069, 3612) - // Standard Error: 196 - .saturating_add(Weight::from_parts(3_771, 0).saturating_mul(b.into())) - // Standard Error: 10_427 - .saturating_add(Weight::from_parts(530_034, 0).saturating_mul(p.into())) + // Measured: `100 + b * (1 ±0) + m * (64 ±0) + p * (78 ±0)` + // Estimated: `3694 + b * (1 ±0) + m * (55 ±1) + p * (74 ±0)` + // Minimum execution time: 31_740_000 picoseconds. + Weight::from_parts(52_694_575, 3694) + // Standard Error: 971 + .saturating_add(Weight::from_parts(913, 0).saturating_mul(b.into())) + // Standard Error: 50_680 + .saturating_add(Weight::from_parts(806_127, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) .saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into())) - .saturating_add(Weight::from_parts(0, 59).saturating_mul(m.into())) - .saturating_add(Weight::from_parts(0, 76).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 55).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 74).saturating_mul(p.into())) } /// Storage: `TechnicalCommittee::Voting` (r:1 w:1) /// Proof: `TechnicalCommittee::Voting` (`max_values`: None, `max_size`: None, mode: `Measured`) @@ -227,16 +230,14 @@ impl WeightInfo for BasiliskWeight { /// Proof: `TechnicalCommittee::ProposalOf` (`max_values`: None, `max_size`: None, mode: `Measured`) /// The range of component `m` is `[4, 10]`. /// The range of component `p` is `[1, 20]`. - fn close_disapproved(m: u32, p: u32) -> Weight { + fn close_disapproved(m: u32, p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `184 + m * (64 ±0) + p * (55 ±0)` - // Estimated: `3643 + m * (66 ±0) + p * (55 ±0)` - // Minimum execution time: 37_715_000 picoseconds. - Weight::from_parts(38_659_831, 3643) - // Standard Error: 13_755 - .saturating_add(Weight::from_parts(37_343, 0).saturating_mul(m.into())) - // Standard Error: 4_516 - .saturating_add(Weight::from_parts(283_261, 0).saturating_mul(p.into())) + // Measured: `175 + m * (64 ±0) + p * (55 ±0)` + // Estimated: `3640 + m * (66 ±0) + p * (55 ±0)` + // Minimum execution time: 22_400_000 picoseconds. + Weight::from_parts(24_979_147, 3640) + // Standard Error: 7_281 + .saturating_add(Weight::from_parts(249_986, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) .saturating_add(Weight::from_parts(0, 66).saturating_mul(m.into())) @@ -255,21 +256,21 @@ impl WeightInfo for BasiliskWeight { /// The range of component `b` is `[2, 1024]`. /// The range of component `m` is `[4, 10]`. /// The range of component `p` is `[1, 20]`. - fn close_approved(b: u32, m: u32, p: u32) -> Weight { + fn close_approved(b: u32, m: u32, p: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `86 + b * (1 ±0) + m * (64 ±0) + p * (79 ±0)` - // Estimated: `3632 + b * (1 ±0) + m * (59 ±1) + p * (76 ±0)` - // Minimum execution time: 54_060_000 picoseconds. - Weight::from_parts(54_211_560, 3632) - // Standard Error: 216 - .saturating_add(Weight::from_parts(3_907, 0).saturating_mul(b.into())) - // Standard Error: 11_493 - .saturating_add(Weight::from_parts(539_109, 0).saturating_mul(p.into())) + // Measured: `120 + b * (1 ±0) + m * (64 ±0) + p * (78 ±0)` + // Estimated: `3714 + b * (1 ±0) + m * (55 ±1) + p * (74 ±0)` + // Minimum execution time: 32_150_000 picoseconds. + Weight::from_parts(36_703_791, 3714) + // Standard Error: 246 + .saturating_add(Weight::from_parts(2_184, 0).saturating_mul(b.into())) + // Standard Error: 12_844 + .saturating_add(Weight::from_parts(443_652, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) .saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into())) - .saturating_add(Weight::from_parts(0, 59).saturating_mul(m.into())) - .saturating_add(Weight::from_parts(0, 76).saturating_mul(p.into())) + .saturating_add(Weight::from_parts(0, 55).saturating_mul(m.into())) + .saturating_add(Weight::from_parts(0, 74).saturating_mul(p.into())) } /// Storage: `TechnicalCommittee::Proposals` (r:1 w:1) /// Proof: `TechnicalCommittee::Proposals` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) @@ -278,16 +279,16 @@ impl WeightInfo for BasiliskWeight { /// Storage: `TechnicalCommittee::ProposalOf` (r:0 w:1) /// Proof: `TechnicalCommittee::ProposalOf` (`max_values`: None, `max_size`: None, mode: `Measured`) /// The range of component `p` is `[1, 20]`. - fn disapprove_proposal(p: u32) -> Weight { + fn disapprove_proposal(p: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `226 + p * (32 ±0)` // Estimated: `1711 + p * (32 ±0)` - // Minimum execution time: 22_209_000 picoseconds. - Weight::from_parts(22_780_540, 1711) - // Standard Error: 3_594 - .saturating_add(Weight::from_parts(225_594, 0).saturating_mul(p.into())) + // Minimum execution time: 12_991_000 picoseconds. + Weight::from_parts(14_288_347, 1711) + // Standard Error: 7_349 + .saturating_add(Weight::from_parts(223_289, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) .saturating_add(Weight::from_parts(0, 32).saturating_mul(p.into())) } -} +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/currencies.rs b/runtime/basilisk/src/weights/pallet_currencies.rs similarity index 76% rename from runtime/basilisk/src/weights/currencies.rs rename to runtime/basilisk/src/weights/pallet_currencies.rs index 5a31bbbddea..47daa6fc555 100644 --- a/runtime/basilisk/src/weights/currencies.rs +++ b/runtime/basilisk/src/weights/pallet_currencies.rs @@ -15,43 +15,50 @@ // See the License for the specific language governing permissions and // limitations under the License. + //! Autogenerated weights for `pallet_currencies` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-12-06, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// target/release/basilisk +// ./target/release/basilisk // benchmark // pallet -// --chain=dev -// --steps=10 -// --repeat=30 // --wasm-execution=compiled -// --heap-pages=4096 +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 // --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=pallet-currencies -// --output=weights-1.1.0/currencies.rs -// --extrinsic=* +// --json-file +// raw.json +// --output +// weights/ +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] +#![allow(missing_docs)] -use frame_support::{ - traits::Get, - weights::{constants::RocksDbWeight, Weight}, -}; -use sp_std::marker::PhantomData; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; -use pallet_currencies::WeightInfo; +/// Weights for `pallet_currencies`. +pub struct WeightInfo(PhantomData); +/// Weights for `pallet_currencies` using the Basilisk node and recommended hardware. pub struct BasiliskWeight(PhantomData); - -impl WeightInfo for BasiliskWeight { +impl pallet_currencies::WeightInfo for BasiliskWeight { /// Storage: `Tokens::Accounts` (r:2 w:2) /// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) /// Storage: `AssetRegistry::Assets` (r:1 w:0) @@ -64,10 +71,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`) fn transfer_non_native_currency() -> Weight { // Proof Size summary in bytes: - // Measured: `2106` + // Measured: `2135` // Estimated: `6156` - // Minimum execution time: 95_273_000 picoseconds. - Weight::from_parts(95_988_000, 6156) + // Minimum execution time: 63_010_000 picoseconds. + Weight::from_parts(65_450_000, 6156) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -75,10 +82,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn transfer_native_currency() -> Weight { // Proof Size summary in bytes: - // Measured: `1444` + // Measured: `1406` // Estimated: `3593` - // Minimum execution time: 92_596_000 picoseconds. - Weight::from_parts(93_466_000, 3593) + // Minimum execution time: 61_321_000 picoseconds. + Weight::from_parts(62_271_000, 3593) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -96,10 +103,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`) fn update_balance_non_native_currency() -> Weight { // Proof Size summary in bytes: - // Measured: `1897` + // Measured: `1926` // Estimated: `3593` - // Minimum execution time: 71_703_000 picoseconds. - Weight::from_parts(72_244_000, 3593) + // Minimum execution time: 44_320_000 picoseconds. + Weight::from_parts(45_950_000, 3593) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -107,10 +114,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn update_balance_native_currency_creating() -> Weight { // Proof Size summary in bytes: - // Measured: `1304` + // Measured: `1266` // Estimated: `3593` - // Minimum execution time: 53_642_000 picoseconds. - Weight::from_parts(54_216_000, 3593) + // Minimum execution time: 31_010_000 picoseconds. + Weight::from_parts(31_781_000, 3593) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -118,11 +125,11 @@ impl WeightInfo for BasiliskWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn update_balance_native_currency_killing() -> Weight { // Proof Size summary in bytes: - // Measured: `1440` + // Measured: `1402` // Estimated: `3593` - // Minimum execution time: 53_388_000 picoseconds. - Weight::from_parts(53_917_000, 3593) + // Minimum execution time: 32_190_000 picoseconds. + Weight::from_parts(33_370_000, 3593) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } -} +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/democracy.rs b/runtime/basilisk/src/weights/pallet_democracy.rs similarity index 79% rename from runtime/basilisk/src/weights/democracy.rs rename to runtime/basilisk/src/weights/pallet_democracy.rs index 1aef2c4c17b..4ed4fd08a5f 100644 --- a/runtime/basilisk/src/weights/democracy.rs +++ b/runtime/basilisk/src/weights/pallet_democracy.rs @@ -15,43 +15,50 @@ // See the License for the specific language governing permissions and // limitations under the License. + //! Autogenerated weights for `pallet_democracy` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-12-06, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// target/release/basilisk +// ./target/release/basilisk // benchmark // pallet -// --chain=dev -// --steps=10 -// --repeat=30 // --wasm-execution=compiled -// --heap-pages=4096 +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 // --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=pallet-democracy -// --output=democracy.rs -// --extrinsic=* +// --json-file +// raw.json +// --output +// weights/ +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] +#![allow(missing_docs)] -use frame_support::{ - traits::Get, - weights::{constants::RocksDbWeight, Weight}, -}; -use sp_std::marker::PhantomData; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; -use pallet_democracy::weights::WeightInfo; +/// Weights for `pallet_democracy`. +pub struct WeightInfo(PhantomData); +/// Weights for `pallet_democracy` using the Basilisk node and recommended hardware. pub struct BasiliskWeight(PhantomData); - -impl WeightInfo for BasiliskWeight { +impl pallet_democracy::WeightInfo for BasiliskWeight { /// Storage: `Democracy::PublicPropCount` (r:1 w:1) /// Proof: `Democracy::PublicPropCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) /// Storage: `Democracy::PublicProps` (r:1 w:1) @@ -64,8 +71,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `4688` // Estimated: `18187` - // Minimum execution time: 52_114_000 picoseconds. - Weight::from_parts(52_489_000, 18187) + // Minimum execution time: 35_370_000 picoseconds. + Weight::from_parts(37_570_000, 18187) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -75,8 +82,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `3443` // Estimated: `6695` - // Minimum execution time: 45_776_000 picoseconds. - Weight::from_parts(46_532_000, 6695) + // Minimum execution time: 31_831_000 picoseconds. + Weight::from_parts(34_121_000, 6695) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -92,8 +99,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `3388` // Estimated: `7260` - // Minimum execution time: 59_494_000 picoseconds. - Weight::from_parts(60_347_000, 7260) + // Minimum execution time: 46_231_000 picoseconds. + Weight::from_parts(48_061_000, 7260) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -109,8 +116,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `3410` // Estimated: `7260` - // Minimum execution time: 66_633_000 picoseconds. - Weight::from_parts(66_980_000, 7260) + // Minimum execution time: 48_651_000 picoseconds. + Weight::from_parts(50_141_000, 7260) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -124,8 +131,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `249` // Estimated: `3666` - // Minimum execution time: 35_212_000 picoseconds. - Weight::from_parts(35_695_000, 3666) + // Minimum execution time: 21_080_000 picoseconds. + Weight::from_parts(21_790_000, 3666) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -147,8 +154,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `5819` // Estimated: `18187` - // Minimum execution time: 128_837_000 picoseconds. - Weight::from_parts(129_578_000, 18187) + // Minimum execution time: 89_581_000 picoseconds. + Weight::from_parts(92_121_000, 18187) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().writes(7_u64)) } @@ -160,8 +167,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `3276` // Estimated: `6703` - // Minimum execution time: 16_235_000 picoseconds. - Weight::from_parts(16_657_000, 6703) + // Minimum execution time: 9_580_000 picoseconds. + Weight::from_parts(9_911_000, 6703) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -171,8 +178,9 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 5_641_000 picoseconds. - Weight::from_parts(5_763_000, 0).saturating_add(T::DbWeight::get().writes(1_u64)) + // Minimum execution time: 2_850_000 picoseconds. + Weight::from_parts(2_990_000, 0) + .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: `Democracy::NextExternal` (r:0 w:1) /// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`) @@ -180,8 +188,9 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 5_600_000 picoseconds. - Weight::from_parts(5_786_000, 0).saturating_add(T::DbWeight::get().writes(1_u64)) + // Minimum execution time: 2_920_000 picoseconds. + Weight::from_parts(3_091_000, 0) + .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: `Democracy::NextExternal` (r:1 w:1) /// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`) @@ -195,8 +204,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `147` // Estimated: `3518` - // Minimum execution time: 35_335_000 picoseconds. - Weight::from_parts(35_694_000, 3518) + // Minimum execution time: 19_721_000 picoseconds. + Weight::from_parts(20_160_000, 3518) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -210,8 +219,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `3377` // Estimated: `6703` - // Minimum execution time: 36_757_000 picoseconds. - Weight::from_parts(37_171_000, 6703) + // Minimum execution time: 21_930_000 picoseconds. + Weight::from_parts(22_731_000, 6703) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -227,8 +236,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `5704` // Estimated: `18187` - // Minimum execution time: 100_500_000 picoseconds. - Weight::from_parts(101_121_000, 18187) + // Minimum execution time: 71_080_000 picoseconds. + Weight::from_parts(72_180_000, 18187) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -240,8 +249,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `181` // Estimated: `3518` - // Minimum execution time: 27_472_000 picoseconds. - Weight::from_parts(27_813_000, 3518) + // Minimum execution time: 15_530_000 picoseconds. + Weight::from_parts(16_220_000, 3518) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -252,14 +261,14 @@ impl WeightInfo for BasiliskWeight { /// Storage: `Democracy::ReferendumInfoOf` (r:99 w:0) /// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`) /// The range of component `r` is `[0, 99]`. - fn on_initialize_base(r: u32) -> Weight { + fn on_initialize_base(r: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `125 + r * (86 ±0)` + // Measured: `127 + r * (86 ±0)` // Estimated: `1489 + r * (2676 ±0)` - // Minimum execution time: 7_324_000 picoseconds. - Weight::from_parts(10_018_029, 1489) - // Standard Error: 7_493 - .saturating_add(Weight::from_parts(3_483_961, 0).saturating_mul(r.into())) + // Minimum execution time: 3_810_000 picoseconds. + Weight::from_parts(6_007_042, 1489) + // Standard Error: 5_405 + .saturating_add(Weight::from_parts(2_997_448, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(1_u64)) @@ -278,14 +287,14 @@ impl WeightInfo for BasiliskWeight { /// Storage: `Democracy::ReferendumInfoOf` (r:99 w:0) /// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`) /// The range of component `r` is `[0, 99]`. - fn on_initialize_base_with_launch_period(r: u32) -> Weight { + fn on_initialize_base_with_launch_period(r: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `125 + r * (86 ±0)` + // Measured: `127 + r * (86 ±0)` // Estimated: `18187 + r * (2676 ±0)` - // Minimum execution time: 11_931_000 picoseconds. - Weight::from_parts(14_585_511, 18187) - // Standard Error: 9_076 - .saturating_add(Weight::from_parts(3_497_355, 0).saturating_mul(r.into())) + // Minimum execution time: 6_360_000 picoseconds. + Weight::from_parts(8_746_416, 18187) + // Standard Error: 6_198 + .saturating_add(Weight::from_parts(3_027_914, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(1_u64)) @@ -300,14 +309,14 @@ impl WeightInfo for BasiliskWeight { /// Storage: `Balances::Freezes` (r:1 w:0) /// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`) /// The range of component `r` is `[0, 99]`. - fn delegate(r: u32) -> Weight { + fn delegate(r: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `748 + r * (108 ±0)` // Estimated: `19800 + r * (2676 ±0)` - // Minimum execution time: 52_854_000 picoseconds. - Weight::from_parts(54_745_296, 19800) - // Standard Error: 11_445 - .saturating_add(Weight::from_parts(4_550_546, 0).saturating_mul(r.into())) + // Minimum execution time: 35_420_000 picoseconds. + Weight::from_parts(38_413_028, 19800) + // Standard Error: 9_014 + .saturating_add(Weight::from_parts(3_836_274, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(4_u64)) @@ -319,14 +328,14 @@ impl WeightInfo for BasiliskWeight { /// Storage: `Democracy::ReferendumInfoOf` (r:99 w:99) /// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`) /// The range of component `r` is `[0, 99]`. - fn undelegate(r: u32) -> Weight { + fn undelegate(r: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `373 + r * (108 ±0)` + // Measured: `374 + r * (108 ±0)` // Estimated: `13530 + r * (2676 ±0)` - // Minimum execution time: 25_365_000 picoseconds. - Weight::from_parts(22_654_244, 13530) - // Standard Error: 20_918 - .saturating_add(Weight::from_parts(4_586_941, 0).saturating_mul(r.into())) + // Minimum execution time: 15_800_000 picoseconds. + Weight::from_parts(16_158_605, 13530) + // Standard Error: 8_209 + .saturating_add(Weight::from_parts(3_748_780, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into()))) .saturating_add(T::DbWeight::get().writes(2_u64)) @@ -339,8 +348,9 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 5_687_000 picoseconds. - Weight::from_parts(5_836_000, 0).saturating_add(T::DbWeight::get().writes(1_u64)) + // Minimum execution time: 2_950_000 picoseconds. + Weight::from_parts(3_140_000, 0) + .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: `Democracy::VotingOf` (r:1 w:1) /// Proof: `Democracy::VotingOf` (`max_values`: None, `max_size`: Some(3795), added: 6270, mode: `MaxEncodedLen`) @@ -351,14 +361,14 @@ impl WeightInfo for BasiliskWeight { /// Storage: `System::Account` (r:1 w:1) /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) /// The range of component `r` is `[0, 99]`. - fn unlock_remove(r: u32) -> Weight { + fn unlock_remove(r: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `504` // Estimated: `7260` - // Minimum execution time: 31_996_000 picoseconds. - Weight::from_parts(43_490_743, 7260) - // Standard Error: 11_023 - .saturating_add(Weight::from_parts(105_337, 0).saturating_mul(r.into())) + // Minimum execution time: 21_560_000 picoseconds. + Weight::from_parts(32_238_851, 7260) + // Standard Error: 2_698 + .saturating_add(Weight::from_parts(63_805, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -371,14 +381,14 @@ impl WeightInfo for BasiliskWeight { /// Storage: `System::Account` (r:1 w:1) /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) /// The range of component `r` is `[0, 99]`. - fn unlock_set(r: u32) -> Weight { + fn unlock_set(r: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `504 + r * (22 ±0)` + // Measured: `505 + r * (22 ±0)` // Estimated: `7260` - // Minimum execution time: 45_808_000 picoseconds. - Weight::from_parts(46_797_619, 7260) - // Standard Error: 1_606 - .saturating_add(Weight::from_parts(45_847, 0).saturating_mul(r.into())) + // Minimum execution time: 29_550_000 picoseconds. + Weight::from_parts(31_814_574, 7260) + // Standard Error: 2_240 + .saturating_add(Weight::from_parts(90_749, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -387,14 +397,14 @@ impl WeightInfo for BasiliskWeight { /// Storage: `Democracy::VotingOf` (r:1 w:1) /// Proof: `Democracy::VotingOf` (`max_values`: None, `max_size`: Some(3795), added: 6270, mode: `MaxEncodedLen`) /// The range of component `r` is `[1, 100]`. - fn remove_vote(r: u32) -> Weight { + fn remove_vote(r: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `644 + r * (25 ±0)` + // Measured: `609 + r * (26 ±0)` // Estimated: `7260` - // Minimum execution time: 18_965_000 picoseconds. - Weight::from_parts(21_382_331, 7260) - // Standard Error: 2_463 - .saturating_add(Weight::from_parts(65_052, 0).saturating_mul(r.into())) + // Minimum execution time: 13_471_000 picoseconds. + Weight::from_parts(16_249_036, 7260) + // Standard Error: 1_159 + .saturating_add(Weight::from_parts(81_434, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -403,14 +413,14 @@ impl WeightInfo for BasiliskWeight { /// Storage: `Democracy::VotingOf` (r:1 w:1) /// Proof: `Democracy::VotingOf` (`max_values`: None, `max_size`: Some(3795), added: 6270, mode: `MaxEncodedLen`) /// The range of component `r` is `[1, 100]`. - fn remove_other_vote(r: u32) -> Weight { + fn remove_other_vote(r: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `644 + r * (25 ±0)` + // Measured: `609 + r * (26 ±0)` // Estimated: `7260` - // Minimum execution time: 19_147_000 picoseconds. - Weight::from_parts(21_637_991, 7260) - // Standard Error: 2_623 - .saturating_add(Weight::from_parts(66_432, 0).saturating_mul(r.into())) + // Minimum execution time: 13_590_000 picoseconds. + Weight::from_parts(16_651_895, 7260) + // Standard Error: 1_323 + .saturating_add(Weight::from_parts(78_776, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -418,15 +428,17 @@ impl WeightInfo for BasiliskWeight { /// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`) /// Storage: `Preimage::StatusFor` (r:1 w:0) /// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + /// Storage: `Preimage::RequestStatusFor` (r:1 w:0) + /// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) /// Storage: `Democracy::MetadataOf` (r:0 w:1) /// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`) fn set_external_metadata() -> Weight { // Proof Size summary in bytes: // Measured: `287` // Estimated: `3556` - // Minimum execution time: 23_679_000 picoseconds. - Weight::from_parts(24_310_000, 3556) - .saturating_add(T::DbWeight::get().reads(2_u64)) + // Minimum execution time: 16_410_000 picoseconds. + Weight::from_parts(16_910_000, 3556) + .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: `Democracy::NextExternal` (r:1 w:0) @@ -437,8 +449,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `147` // Estimated: `3518` - // Minimum execution time: 21_263_000 picoseconds. - Weight::from_parts(21_643_000, 3518) + // Minimum execution time: 12_860_000 picoseconds. + Weight::from_parts(13_241_000, 3518) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -446,15 +458,17 @@ impl WeightInfo for BasiliskWeight { /// Proof: `Democracy::PublicProps` (`max_values`: Some(1), `max_size`: Some(16702), added: 17197, mode: `MaxEncodedLen`) /// Storage: `Preimage::StatusFor` (r:1 w:0) /// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + /// Storage: `Preimage::RequestStatusFor` (r:1 w:0) + /// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) /// Storage: `Democracy::MetadataOf` (r:0 w:1) /// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`) fn set_proposal_metadata() -> Weight { // Proof Size summary in bytes: // Measured: `4842` // Estimated: `18187` - // Minimum execution time: 48_066_000 picoseconds. - Weight::from_parts(48_647_000, 18187) - .saturating_add(T::DbWeight::get().reads(2_u64)) + // Minimum execution time: 38_660_000 picoseconds. + Weight::from_parts(40_210_000, 18187) + .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: `Democracy::PublicProps` (r:1 w:0) @@ -465,22 +479,24 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `4706` // Estimated: `18187` - // Minimum execution time: 44_044_000 picoseconds. - Weight::from_parts(44_772_000, 18187) + // Minimum execution time: 32_621_000 picoseconds. + Weight::from_parts(34_771_000, 18187) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: `Preimage::StatusFor` (r:1 w:0) /// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + /// Storage: `Preimage::RequestStatusFor` (r:1 w:0) + /// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) /// Storage: `Democracy::MetadataOf` (r:0 w:1) /// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`) fn set_referendum_metadata() -> Weight { // Proof Size summary in bytes: // Measured: `211` // Estimated: `3556` - // Minimum execution time: 20_942_000 picoseconds. - Weight::from_parts(21_152_000, 3556) - .saturating_add(T::DbWeight::get().reads(1_u64)) + // Minimum execution time: 14_570_000 picoseconds. + Weight::from_parts(15_340_000, 3556) + .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: `Democracy::ReferendumInfoOf` (r:1 w:0) @@ -491,9 +507,9 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `159` // Estimated: `3666` - // Minimum execution time: 23_243_000 picoseconds. - Weight::from_parts(23_579_000, 3666) + // Minimum execution time: 14_580_000 picoseconds. + Weight::from_parts(15_040_000, 3666) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } -} +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/duster.rs b/runtime/basilisk/src/weights/pallet_duster.rs similarity index 72% rename from runtime/basilisk/src/weights/duster.rs rename to runtime/basilisk/src/weights/pallet_duster.rs index 3bcba2212b1..e4aba40b9dc 100644 --- a/runtime/basilisk/src/weights/duster.rs +++ b/runtime/basilisk/src/weights/pallet_duster.rs @@ -15,43 +15,50 @@ // See the License for the specific language governing permissions and // limitations under the License. + //! Autogenerated weights for `pallet_duster` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-12-06, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// target/release/basilisk +// ./target/release/basilisk // benchmark // pallet -// --chain=dev -// --steps=10 -// --repeat=30 // --wasm-execution=compiled -// --heap-pages=4096 +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 // --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=pallet-duster -// --output=weights-1.1.0/duster.rs -// --extrinsic=* +// --json-file +// raw.json +// --output +// weights/ +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] +#![allow(missing_docs)] -use frame_support::{ - traits::Get, - weights::{constants::RocksDbWeight, Weight}, -}; -use sp_std::marker::PhantomData; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; -use pallet_duster::weights::WeightInfo; +/// Weights for `pallet_duster`. +pub struct WeightInfo(PhantomData); +/// Weights for `pallet_duster` using the Basilisk node and recommended hardware. pub struct BasiliskWeight(PhantomData); - -impl WeightInfo for BasiliskWeight { +impl pallet_duster::WeightInfo for BasiliskWeight { /// Storage: `Duster::AccountBlacklist` (r:1 w:0) /// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`) /// Storage: `AssetRegistry::Assets` (r:1 w:0) @@ -68,10 +75,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) fn dust_account() -> Weight { // Proof Size summary in bytes: - // Measured: `2389` + // Measured: `2418` // Estimated: `6156` - // Minimum execution time: 90_423_000 picoseconds. - Weight::from_parts(91_336_000, 6156) + // Minimum execution time: 59_241_000 picoseconds. + Weight::from_parts(61_621_000, 6156) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -79,20 +86,21 @@ impl WeightInfo for BasiliskWeight { /// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`) fn add_nondustable_account() -> Weight { // Proof Size summary in bytes: - // Measured: `967` + // Measured: `963` // Estimated: `0` - // Minimum execution time: 21_334_000 picoseconds. - Weight::from_parts(21_802_000, 0).saturating_add(T::DbWeight::get().writes(1_u64)) + // Minimum execution time: 13_220_000 picoseconds. + Weight::from_parts(13_640_000, 0) + .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: `Duster::AccountBlacklist` (r:1 w:1) /// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`) fn remove_nondustable_account() -> Weight { // Proof Size summary in bytes: - // Measured: `1288` + // Measured: `1284` // Estimated: `3513` - // Minimum execution time: 26_321_000 picoseconds. - Weight::from_parts(26_849_000, 3513) + // Minimum execution time: 17_020_000 picoseconds. + Weight::from_parts(17_450_000, 3513) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } -} +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/elections.rs b/runtime/basilisk/src/weights/pallet_elections_phragmen.rs similarity index 77% rename from runtime/basilisk/src/weights/elections.rs rename to runtime/basilisk/src/weights/pallet_elections_phragmen.rs index eecdd6e2160..bd414423ae1 100644 --- a/runtime/basilisk/src/weights/elections.rs +++ b/runtime/basilisk/src/weights/pallet_elections_phragmen.rs @@ -18,38 +18,47 @@ //! Autogenerated weights for `pallet_elections_phragmen` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2024-02-26, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// target/release/basilisk +// ./target/release/basilisk // benchmark // pallet -// --chain=dev -// --steps=10 -// --repeat=30 // --wasm-execution=compiled -// --heap-pages=4096 +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 // --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=pallet-elections-phragmen -// --output=weights-1.1.0/elections.rs -// --extrinsic=* +// --json-file +// raw.json +// --output +// weights/ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] #![allow(missing_docs)] -use frame_support::{traits::Get, weights::Weight}; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; use core::marker::PhantomData; -use pallet_elections_phragmen::WeightInfo; + +/// Weights for `pallet_elections_phragmen`. +pub struct WeightInfo(PhantomData); /// Weights for `pallet_elections_phragmen` using the Basilisk node and recommended hardware. pub struct BasiliskWeight(PhantomData); -impl WeightInfo for BasiliskWeight { +impl pallet_elections_phragmen::WeightInfo for BasiliskWeight { /// Storage: `Elections::Candidates` (r:1 w:0) /// Proof: `Elections::Candidates` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) /// Storage: `Elections::Members` (r:1 w:0) @@ -65,12 +74,12 @@ impl WeightInfo for BasiliskWeight { /// The range of component `v` is `[1, 10]`. fn vote_equal(v: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `472 + v * (80 ±0)` + // Measured: `471 + v * (80 ±0)` // Estimated: `4764 + v * (80 ±0)` - // Minimum execution time: 43_136_000 picoseconds. - Weight::from_parts(43_696_491, 4764) - // Standard Error: 4_226 - .saturating_add(Weight::from_parts(64_143, 0).saturating_mul(v.into())) + // Minimum execution time: 29_730_000 picoseconds. + Weight::from_parts(31_218_012, 4764) + // Standard Error: 6_406 + .saturating_add(Weight::from_parts(87_093, 0).saturating_mul(v.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) .saturating_add(Weight::from_parts(0, 80).saturating_mul(v.into())) @@ -92,10 +101,10 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `441 + v * (80 ±0)` // Estimated: `4764 + v * (80 ±0)` - // Minimum execution time: 59_040_000 picoseconds. - Weight::from_parts(59_382_598, 4764) - // Standard Error: 4_622 - .saturating_add(Weight::from_parts(102_861, 0).saturating_mul(v.into())) + // Minimum execution time: 40_860_000 picoseconds. + Weight::from_parts(42_250_701, 4764) + // Standard Error: 12_760 + .saturating_add(Weight::from_parts(141_034, 0).saturating_mul(v.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) .saturating_add(Weight::from_parts(0, 80).saturating_mul(v.into())) @@ -117,10 +126,10 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `473 + v * (80 ±0)` // Estimated: `4764 + v * (80 ±0)` - // Minimum execution time: 58_817_000 picoseconds. - Weight::from_parts(59_624_831, 4764) - // Standard Error: 5_672 - .saturating_add(Weight::from_parts(67_682, 0).saturating_mul(v.into())) + // Minimum execution time: 40_750_000 picoseconds. + Weight::from_parts(42_060_982, 4764) + // Standard Error: 11_619 + .saturating_add(Weight::from_parts(179_617, 0).saturating_mul(v.into())) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) .saturating_add(Weight::from_parts(0, 80).saturating_mul(v.into())) @@ -135,8 +144,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `803` // Estimated: `4764` - // Minimum execution time: 61_277_000 picoseconds. - Weight::from_parts(62_036_000, 4764) + // Minimum execution time: 41_790_000 picoseconds. + Weight::from_parts(43_580_000, 4764) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -149,12 +158,12 @@ impl WeightInfo for BasiliskWeight { /// The range of component `c` is `[1, 100]`. fn submit_candidacy(c: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `1346 + c * (48 ±0)` - // Estimated: `2831 + c * (48 ±0)` - // Minimum execution time: 42_509_000 picoseconds. - Weight::from_parts(43_368_729, 2831) - // Standard Error: 719 - .saturating_add(Weight::from_parts(56_486, 0).saturating_mul(c.into())) + // Measured: `1347 + c * (48 ±0)` + // Estimated: `2832 + c * (48 ±0)` + // Minimum execution time: 29_930_000 picoseconds. + Weight::from_parts(31_074_762, 2832) + // Standard Error: 1_111 + .saturating_add(Weight::from_parts(65_730, 0).saturating_mul(c.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) .saturating_add(Weight::from_parts(0, 48).saturating_mul(c.into())) @@ -165,11 +174,11 @@ impl WeightInfo for BasiliskWeight { fn renounce_candidacy_candidate(c: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `317 + c * (48 ±0)` - // Estimated: `1795 + c * (48 ±0)` - // Minimum execution time: 38_867_000 picoseconds. - Weight::from_parts(39_751_572, 1795) - // Standard Error: 1_016 - .saturating_add(Weight::from_parts(26_999, 0).saturating_mul(c.into())) + // Estimated: `1794 + c * (48 ±0)` + // Minimum execution time: 26_300_000 picoseconds. + Weight::from_parts(27_977_501, 1794) + // Standard Error: 983 + .saturating_add(Weight::from_parts(36_669, 0).saturating_mul(c.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) .saturating_add(Weight::from_parts(0, 48).saturating_mul(c.into())) @@ -188,8 +197,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `1494` // Estimated: `2979` - // Minimum execution time: 55_052_000 picoseconds. - Weight::from_parts(55_529_000, 2979) + // Minimum execution time: 35_770_000 picoseconds. + Weight::from_parts(37_260_000, 2979) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -199,8 +208,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `957` // Estimated: `2442` - // Minimum execution time: 38_957_000 picoseconds. - Weight::from_parts(39_432_000, 2442) + // Minimum execution time: 26_360_000 picoseconds. + Weight::from_parts(28_110_000, 2442) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -229,12 +238,12 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `1494` // Estimated: `3593` - // Minimum execution time: 78_532_000 picoseconds. - Weight::from_parts(79_151_000, 3593) + // Minimum execution time: 48_770_000 picoseconds. + Weight::from_parts(50_911_000, 3593) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } - /// Storage: `Elections::Voting` (r:769 w:768) + /// Storage: `Elections::Voting` (r:385 w:384) /// Proof: `Elections::Voting` (`max_values`: None, `max_size`: None, mode: `Measured`) /// Storage: `Elections::Members` (r:1 w:0) /// Proof: `Elections::Members` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) @@ -242,26 +251,29 @@ impl WeightInfo for BasiliskWeight { /// Proof: `Elections::RunnersUp` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) /// Storage: `Elections::Candidates` (r:1 w:0) /// Proof: `Elections::Candidates` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `Balances::Locks` (r:768 w:768) + /// Storage: `Balances::Locks` (r:384 w:384) /// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`) - /// Storage: `Balances::Freezes` (r:768 w:0) + /// Storage: `Balances::Freezes` (r:384 w:0) /// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:768 w:768) + /// Storage: `System::Account` (r:384 w:384) /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) /// The range of component `v` is `[384, 768]`. /// The range of component `d` is `[0, 384]`. - fn clean_defunct_voters(v: u32, _d: u32, ) -> Weight { + fn clean_defunct_voters(v: u32, d: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `2801 + v * (618 ±0)` - // Estimated: `6203 + v * (3774 ±0)` - // Minimum execution time: 30_165_011_000 picoseconds. - Weight::from_parts(30_322_012_000, 6203) - // Standard Error: 624_076 - .saturating_add(Weight::from_parts(47_261_830, 0).saturating_mul(v.into())) + // Measured: `0 + d * (631 ±0) + v * (56 ±0)` + // Estimated: `32188 + d * (3774 ±1) + v * (24 ±0)` + // Minimum execution time: 5_780_000 picoseconds. + Weight::from_parts(6_480_000, 32188) + // Standard Error: 17_262 + .saturating_add(Weight::from_parts(163_655, 0).saturating_mul(v.into())) + // Standard Error: 37_590 + .saturating_add(Weight::from_parts(48_373_194, 0).saturating_mul(d.into())) .saturating_add(T::DbWeight::get().reads(4_u64)) - .saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(v.into()))) - .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(v.into()))) - .saturating_add(Weight::from_parts(0, 3774).saturating_mul(v.into())) + .saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(d.into()))) + .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(d.into()))) + .saturating_add(Weight::from_parts(0, 3774).saturating_mul(d.into())) + .saturating_add(Weight::from_parts(0, 24).saturating_mul(v.into())) } /// Storage: `Elections::Candidates` (r:1 w:1) /// Proof: `Elections::Candidates` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) @@ -286,21 +298,21 @@ impl WeightInfo for BasiliskWeight { /// The range of component `e` is `[768, 7680]`. fn election_phragmen(c: u32, v: u32, e: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `0 + e * (27 ±0) + v * (412 ±0)` - // Estimated: `278823 + c * (2317 ±9) + e * (11 ±0) + v * (2543 ±7)` - // Minimum execution time: 3_796_278_000 picoseconds. - Weight::from_parts(3_800_497_000, 278823) - // Standard Error: 520_739 - .saturating_add(Weight::from_parts(12_240_585, 0).saturating_mul(v.into())) - // Standard Error: 54_339 - .saturating_add(Weight::from_parts(616_870, 0).saturating_mul(e.into())) - .saturating_add(T::DbWeight::get().reads(48_u64)) + // Measured: `0 + c * (10 ±0) + e * (27 ±0) + v * (414 ±0)` + // Estimated: `278823 + c * (2405 ±3) + e * (14 ±0) + v * (2572 ±3)` + // Minimum execution time: 2_522_186_000 picoseconds. + Weight::from_parts(2_546_425_000, 278823) + // Standard Error: 204_707 + .saturating_add(Weight::from_parts(10_945_132, 0).saturating_mul(v.into())) + // Standard Error: 21_355 + .saturating_add(Weight::from_parts(513_013, 0).saturating_mul(e.into())) + .saturating_add(T::DbWeight::get().reads(32_u64)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into()))) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(v.into()))) .saturating_add(T::DbWeight::get().writes(6_u64)) .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into()))) - .saturating_add(Weight::from_parts(0, 2317).saturating_mul(c.into())) - .saturating_add(Weight::from_parts(0, 11).saturating_mul(e.into())) - .saturating_add(Weight::from_parts(0, 2543).saturating_mul(v.into())) + .saturating_add(Weight::from_parts(0, 2405).saturating_mul(c.into())) + .saturating_add(Weight::from_parts(0, 14).saturating_mul(e.into())) + .saturating_add(Weight::from_parts(0, 2572).saturating_mul(v.into())) } } \ No newline at end of file diff --git a/runtime/basilisk/src/weights/pallet_ema_oracle.rs b/runtime/basilisk/src/weights/pallet_ema_oracle.rs new file mode 100644 index 00000000000..0f21923473a --- /dev/null +++ b/runtime/basilisk/src/weights/pallet_ema_oracle.rs @@ -0,0 +1,155 @@ +// This file is part of Basilisk. + +// Copyright (C) 2020-2023 Intergalactic, Limited (GIB). +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + + +//! Autogenerated weights for `pallet_ema_oracle` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` + +// Executed Command: +// ./target/release/basilisk +// benchmark +// pallet +// --wasm-execution=compiled +// --pallet +// pallet-ema-oracle +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 +// --template=.maintain/pallet-weight-template-no-back.hbs +// --json-file +// raw.json +// --output +// weights.rs + +#![cfg_attr(rustfmt, rustfmt_skip)] +#![allow(unused_parens)] +#![allow(unused_imports)] +#![allow(missing_docs)] + +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; + +/// Weights for `pallet_ema_oracle`. +pub struct WeightInfo(PhantomData); + +/// Weights for `pallet_ema_oracle` using the Basilisk node and recommended hardware. +pub struct BasiliskWeight(PhantomData); +impl pallet_ema_oracle::WeightInfo for BasiliskWeight { + /// Storage: `EmaOracle::WhitelistedAssets` (r:1 w:1) + /// Proof: `EmaOracle::WhitelistedAssets` (`max_values`: Some(1), `max_size`: Some(481), added: 976, mode: `MaxEncodedLen`) + fn add_oracle() -> Weight { + // Proof Size summary in bytes: + // Measured: `601` + // Estimated: `1966` + // Minimum execution time: 11_340_000 picoseconds. + Weight::from_parts(11_590_000, 1966) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `EmaOracle::WhitelistedAssets` (r:1 w:1) + /// Proof: `EmaOracle::WhitelistedAssets` (`max_values`: Some(1), `max_size`: Some(481), added: 976, mode: `MaxEncodedLen`) + /// Storage: `EmaOracle::Accumulator` (r:1 w:1) + /// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(4441), added: 4936, mode: `MaxEncodedLen`) + /// Storage: `EmaOracle::Oracles` (r:0 w:5) + /// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`) + fn remove_oracle() -> Weight { + // Proof Size summary in bytes: + // Measured: `617` + // Estimated: `5926` + // Minimum execution time: 32_650_000 picoseconds. + Weight::from_parts(33_240_000, 5926) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(7_u64)) + } + /// Storage: `EmaOracle::Accumulator` (r:1 w:0) + /// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(4441), added: 4936, mode: `MaxEncodedLen`) + fn on_finalize_no_entry() -> Weight { + // Proof Size summary in bytes: + // Measured: `109` + // Estimated: `5926` + // Minimum execution time: 2_380_000 picoseconds. + Weight::from_parts(2_610_000, 5926) + .saturating_add(T::DbWeight::get().reads(1_u64)) + } + /// Storage: `EmaOracle::Accumulator` (r:1 w:1) + /// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(4441), added: 4936, mode: `MaxEncodedLen`) + /// Storage: `EmaOracle::Oracles` (r:145 w:145) + /// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`) + /// The range of component `b` is `[1, 29]`. + fn on_finalize_multiple_tokens(b: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `204 + b * (933 ±0)` + // Estimated: `5926 + b * (13260 ±0)` + // Minimum execution time: 55_461_000 picoseconds. + Weight::from_parts(8_211_787, 5926) + // Standard Error: 41_351 + .saturating_add(Weight::from_parts(50_255_356, 0).saturating_mul(b.into())) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().reads((5_u64).saturating_mul(b.into()))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((5_u64).saturating_mul(b.into()))) + .saturating_add(Weight::from_parts(0, 13260).saturating_mul(b.into())) + } + /// Storage: `EmaOracle::Accumulator` (r:1 w:1) + /// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(4441), added: 4936, mode: `MaxEncodedLen`) + /// The range of component `b` is `[1, 29]`. + fn on_trade_multiple_tokens(b: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `204 + b * (148 ±0)` + // Estimated: `5926` + // Minimum execution time: 5_400_000 picoseconds. + Weight::from_parts(5_610_876, 5926) + // Standard Error: 2_255 + .saturating_add(Weight::from_parts(381_655, 0).saturating_mul(b.into())) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `EmaOracle::Accumulator` (r:1 w:1) + /// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(4441), added: 4936, mode: `MaxEncodedLen`) + /// The range of component `b` is `[1, 29]`. + fn on_liquidity_changed_multiple_tokens(b: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `204 + b * (148 ±0)` + // Estimated: `5926` + // Minimum execution time: 5_321_000 picoseconds. + Weight::from_parts(5_633_092, 5926) + // Standard Error: 2_398 + .saturating_add(Weight::from_parts(379_579, 0).saturating_mul(b.into())) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `EmaOracle::Oracles` (r:2 w:0) + /// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`) + fn get_entry() -> Weight { + // Proof Size summary in bytes: + // Measured: `609` + // Estimated: `6294` + // Minimum execution time: 14_130_000 picoseconds. + Weight::from_parts(14_790_000, 6294) + .saturating_add(T::DbWeight::get().reads(2_u64)) + } +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/pallet_identity.rs b/runtime/basilisk/src/weights/pallet_identity.rs new file mode 100644 index 00000000000..188dcdd2870 --- /dev/null +++ b/runtime/basilisk/src/weights/pallet_identity.rs @@ -0,0 +1,424 @@ +// This file is part of Basilisk. + +// Copyright (C) 2020-2023 Intergalactic, Limited (GIB). +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + + +//! Autogenerated weights for `pallet_identity` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` + +// Executed Command: +// ./target/release/basilisk +// benchmark +// pallet +// --wasm-execution=compiled +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 +// --template=.maintain/pallet-weight-template-no-back.hbs +// --json-file +// raw.json +// --output +// weights/ + +#![cfg_attr(rustfmt, rustfmt_skip)] +#![allow(unused_parens)] +#![allow(unused_imports)] +#![allow(missing_docs)] + +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; + +/// Weights for `pallet_identity`. +pub struct WeightInfo(PhantomData); + +/// Weights for `pallet_identity` using the Basilisk node and recommended hardware. +pub struct BasiliskWeight(PhantomData); +impl pallet_identity::WeightInfo for BasiliskWeight { + /// Storage: `Identity::Registrars` (r:1 w:1) + /// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(1141), added: 1636, mode: `MaxEncodedLen`) + /// The range of component `r` is `[1, 19]`. + fn add_registrar(r: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `31 + r * (57 ±0)` + // Estimated: `2626` + // Minimum execution time: 8_710_000 picoseconds. + Weight::from_parts(9_443_931, 2626) + // Standard Error: 2_499 + .saturating_add(Weight::from_parts(80_557, 0).saturating_mul(r.into())) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Identity::IdentityOf` (r:1 w:1) + /// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`) + /// The range of component `r` is `[1, 20]`. + fn set_identity(r: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `6977 + r * (5 ±0)` + // Estimated: `11037` + // Minimum execution time: 134_221_000 picoseconds. + Weight::from_parts(139_988_186, 11037) + // Standard Error: 12_767 + .saturating_add(Weight::from_parts(136_396, 0).saturating_mul(r.into())) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Identity::IdentityOf` (r:1 w:0) + /// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`) + /// Storage: `Identity::SubsOf` (r:1 w:1) + /// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(3258), added: 5733, mode: `MaxEncodedLen`) + /// Storage: `Identity::SuperOf` (r:100 w:100) + /// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`) + /// The range of component `s` is `[0, 100]`. + fn set_subs_new(s: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `100` + // Estimated: `11037 + s * (2589 ±0)` + // Minimum execution time: 9_520_000 picoseconds. + Weight::from_parts(22_514_789, 11037) + // Standard Error: 6_645 + .saturating_add(Weight::from_parts(3_791_272, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s.into()))) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into()))) + .saturating_add(Weight::from_parts(0, 2589).saturating_mul(s.into())) + } + /// Storage: `Identity::IdentityOf` (r:1 w:0) + /// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`) + /// Storage: `Identity::SubsOf` (r:1 w:1) + /// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(3258), added: 5733, mode: `MaxEncodedLen`) + /// Storage: `Identity::SuperOf` (r:0 w:100) + /// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`) + /// The range of component `p` is `[0, 100]`. + fn set_subs_old(p: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `193 + p * (32 ±0)` + // Estimated: `11037` + // Minimum execution time: 9_440_000 picoseconds. + Weight::from_parts(21_879_116, 11037) + // Standard Error: 4_715 + .saturating_add(Weight::from_parts(1_534_721, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into()))) + } + /// Storage: `Identity::SubsOf` (r:1 w:1) + /// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(3258), added: 5733, mode: `MaxEncodedLen`) + /// Storage: `Identity::IdentityOf` (r:1 w:1) + /// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`) + /// Storage: `Identity::SuperOf` (r:0 w:100) + /// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`) + /// The range of component `r` is `[1, 20]`. + /// The range of component `s` is `[0, 100]`. + fn clear_identity(r: u32, s: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `7069 + r * (5 ±0) + s * (32 ±0)` + // Estimated: `11037` + // Minimum execution time: 58_951_000 picoseconds. + Weight::from_parts(62_283_319, 11037) + // Standard Error: 17_567 + .saturating_add(Weight::from_parts(22_897, 0).saturating_mul(r.into())) + // Standard Error: 3_427 + .saturating_add(Weight::from_parts(1_477_105, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into()))) + } + /// Storage: `Identity::Registrars` (r:1 w:0) + /// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(1141), added: 1636, mode: `MaxEncodedLen`) + /// Storage: `Identity::IdentityOf` (r:1 w:1) + /// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`) + /// The range of component `r` is `[1, 20]`. + fn request_judgement(r: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `6967 + r * (57 ±0)` + // Estimated: `11037` + // Minimum execution time: 86_331_000 picoseconds. + Weight::from_parts(89_757_905, 11037) + // Standard Error: 10_571 + .saturating_add(Weight::from_parts(128_154, 0).saturating_mul(r.into())) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Identity::IdentityOf` (r:1 w:1) + /// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`) + /// The range of component `r` is `[1, 20]`. + fn cancel_request(r: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `6998` + // Estimated: `11037` + // Minimum execution time: 83_111_000 picoseconds. + Weight::from_parts(86_968_199, 11037) + // Standard Error: 7_753 + .saturating_add(Weight::from_parts(59_608, 0).saturating_mul(r.into())) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Identity::Registrars` (r:1 w:1) + /// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(1141), added: 1636, mode: `MaxEncodedLen`) + /// The range of component `r` is `[1, 19]`. + fn set_fee(r: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `88 + r * (57 ±0)` + // Estimated: `2626` + // Minimum execution time: 6_530_000 picoseconds. + Weight::from_parts(6_970_369, 2626) + // Standard Error: 1_385 + .saturating_add(Weight::from_parts(65_495, 0).saturating_mul(r.into())) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Identity::Registrars` (r:1 w:1) + /// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(1141), added: 1636, mode: `MaxEncodedLen`) + /// The range of component `r` is `[1, 19]`. + fn set_account_id(r: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `88 + r * (57 ±0)` + // Estimated: `2626` + // Minimum execution time: 5_860_000 picoseconds. + Weight::from_parts(6_339_078, 2626) + // Standard Error: 1_427 + .saturating_add(Weight::from_parts(62_408, 0).saturating_mul(r.into())) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Identity::Registrars` (r:1 w:1) + /// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(1141), added: 1636, mode: `MaxEncodedLen`) + /// The range of component `r` is `[1, 19]`. + fn set_fields(r: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `88 + r * (57 ±0)` + // Estimated: `2626` + // Minimum execution time: 5_730_000 picoseconds. + Weight::from_parts(6_453_402, 2626) + // Standard Error: 1_293 + .saturating_add(Weight::from_parts(50_492, 0).saturating_mul(r.into())) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Identity::Registrars` (r:1 w:0) + /// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(1141), added: 1636, mode: `MaxEncodedLen`) + /// Storage: `Identity::IdentityOf` (r:1 w:1) + /// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`) + /// The range of component `r` is `[1, 19]`. + fn provide_judgement(r: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `7045 + r * (57 ±0)` + // Estimated: `11037` + // Minimum execution time: 114_311_000 picoseconds. + Weight::from_parts(118_989_129, 11037) + // Standard Error: 9_371 + .saturating_add(Weight::from_parts(55_305, 0).saturating_mul(r.into())) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Identity::SubsOf` (r:1 w:1) + /// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(3258), added: 5733, mode: `MaxEncodedLen`) + /// Storage: `Identity::IdentityOf` (r:1 w:1) + /// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`) + /// Storage: `System::Account` (r:1 w:1) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// Storage: `Identity::SuperOf` (r:0 w:100) + /// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`) + /// The range of component `r` is `[1, 20]`. + /// The range of component `s` is `[0, 100]`. + fn kill_identity(r: u32, s: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `7209 + r * (5 ±0) + s * (32 ±0)` + // Estimated: `11037` + // Minimum execution time: 76_341_000 picoseconds. + Weight::from_parts(82_411_000, 11037) + // Standard Error: 117_451 + .saturating_add(Weight::from_parts(408_319, 0).saturating_mul(r.into())) + // Standard Error: 23_476 + .saturating_add(Weight::from_parts(1_630_731, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into()))) + } + /// Storage: `Identity::IdentityOf` (r:1 w:0) + /// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`) + /// Storage: `Identity::SuperOf` (r:1 w:1) + /// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`) + /// Storage: `Identity::SubsOf` (r:1 w:1) + /// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(3258), added: 5733, mode: `MaxEncodedLen`) + /// The range of component `s` is `[0, 99]`. + fn add_sub(s: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `474 + s * (36 ±0)` + // Estimated: `11037` + // Minimum execution time: 27_000_000 picoseconds. + Weight::from_parts(28_612_918, 11037) + // Standard Error: 12_122 + .saturating_add(Weight::from_parts(174_462, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + } + /// Storage: `Identity::IdentityOf` (r:1 w:0) + /// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`) + /// Storage: `Identity::SuperOf` (r:1 w:1) + /// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`) + /// The range of component `s` is `[1, 100]`. + fn rename_sub(s: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `590 + s * (3 ±0)` + // Estimated: `11037` + // Minimum execution time: 13_210_000 picoseconds. + Weight::from_parts(14_750_424, 11037) + // Standard Error: 737 + .saturating_add(Weight::from_parts(26_727, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Identity::IdentityOf` (r:1 w:0) + /// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`) + /// Storage: `Identity::SuperOf` (r:1 w:1) + /// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`) + /// Storage: `Identity::SubsOf` (r:1 w:1) + /// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(3258), added: 5733, mode: `MaxEncodedLen`) + /// The range of component `s` is `[1, 100]`. + fn remove_sub(s: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `637 + s * (35 ±0)` + // Estimated: `11037` + // Minimum execution time: 29_141_000 picoseconds. + Weight::from_parts(28_766_415, 11037) + // Standard Error: 10_961 + .saturating_add(Weight::from_parts(197_341, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + } + /// Storage: `Identity::SuperOf` (r:1 w:1) + /// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`) + /// Storage: `Identity::SubsOf` (r:1 w:1) + /// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(3258), added: 5733, mode: `MaxEncodedLen`) + /// Storage: `System::Account` (r:1 w:0) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// The range of component `s` is `[0, 99]`. + fn quit_sub(s: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `666 + s * (37 ±0)` + // Estimated: `6723` + // Minimum execution time: 24_190_000 picoseconds. + Weight::from_parts(37_585_619, 6723) + // Standard Error: 11_928 + .saturating_add(Weight::from_parts(76_202, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + } + /// Storage: `Identity::UsernameAuthorities` (r:0 w:1) + /// Proof: `Identity::UsernameAuthorities` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) + fn add_username_authority() -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 14_930_000 picoseconds. + Weight::from_parts(16_500_000, 0) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Identity::UsernameAuthorities` (r:1 w:1) + /// Proof: `Identity::UsernameAuthorities` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) + fn remove_username_authority() -> Weight { + // Proof Size summary in bytes: + // Measured: `79` + // Estimated: `3517` + // Minimum execution time: 20_570_000 picoseconds. + Weight::from_parts(22_690_000, 3517) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Identity::UsernameAuthorities` (r:1 w:1) + /// Proof: `Identity::UsernameAuthorities` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) + /// Storage: `Identity::AccountOfUsername` (r:1 w:1) + /// Proof: `Identity::AccountOfUsername` (`max_values`: None, `max_size`: Some(81), added: 2556, mode: `MaxEncodedLen`) + /// Storage: `Identity::PendingUsernames` (r:1 w:0) + /// Proof: `Identity::PendingUsernames` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`) + /// Storage: `Identity::IdentityOf` (r:1 w:1) + /// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`) + fn set_username_for() -> Weight { + // Proof Size summary in bytes: + // Measured: `79` + // Estimated: `11037` + // Minimum execution time: 68_201_000 picoseconds. + Weight::from_parts(98_761_000, 11037) + .saturating_add(T::DbWeight::get().reads(4_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) + } + /// Storage: `Identity::PendingUsernames` (r:1 w:1) + /// Proof: `Identity::PendingUsernames` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`) + /// Storage: `Identity::IdentityOf` (r:1 w:1) + /// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`) + /// Storage: `Identity::AccountOfUsername` (r:0 w:1) + /// Proof: `Identity::AccountOfUsername` (`max_values`: None, `max_size`: Some(81), added: 2556, mode: `MaxEncodedLen`) + fn accept_username() -> Weight { + // Proof Size summary in bytes: + // Measured: `114` + // Estimated: `11037` + // Minimum execution time: 23_331_000 picoseconds. + Weight::from_parts(38_561_000, 11037) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) + } + /// Storage: `Identity::PendingUsernames` (r:1 w:1) + /// Proof: `Identity::PendingUsernames` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`) + fn remove_expired_approval() -> Weight { + // Proof Size summary in bytes: + // Measured: `114` + // Estimated: `3550` + // Minimum execution time: 38_071_000 picoseconds. + Weight::from_parts(42_001_000, 3550) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Identity::AccountOfUsername` (r:1 w:0) + /// Proof: `Identity::AccountOfUsername` (`max_values`: None, `max_size`: Some(81), added: 2556, mode: `MaxEncodedLen`) + /// Storage: `Identity::IdentityOf` (r:1 w:1) + /// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`) + fn set_primary_username() -> Weight { + // Proof Size summary in bytes: + // Measured: `256` + // Estimated: `11037` + // Minimum execution time: 18_220_000 picoseconds. + Weight::from_parts(18_940_000, 11037) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Identity::AccountOfUsername` (r:1 w:1) + /// Proof: `Identity::AccountOfUsername` (`max_values`: None, `max_size`: Some(81), added: 2556, mode: `MaxEncodedLen`) + /// Storage: `Identity::IdentityOf` (r:1 w:0) + /// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`) + fn remove_dangling_username() -> Weight { + // Proof Size summary in bytes: + // Measured: `97` + // Estimated: `11037` + // Minimum execution time: 12_560_000 picoseconds. + Weight::from_parts(13_070_000, 11037) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/lbp.rs b/runtime/basilisk/src/weights/pallet_lbp.rs similarity index 79% rename from runtime/basilisk/src/weights/lbp.rs rename to runtime/basilisk/src/weights/pallet_lbp.rs index 93d87af5c4a..e3debc8c5fd 100644 --- a/runtime/basilisk/src/weights/lbp.rs +++ b/runtime/basilisk/src/weights/pallet_lbp.rs @@ -15,43 +15,50 @@ // See the License for the specific language governing permissions and // limitations under the License. + //! Autogenerated weights for `pallet_lbp` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-12-06, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// target/release/basilisk +// ./target/release/basilisk // benchmark // pallet -// --chain=dev -// --steps=10 -// --repeat=30 // --wasm-execution=compiled -// --heap-pages=4096 +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 // --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=pallet-lbp -// --output=weights-1.1.0/lbp.rs -// --extrinsic=* +// --json-file +// raw.json +// --output +// weights/ +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] +#![allow(missing_docs)] -use frame_support::{ - traits::Get, - weights::{constants::RocksDbWeight, Weight}, -}; -use sp_std::marker::PhantomData; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; -use pallet_lbp::weights::WeightInfo; +/// Weights for `pallet_lbp`. +pub struct WeightInfo(PhantomData); +/// Weights for `pallet_lbp` using the Basilisk node and recommended hardware. pub struct BasiliskWeight(PhantomData); - -impl WeightInfo for BasiliskWeight { +impl pallet_lbp::WeightInfo for BasiliskWeight { /// Storage: `LBP::PoolData` (r:1 w:1) /// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`) /// Storage: `LBP::FeeCollectorWithAsset` (r:1 w:1) @@ -68,10 +75,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`) fn create_pool() -> Weight { // Proof Size summary in bytes: - // Measured: `930` + // Measured: `964` // Estimated: `11322` - // Minimum execution time: 144_594_000 picoseconds. - Weight::from_parts(145_577_000, 11322) + // Minimum execution time: 92_101_000 picoseconds. + Weight::from_parts(96_241_000, 11322) .saturating_add(T::DbWeight::get().reads(12_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -81,10 +88,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `LBP::FeeCollectorWithAsset` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`) fn update_pool_data() -> Weight { // Proof Size summary in bytes: - // Measured: `351` + // Measured: `384` // Estimated: `3628` - // Minimum execution time: 30_652_000 picoseconds. - Weight::from_parts(31_114_000, 3628) + // Minimum execution time: 19_190_000 picoseconds. + Weight::from_parts(19_690_000, 3628) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -98,10 +105,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn add_liquidity() -> Weight { // Proof Size summary in bytes: - // Measured: `1170` + // Measured: `1204` // Estimated: `11322` - // Minimum execution time: 100_856_000 picoseconds. - Weight::from_parts(101_975_000, 11322) + // Minimum execution time: 67_340_000 picoseconds. + Weight::from_parts(69_681_000, 11322) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -121,10 +128,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `LBP::FeeCollectorWithAsset` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`) fn remove_liquidity() -> Weight { // Proof Size summary in bytes: - // Measured: `1359` + // Measured: `1393` // Estimated: `11322` - // Minimum execution time: 133_431_000 picoseconds. - Weight::from_parts(134_355_000, 11322) + // Minimum execution time: 90_761_000 picoseconds. + Weight::from_parts(94_581_000, 11322) .saturating_add(T::DbWeight::get().reads(10_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -140,10 +147,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn sell() -> Weight { // Proof Size summary in bytes: - // Measured: `1538` + // Measured: `1572` // Estimated: `13905` - // Minimum execution time: 216_160_000 picoseconds. - Weight::from_parts(218_332_000, 13905) + // Minimum execution time: 154_791_000 picoseconds. + Weight::from_parts(160_502_000, 13905) .saturating_add(T::DbWeight::get().reads(12_u64)) .saturating_add(T::DbWeight::get().writes(7_u64)) } @@ -159,10 +166,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn buy() -> Weight { // Proof Size summary in bytes: - // Measured: `1538` + // Measured: `1572` // Estimated: `13905` - // Minimum execution time: 216_459_000 picoseconds. - Weight::from_parts(217_991_000, 13905) + // Minimum execution time: 154_702_000 picoseconds. + Weight::from_parts(161_012_000, 13905) .saturating_add(T::DbWeight::get().reads(12_u64)) .saturating_add(T::DbWeight::get().writes(7_u64)) } @@ -178,16 +185,16 @@ impl WeightInfo for BasiliskWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) /// The range of component `c` is `[1, 2]`. /// The range of component `e` is `[0, 1]`. - fn router_execution_sell(c: u32, e: u32) -> Weight { + fn router_execution_sell(c: u32, e: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `784 + e * (754 ±0)` - // Estimated: `6156 + e * (7749 ±34_606_984_459_695_172)` - // Minimum execution time: 65_605_000 picoseconds. - Weight::from_parts(66_090_000, 6156) - // Standard Error: 614_731 - .saturating_add(Weight::from_parts(2_364_398, 0).saturating_mul(c.into())) - // Standard Error: 1_349_510 - .saturating_add(Weight::from_parts(158_869_336, 0).saturating_mul(e.into())) + // Measured: `817 + e * (755 ±0)` + // Estimated: `6156 + e * (7749 ±6_801_226_166_572_765)` + // Minimum execution time: 52_880_000 picoseconds. + Weight::from_parts(54_061_000, 6156) + // Standard Error: 140_496 + .saturating_add(Weight::from_parts(766_543, 0).saturating_mul(c.into())) + // Standard Error: 312_925 + .saturating_add(Weight::from_parts(106_100_719, 0).saturating_mul(e.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().reads((9_u64).saturating_mul(e.into()))) .saturating_add(T::DbWeight::get().writes((7_u64).saturating_mul(e.into()))) @@ -205,16 +212,16 @@ impl WeightInfo for BasiliskWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) /// The range of component `c` is `[1, 3]`. /// The range of component `e` is `[0, 1]`. - fn router_execution_buy(c: u32, e: u32) -> Weight { + fn router_execution_buy(c: u32, e: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `784 + e * (754 ±0)` - // Estimated: `6156 + e * (7749 ±0)` - // Minimum execution time: 116_794_000 picoseconds. - Weight::from_parts(117_321_000, 6156) - // Standard Error: 759_399 - .saturating_add(Weight::from_parts(3_773_334, 0).saturating_mul(c.into())) - // Standard Error: 2_507_585 - .saturating_add(Weight::from_parts(131_536_809, 0).saturating_mul(e.into())) + // Measured: `817 + e * (755 ±0)` + // Estimated: `6156 + e * (7749 ±1_398_712_020_157_493)` + // Minimum execution time: 95_671_000 picoseconds. + Weight::from_parts(96_911_000, 6156) + // Standard Error: 262_021 + .saturating_add(Weight::from_parts(1_997_955, 0).saturating_mul(c.into())) + // Standard Error: 883_620 + .saturating_add(Weight::from_parts(82_292_049, 0).saturating_mul(e.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().reads((9_u64).saturating_mul(e.into()))) .saturating_add(T::DbWeight::get().writes((7_u64).saturating_mul(e.into()))) @@ -226,9 +233,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) fn calculate_buy() -> Weight { // Proof Size summary in bytes: - // Measured: `784` + // Measured: `817` // Estimated: `6156` - // Minimum execution time: 65_901_000 picoseconds. - Weight::from_parts(66_148_000, 6156).saturating_add(T::DbWeight::get().reads(3_u64)) + // Minimum execution time: 52_810_000 picoseconds. + Weight::from_parts(53_830_000, 6156) + .saturating_add(T::DbWeight::get().reads(3_u64)) } -} +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/marketplace.rs b/runtime/basilisk/src/weights/pallet_marketplace.rs similarity index 85% rename from runtime/basilisk/src/weights/marketplace.rs rename to runtime/basilisk/src/weights/pallet_marketplace.rs index 8a45520042b..43cb074fbbd 100644 --- a/runtime/basilisk/src/weights/marketplace.rs +++ b/runtime/basilisk/src/weights/pallet_marketplace.rs @@ -15,43 +15,50 @@ // See the License for the specific language governing permissions and // limitations under the License. + //! Autogenerated weights for `pallet_marketplace` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-12-06, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// target/release/basilisk +// ./target/release/basilisk // benchmark // pallet -// --chain=dev -// --steps=10 -// --repeat=30 // --wasm-execution=compiled -// --heap-pages=4096 +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 // --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=pallet-marketplace -// --output=weights-1.1.0/marketplace.rs -// --extrinsic=* +// --json-file +// raw.json +// --output +// weights/ +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] +#![allow(missing_docs)] -use frame_support::{ - traits::Get, - weights::{constants::RocksDbWeight, Weight}, -}; -use sp_std::marker::PhantomData; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; -use pallet_marketplace::weights::WeightInfo; +/// Weights for `pallet_marketplace`. +pub struct WeightInfo(PhantomData); +/// Weights for `pallet_marketplace` using the Basilisk node and recommended hardware. pub struct BasiliskWeight(PhantomData); - -impl WeightInfo for BasiliskWeight { +impl pallet_marketplace::WeightInfo for BasiliskWeight { /// Storage: `Uniques::Asset` (r:1 w:1) /// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`) /// Storage: `Marketplace::Prices` (r:1 w:1) @@ -76,10 +83,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(113), added: 2588, mode: `MaxEncodedLen`) fn buy() -> Weight { // Proof Size summary in bytes: - // Measured: `2859` + // Measured: `2926` // Estimated: `6156` - // Minimum execution time: 130_029_000 picoseconds. - Weight::from_parts(130_806_000, 6156) + // Minimum execution time: 91_431_000 picoseconds. + Weight::from_parts(94_601_000, 6156) .saturating_add(T::DbWeight::get().reads(10_u64)) .saturating_add(T::DbWeight::get().writes(7_u64)) } @@ -89,10 +96,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `Marketplace::Prices` (`max_values`: None, `max_size`: Some(80), added: 2555, mode: `MaxEncodedLen`) fn set_price() -> Weight { // Proof Size summary in bytes: - // Measured: `1360` + // Measured: `1394` // Estimated: `3611` - // Minimum execution time: 35_699_000 picoseconds. - Weight::from_parts(36_340_000, 3611) + // Minimum execution time: 24_080_000 picoseconds. + Weight::from_parts(25_370_000, 3611) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -108,10 +115,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`) fn make_offer() -> Weight { // Proof Size summary in bytes: - // Measured: `1797` + // Measured: `1864` // Estimated: `4087` - // Minimum execution time: 64_370_000 picoseconds. - Weight::from_parts(65_044_000, 4087) + // Minimum execution time: 44_071_000 picoseconds. + Weight::from_parts(46_530_000, 4087) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -129,10 +136,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`) fn withdraw_offer() -> Weight { // Proof Size summary in bytes: - // Measured: `2288` + // Measured: `2355` // Estimated: `4087` - // Minimum execution time: 65_488_000 picoseconds. - Weight::from_parts(66_451_000, 4087) + // Minimum execution time: 44_961_000 picoseconds. + Weight::from_parts(46_860_000, 4087) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -162,10 +169,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(113), added: 2588, mode: `MaxEncodedLen`) fn accept_offer() -> Weight { // Proof Size summary in bytes: - // Measured: `2929` + // Measured: `2996` // Estimated: `6156` - // Minimum execution time: 158_110_000 picoseconds. - Weight::from_parts(159_121_000, 6156) + // Minimum execution time: 107_540_000 picoseconds. + Weight::from_parts(110_771_000, 6156) .saturating_add(T::DbWeight::get().reads(11_u64)) .saturating_add(T::DbWeight::get().writes(8_u64)) } @@ -179,11 +186,11 @@ impl WeightInfo for BasiliskWeight { /// Proof: `AssetRegistry::LocationAssets` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`) fn add_royalty() -> Weight { // Proof Size summary in bytes: - // Measured: `1610` + // Measured: `1677` // Estimated: `4087` - // Minimum execution time: 47_308_000 picoseconds. - Weight::from_parts(47_795_000, 4087) + // Minimum execution time: 32_401_000 picoseconds. + Weight::from_parts(33_600_000, 4087) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } -} +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/pallet_message_queue.rs b/runtime/basilisk/src/weights/pallet_message_queue.rs new file mode 100644 index 00000000000..e9c70357ee8 --- /dev/null +++ b/runtime/basilisk/src/weights/pallet_message_queue.rs @@ -0,0 +1,185 @@ +// This file is part of Basilisk. + +// Copyright (C) 2020-2023 Intergalactic, Limited (GIB). +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + + +//! Autogenerated weights for `pallet_message_queue` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` + +// Executed Command: +// ./target/release/basilisk +// benchmark +// pallet +// --wasm-execution=compiled +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 +// --template=.maintain/pallet-weight-template-no-back.hbs +// --json-file +// raw.json +// --output +// weights/ + +#![cfg_attr(rustfmt, rustfmt_skip)] +#![allow(unused_parens)] +#![allow(unused_imports)] +#![allow(missing_docs)] + +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; + +/// Weights for `pallet_message_queue`. +pub struct WeightInfo(PhantomData); + +/// Weights for `pallet_message_queue` using the Basilisk node and recommended hardware. +pub struct BasiliskWeight(PhantomData); +impl pallet_message_queue::WeightInfo for BasiliskWeight { + /// Storage: `MessageQueue::ServiceHead` (r:1 w:0) + /// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`) + /// Storage: `MessageQueue::BookStateFor` (r:2 w:2) + /// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) + fn ready_ring_knit() -> Weight { + // Proof Size summary in bytes: + // Measured: `298` + // Estimated: `6044` + // Minimum execution time: 13_220_000 picoseconds. + Weight::from_parts(13_570_000, 6044) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + } + /// Storage: `MessageQueue::BookStateFor` (r:2 w:2) + /// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) + /// Storage: `MessageQueue::ServiceHead` (r:1 w:1) + /// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`) + fn ready_ring_unknit() -> Weight { + // Proof Size summary in bytes: + // Measured: `293` + // Estimated: `6044` + // Minimum execution time: 11_450_000 picoseconds. + Weight::from_parts(11_810_000, 6044) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) + } + /// Storage: `MessageQueue::BookStateFor` (r:1 w:1) + /// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) + fn service_queue_base() -> Weight { + // Proof Size summary in bytes: + // Measured: `80` + // Estimated: `3517` + // Minimum execution time: 5_710_000 picoseconds. + Weight::from_parts(5_970_000, 3517) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `MessageQueue::Pages` (r:1 w:1) + /// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(134193), added: 136668, mode: `MaxEncodedLen`) + fn service_page_base_completion() -> Weight { + // Proof Size summary in bytes: + // Measured: `147` + // Estimated: `137658` + // Minimum execution time: 7_200_000 picoseconds. + Weight::from_parts(7_550_000, 137658) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `MessageQueue::Pages` (r:1 w:1) + /// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(134193), added: 136668, mode: `MaxEncodedLen`) + fn service_page_base_no_completion() -> Weight { + // Proof Size summary in bytes: + // Measured: `147` + // Estimated: `137658` + // Minimum execution time: 7_510_000 picoseconds. + Weight::from_parts(7_721_000, 137658) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `MessageQueue::BookStateFor` (r:0 w:1) + /// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) + /// Storage: `MessageQueue::Pages` (r:0 w:1) + /// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(134193), added: 136668, mode: `MaxEncodedLen`) + fn service_page_item() -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 244_592_000 picoseconds. + Weight::from_parts(257_093_000, 0) + .saturating_add(T::DbWeight::get().writes(2_u64)) + } + /// Storage: `MessageQueue::ServiceHead` (r:1 w:1) + /// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`) + /// Storage: `MessageQueue::BookStateFor` (r:1 w:0) + /// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) + fn bump_service_head() -> Weight { + // Proof Size summary in bytes: + // Measured: `246` + // Estimated: `3517` + // Minimum execution time: 7_370_000 picoseconds. + Weight::from_parts(7_630_000, 3517) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `MessageQueue::BookStateFor` (r:1 w:1) + /// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) + /// Storage: `MessageQueue::Pages` (r:1 w:1) + /// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(134193), added: 136668, mode: `MaxEncodedLen`) + fn reap_page() -> Weight { + // Proof Size summary in bytes: + // Measured: `134349` + // Estimated: `137658` + // Minimum execution time: 69_251_000 picoseconds. + Weight::from_parts(70_801_000, 137658) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + } + /// Storage: `MessageQueue::BookStateFor` (r:1 w:1) + /// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) + /// Storage: `MessageQueue::Pages` (r:1 w:1) + /// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(134193), added: 136668, mode: `MaxEncodedLen`) + fn execute_overweight_page_removed() -> Weight { + // Proof Size summary in bytes: + // Measured: `134349` + // Estimated: `137658` + // Minimum execution time: 103_801_000 picoseconds. + Weight::from_parts(106_321_000, 137658) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + } + /// Storage: `MessageQueue::BookStateFor` (r:1 w:1) + /// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) + /// Storage: `MessageQueue::Pages` (r:1 w:1) + /// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(134193), added: 136668, mode: `MaxEncodedLen`) + fn execute_overweight_page_updated() -> Weight { + // Proof Size summary in bytes: + // Measured: `134349` + // Estimated: `137658` + // Minimum execution time: 163_081_000 picoseconds. + Weight::from_parts(168_422_000, 137658) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + } +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/pallet_multisig.rs b/runtime/basilisk/src/weights/pallet_multisig.rs new file mode 100644 index 00000000000..68d0fb32e28 --- /dev/null +++ b/runtime/basilisk/src/weights/pallet_multisig.rs @@ -0,0 +1,167 @@ +// This file is part of Basilisk. + +// Copyright (C) 2020-2023 Intergalactic, Limited (GIB). +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + + +//! Autogenerated weights for `pallet_multisig` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` + +// Executed Command: +// ./target/release/basilisk +// benchmark +// pallet +// --wasm-execution=compiled +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 +// --template=.maintain/pallet-weight-template-no-back.hbs +// --json-file +// raw.json +// --output +// weights/ + +#![cfg_attr(rustfmt, rustfmt_skip)] +#![allow(unused_parens)] +#![allow(unused_imports)] +#![allow(missing_docs)] + +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; + +/// Weights for `pallet_multisig`. +pub struct WeightInfo(PhantomData); + +/// Weights for `pallet_multisig` using the Basilisk node and recommended hardware. +pub struct BasiliskWeight(PhantomData); +impl pallet_multisig::WeightInfo for BasiliskWeight { + /// The range of component `z` is `[0, 10000]`. + fn as_multi_threshold_1(z: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 12_280_000 picoseconds. + Weight::from_parts(13_287_659, 0) + // Standard Error: 4 + .saturating_add(Weight::from_parts(361, 0).saturating_mul(z.into())) + } + /// Storage: `Multisig::Multisigs` (r:1 w:1) + /// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`) + /// 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 { + // Proof Size summary in bytes: + // Measured: `295 + s * (2 ±0)` + // Estimated: `6811` + // Minimum execution time: 37_760_000 picoseconds. + Weight::from_parts(35_205_121, 6811) + // Standard Error: 2_877 + .saturating_add(Weight::from_parts(45_382, 0).saturating_mul(s.into())) + // Standard Error: 28 + .saturating_add(Weight::from_parts(1_037, 0).saturating_mul(z.into())) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Multisig::Multisigs` (r:1 w:1) + /// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`) + /// 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 { + // Proof Size summary in bytes: + // Measured: `315` + // Estimated: `6811` + // Minimum execution time: 23_250_000 picoseconds. + Weight::from_parts(18_464_695, 6811) + // Standard Error: 764 + .saturating_add(Weight::from_parts(63_228, 0).saturating_mul(s.into())) + // Standard Error: 7 + .saturating_add(Weight::from_parts(1_065, 0).saturating_mul(z.into())) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Multisig::Multisigs` (r:1 w:1) + /// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`) + /// Storage: `System::Account` (r:1 w:1) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// 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 { + // Proof Size summary in bytes: + // Measured: `418 + s * (33 ±0)` + // Estimated: `6811` + // Minimum execution time: 42_221_000 picoseconds. + Weight::from_parts(35_756_970, 6811) + // Standard Error: 1_137 + .saturating_add(Weight::from_parts(81_681, 0).saturating_mul(s.into())) + // Standard Error: 11 + .saturating_add(Weight::from_parts(1_138, 0).saturating_mul(z.into())) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + } + /// Storage: `Multisig::Multisigs` (r:1 w:1) + /// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`) + /// The range of component `s` is `[2, 100]`. + fn approve_as_multi_create(s: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `296 + s * (2 ±0)` + // Estimated: `6811` + // Minimum execution time: 27_930_000 picoseconds. + Weight::from_parts(30_269_183, 6811) + // Standard Error: 1_126 + .saturating_add(Weight::from_parts(72_408, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Multisig::Multisigs` (r:1 w:1) + /// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`) + /// The range of component `s` is `[2, 100]`. + fn approve_as_multi_approve(s: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `315` + // Estimated: `6811` + // Minimum execution time: 15_780_000 picoseconds. + Weight::from_parts(16_640_325, 6811) + // Standard Error: 862 + .saturating_add(Weight::from_parts(64_428, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Multisig::Multisigs` (r:1 w:1) + /// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`) + /// The range of component `s` is `[2, 100]`. + fn cancel_as_multi(s: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `487 + s * (1 ±0)` + // Estimated: `6811` + // Minimum execution time: 28_471_000 picoseconds. + Weight::from_parts(30_511_852, 6811) + // Standard Error: 2_097 + .saturating_add(Weight::from_parts(75_044, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/nft.rs b/runtime/basilisk/src/weights/pallet_nft.rs similarity index 84% rename from runtime/basilisk/src/weights/nft.rs rename to runtime/basilisk/src/weights/pallet_nft.rs index faad1ca806d..1430acd73be 100644 --- a/runtime/basilisk/src/weights/nft.rs +++ b/runtime/basilisk/src/weights/pallet_nft.rs @@ -15,47 +15,53 @@ // See the License for the specific language governing permissions and // limitations under the License. + //! Autogenerated weights for `pallet_nft` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-12-06, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// target/release/basilisk +// ./target/release/basilisk // benchmark // pallet -// --chain=dev -// --steps=10 -// --repeat=30 // --wasm-execution=compiled -// --heap-pages=4096 +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 // --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=pallet-nft -// --output=weights-1.1.0/nft.rs -// --extrinsic=* +// --json-file +// raw.json +// --output +// weights/ +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] - -use frame_support::{ - traits::Get, - weights::{constants::RocksDbWeight, Weight}, -}; -use sp_std::marker::PhantomData; +#![allow(missing_docs)] -use pallet_nft::weights::WeightInfo; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; -pub struct BasiliskWeight(PhantomData); +/// Weights for `pallet_nft`. +pub struct WeightInfo(PhantomData); -//This consts are here to make `create_collection()` and `mint()` more expensive. -const CREATE_COLLECTION_OFFSET: u64 = 180 * 2; -const MINT_OFFSET: u64 = 140 * 2; +const CREATE_COLLECTION_OFFSET: u64 = 180 * 3; +const MINT_OFFSET: u64 = 140 * 3; -impl WeightInfo for BasiliskWeight { +/// Weights for `pallet_nft` using the Basilisk node and recommended hardware. +pub struct BasiliskWeight(PhantomData); +impl pallet_nft::WeightInfo for BasiliskWeight { /// Storage: `Uniques::Class` (r:1 w:1) /// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(190), added: 2665, mode: `MaxEncodedLen`) /// Storage: `AssetRegistry::NextAssetId` (r:1 w:0) @@ -68,10 +74,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `NFT::Collections` (`max_values`: None, `max_size`: Some(99), added: 2574, mode: `MaxEncodedLen`) fn create_collection() -> Weight { // Proof Size summary in bytes: - // Measured: `467` + // Measured: `500` // Estimated: `4087` - // Minimum execution time: 36_542_000 picoseconds. - Weight::from_parts(36_999_000, 4087) + // Minimum execution time: 21_440_000 picoseconds. + Weight::from_parts(22_950_000, 4087) .saturating_mul(CREATE_COLLECTION_OFFSET) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) @@ -94,10 +100,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `NFT::Items` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`) fn mint() -> Weight { // Proof Size summary in bytes: - // Measured: `903` + // Measured: `936` // Estimated: `4087` - // Minimum execution time: 58_112_000 picoseconds. - Weight::from_parts(58_800_000, 4087) + // Minimum execution time: 38_970_000 picoseconds. + Weight::from_parts(40_021_000, 4087) .saturating_mul(MINT_OFFSET) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) @@ -116,8 +122,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `873` // Estimated: `3655` - // Minimum execution time: 53_329_000 picoseconds. - Weight::from_parts(54_155_000, 3655) + // Minimum execution time: 36_170_000 picoseconds. + Weight::from_parts(38_671_000, 3655) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -139,10 +145,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `Uniques::CollectionMaxSupply` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`) fn destroy_collection() -> Weight { // Proof Size summary in bytes: - // Measured: `945` + // Measured: `978` // Estimated: `4087` - // Minimum execution time: 67_374_000 picoseconds. - Weight::from_parts(68_041_000, 4087) + // Minimum execution time: 45_351_000 picoseconds. + Weight::from_parts(46_690_000, 4087) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -164,11 +170,11 @@ impl WeightInfo for BasiliskWeight { /// Proof: `NFT::Items` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`) fn burn() -> Weight { // Proof Size summary in bytes: - // Measured: `1108` + // Measured: `1141` // Estimated: `4087` - // Minimum execution time: 57_449_000 picoseconds. - Weight::from_parts(58_046_000, 4087) + // Minimum execution time: 39_440_000 picoseconds. + Weight::from_parts(41_081_000, 4087) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } -} +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/pallet_preimage.rs b/runtime/basilisk/src/weights/pallet_preimage.rs new file mode 100644 index 00000000000..847534cfad5 --- /dev/null +++ b/runtime/basilisk/src/weights/pallet_preimage.rs @@ -0,0 +1,264 @@ +// This file is part of Basilisk. + +// Copyright (C) 2020-2023 Intergalactic, Limited (GIB). +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + + +//! Autogenerated weights for `pallet_preimage` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` + +// Executed Command: +// ./target/release/basilisk +// benchmark +// pallet +// --wasm-execution=compiled +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 +// --template=.maintain/pallet-weight-template-no-back.hbs +// --json-file +// raw.json +// --output +// weights/ + +#![cfg_attr(rustfmt, rustfmt_skip)] +#![allow(unused_parens)] +#![allow(unused_imports)] +#![allow(missing_docs)] + +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; + +/// Weights for `pallet_preimage`. +pub struct WeightInfo(PhantomData); + +/// Weights for `pallet_preimage` using the Basilisk node and recommended hardware. +pub struct BasiliskWeight(PhantomData); +impl pallet_preimage::WeightInfo for BasiliskWeight { + /// Storage: `Preimage::StatusFor` (r:1 w:0) + /// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + /// Storage: `Preimage::RequestStatusFor` (r:1 w:1) + /// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + /// Storage: `Balances::Holds` (r:1 w:1) + /// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`) + /// Storage: `Preimage::PreimageFor` (r:0 w:1) + /// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`) + /// The range of component `s` is `[0, 4194304]`. + fn note_preimage(s: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `109` + // Estimated: `3556` + // Minimum execution time: 49_460_000 picoseconds. + Weight::from_parts(50_131_000, 3556) + // Standard Error: 2 + .saturating_add(Weight::from_parts(1_663, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) + } + /// Storage: `Preimage::StatusFor` (r:1 w:0) + /// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + /// Storage: `Preimage::RequestStatusFor` (r:1 w:1) + /// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + /// Storage: `Preimage::PreimageFor` (r:0 w:1) + /// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`) + /// The range of component `s` is `[0, 4194304]`. + fn note_requested_preimage(s: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `173` + // Estimated: `3556` + // Minimum execution time: 15_220_000 picoseconds. + Weight::from_parts(24_026_943, 3556) + // Standard Error: 3 + .saturating_add(Weight::from_parts(1_618, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + } + /// Storage: `Preimage::StatusFor` (r:1 w:0) + /// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + /// Storage: `Preimage::RequestStatusFor` (r:1 w:1) + /// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + /// Storage: `Preimage::PreimageFor` (r:0 w:1) + /// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`) + /// The range of component `s` is `[0, 4194304]`. + fn note_no_deposit_preimage(s: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `173` + // Estimated: `3556` + // Minimum execution time: 15_200_000 picoseconds. + Weight::from_parts(15_670_000, 3556) + // Standard Error: 2 + .saturating_add(Weight::from_parts(1_614, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + } + /// Storage: `Preimage::StatusFor` (r:1 w:0) + /// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + /// Storage: `Preimage::RequestStatusFor` (r:1 w:1) + /// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + /// Storage: `Balances::Holds` (r:1 w:1) + /// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`) + /// Storage: `Preimage::PreimageFor` (r:0 w:1) + /// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`) + fn unnote_preimage() -> Weight { + // Proof Size summary in bytes: + // Measured: `311` + // Estimated: `3556` + // Minimum execution time: 54_881_000 picoseconds. + Weight::from_parts(56_271_000, 3556) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) + } + /// Storage: `Preimage::StatusFor` (r:1 w:0) + /// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + /// Storage: `Preimage::RequestStatusFor` (r:1 w:1) + /// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + /// Storage: `Preimage::PreimageFor` (r:0 w:1) + /// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`) + fn unnote_no_deposit_preimage() -> Weight { + // Proof Size summary in bytes: + // Measured: `211` + // Estimated: `3556` + // Minimum execution time: 25_030_000 picoseconds. + Weight::from_parts(28_930_000, 3556) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + } + /// Storage: `Preimage::StatusFor` (r:1 w:0) + /// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + /// Storage: `Preimage::RequestStatusFor` (r:1 w:1) + /// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + fn request_preimage() -> Weight { + // Proof Size summary in bytes: + // Measured: `255` + // Estimated: `3556` + // Minimum execution time: 19_380_000 picoseconds. + Weight::from_parts(22_400_000, 3556) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Preimage::StatusFor` (r:1 w:0) + /// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + /// Storage: `Preimage::RequestStatusFor` (r:1 w:1) + /// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + fn request_no_deposit_preimage() -> Weight { + // Proof Size summary in bytes: + // Measured: `211` + // Estimated: `3556` + // Minimum execution time: 14_950_000 picoseconds. + Weight::from_parts(16_710_000, 3556) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Preimage::StatusFor` (r:1 w:0) + /// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + /// Storage: `Preimage::RequestStatusFor` (r:1 w:1) + /// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + fn request_unnoted_preimage() -> Weight { + // Proof Size summary in bytes: + // Measured: `109` + // Estimated: `3556` + // Minimum execution time: 15_291_000 picoseconds. + Weight::from_parts(16_320_000, 3556) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Preimage::StatusFor` (r:1 w:0) + /// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + /// Storage: `Preimage::RequestStatusFor` (r:1 w:1) + /// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + fn request_requested_preimage() -> Weight { + // Proof Size summary in bytes: + // Measured: `173` + // Estimated: `3556` + // Minimum execution time: 10_710_000 picoseconds. + Weight::from_parts(11_370_000, 3556) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Preimage::StatusFor` (r:1 w:0) + /// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + /// Storage: `Preimage::RequestStatusFor` (r:1 w:1) + /// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + /// Storage: `Preimage::PreimageFor` (r:0 w:1) + /// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`) + fn unrequest_preimage() -> Weight { + // Proof Size summary in bytes: + // Measured: `211` + // Estimated: `3556` + // Minimum execution time: 22_911_000 picoseconds. + Weight::from_parts(26_451_000, 3556) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + } + /// Storage: `Preimage::StatusFor` (r:1 w:0) + /// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + /// Storage: `Preimage::RequestStatusFor` (r:1 w:1) + /// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + fn unrequest_unnoted_preimage() -> Weight { + // Proof Size summary in bytes: + // Measured: `173` + // Estimated: `3556` + // Minimum execution time: 10_960_000 picoseconds. + Weight::from_parts(11_380_000, 3556) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Preimage::StatusFor` (r:1 w:0) + /// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + /// Storage: `Preimage::RequestStatusFor` (r:1 w:1) + /// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + fn unrequest_multi_referenced_preimage() -> Weight { + // Proof Size summary in bytes: + // Measured: `173` + // Estimated: `3556` + // Minimum execution time: 11_140_000 picoseconds. + Weight::from_parts(11_450_000, 3556) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Preimage::StatusFor` (r:1023 w:1023) + /// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + /// Storage: `System::Account` (r:1023 w:1023) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// Storage: `Balances::Holds` (r:1023 w:1023) + /// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`) + /// Storage: `Preimage::RequestStatusFor` (r:0 w:1023) + /// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + /// The range of component `n` is `[1, 1024]`. + fn ensure_updated(n: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `0 + n * (227 ±0)` + // Estimated: `990 + n * (2603 ±0)` + // Minimum execution time: 53_550_000 picoseconds. + Weight::from_parts(54_331_000, 990) + // Standard Error: 493_174 + .saturating_add(Weight::from_parts(60_728_567, 0).saturating_mul(n.into())) + .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(n.into()))) + .saturating_add(T::DbWeight::get().writes((4_u64).saturating_mul(n.into()))) + .saturating_add(Weight::from_parts(0, 2603).saturating_mul(n.into())) + } +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/pallet_proxy.rs b/runtime/basilisk/src/weights/pallet_proxy.rs new file mode 100644 index 00000000000..199a0ae4f11 --- /dev/null +++ b/runtime/basilisk/src/weights/pallet_proxy.rs @@ -0,0 +1,225 @@ +// This file is part of Basilisk. + +// Copyright (C) 2020-2023 Intergalactic, Limited (GIB). +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + + +//! Autogenerated weights for `pallet_proxy` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` + +// Executed Command: +// ./target/release/basilisk +// benchmark +// pallet +// --wasm-execution=compiled +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 +// --template=.maintain/pallet-weight-template-no-back.hbs +// --json-file +// raw.json +// --output +// weights/ + +#![cfg_attr(rustfmt, rustfmt_skip)] +#![allow(unused_parens)] +#![allow(unused_imports)] +#![allow(missing_docs)] + +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; + +/// Weights for `pallet_proxy`. +pub struct WeightInfo(PhantomData); + +/// Weights for `pallet_proxy` using the Basilisk node and recommended hardware. +pub struct BasiliskWeight(PhantomData); +impl pallet_proxy::WeightInfo for BasiliskWeight { + /// Storage: `Proxy::Proxies` (r:1 w:0) + /// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`) + /// The range of component `p` is `[1, 31]`. + fn proxy(p: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `194 + p * (37 ±0)` + // Estimated: `4706` + // Minimum execution time: 13_060_000 picoseconds. + Weight::from_parts(13_836_892, 4706) + // Standard Error: 2_136 + .saturating_add(Weight::from_parts(47_435, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(1_u64)) + } + /// Storage: `Proxy::Proxies` (r:1 w:0) + /// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`) + /// Storage: `Proxy::Announcements` (r:1 w:1) + /// Proof: `Proxy::Announcements` (`max_values`: None, `max_size`: Some(2233), added: 4708, mode: `MaxEncodedLen`) + /// Storage: `System::Account` (r:1 w:1) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// The range of component `a` is `[0, 31]`. + /// The range of component `p` is `[1, 31]`. + fn proxy_announced(a: u32, p: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `521 + a * (68 ±0) + p * (37 ±0)` + // Estimated: `5698` + // Minimum execution time: 32_841_000 picoseconds. + Weight::from_parts(32_879_068, 5698) + // Standard Error: 2_407 + .saturating_add(Weight::from_parts(175_388, 0).saturating_mul(a.into())) + // Standard Error: 2_487 + .saturating_add(Weight::from_parts(55_873, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + } + /// Storage: `Proxy::Announcements` (r:1 w:1) + /// Proof: `Proxy::Announcements` (`max_values`: None, `max_size`: Some(2233), added: 4708, mode: `MaxEncodedLen`) + /// Storage: `System::Account` (r:1 w:1) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// The range of component `a` is `[0, 31]`. + /// The range of component `p` is `[1, 31]`. + fn remove_announcement(a: u32, p: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `436 + a * (68 ±0)` + // Estimated: `5698` + // Minimum execution time: 22_000_000 picoseconds. + Weight::from_parts(23_493_605, 5698) + // Standard Error: 1_846 + .saturating_add(Weight::from_parts(153_557, 0).saturating_mul(a.into())) + // Standard Error: 1_908 + .saturating_add(Weight::from_parts(12_905, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + } + /// Storage: `Proxy::Announcements` (r:1 w:1) + /// Proof: `Proxy::Announcements` (`max_values`: None, `max_size`: Some(2233), added: 4708, mode: `MaxEncodedLen`) + /// Storage: `System::Account` (r:1 w:1) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// The range of component `a` is `[0, 31]`. + /// The range of component `p` is `[1, 31]`. + fn reject_announcement(a: u32, p: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `436 + a * (68 ±0)` + // Estimated: `5698` + // Minimum execution time: 21_960_000 picoseconds. + Weight::from_parts(23_108_597, 5698) + // Standard Error: 1_937 + .saturating_add(Weight::from_parts(163_494, 0).saturating_mul(a.into())) + // Standard Error: 2_001 + .saturating_add(Weight::from_parts(10_529, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + } + /// Storage: `Proxy::Proxies` (r:1 w:0) + /// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`) + /// Storage: `Proxy::Announcements` (r:1 w:1) + /// Proof: `Proxy::Announcements` (`max_values`: None, `max_size`: Some(2233), added: 4708, mode: `MaxEncodedLen`) + /// Storage: `System::Account` (r:1 w:1) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// The range of component `a` is `[0, 31]`. + /// The range of component `p` is `[1, 31]`. + fn announce(a: u32, p: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `453 + a * (68 ±0) + p * (37 ±0)` + // Estimated: `5698` + // Minimum execution time: 29_211_000 picoseconds. + Weight::from_parts(29_294_988, 5698) + // Standard Error: 1_783 + .saturating_add(Weight::from_parts(161_774, 0).saturating_mul(a.into())) + // Standard Error: 1_842 + .saturating_add(Weight::from_parts(44_272, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + } + /// Storage: `Proxy::Proxies` (r:1 w:1) + /// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`) + /// The range of component `p` is `[1, 31]`. + fn add_proxy(p: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `194 + p * (37 ±0)` + // Estimated: `4706` + // Minimum execution time: 21_110_000 picoseconds. + Weight::from_parts(22_073_066, 4706) + // Standard Error: 2_258 + .saturating_add(Weight::from_parts(60_700, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Proxy::Proxies` (r:1 w:1) + /// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`) + /// The range of component `p` is `[1, 31]`. + fn remove_proxy(p: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `194 + p * (37 ±0)` + // Estimated: `4706` + // Minimum execution time: 20_950_000 picoseconds. + Weight::from_parts(22_457_790, 4706) + // Standard Error: 3_317 + .saturating_add(Weight::from_parts(47_329, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Proxy::Proxies` (r:1 w:1) + /// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`) + /// The range of component `p` is `[1, 31]`. + fn remove_proxies(p: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `194 + p * (37 ±0)` + // Estimated: `4706` + // Minimum execution time: 19_960_000 picoseconds. + Weight::from_parts(21_169_089, 4706) + // Standard Error: 1_947 + .saturating_add(Weight::from_parts(64_614, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Proxy::Proxies` (r:1 w:1) + /// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`) + /// The range of component `p` is `[1, 31]`. + fn create_pure(p: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `206` + // Estimated: `4706` + // Minimum execution time: 22_741_000 picoseconds. + Weight::from_parts(23_674_536, 4706) + // Standard Error: 2_215 + .saturating_add(Weight::from_parts(54_930, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Proxy::Proxies` (r:1 w:1) + /// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`) + /// The range of component `p` is `[0, 30]`. + fn kill_pure(p: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `231 + p * (37 ±0)` + // Estimated: `4706` + // Minimum execution time: 21_321_000 picoseconds. + Weight::from_parts(22_661_788, 4706) + // Standard Error: 2_743 + .saturating_add(Weight::from_parts(50_427, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/route_executor.rs b/runtime/basilisk/src/weights/pallet_route_executor.rs similarity index 65% rename from runtime/basilisk/src/weights/route_executor.rs rename to runtime/basilisk/src/weights/pallet_route_executor.rs index 5e2f7b8a1f7..0198ce25260 100644 --- a/runtime/basilisk/src/weights/route_executor.rs +++ b/runtime/basilisk/src/weights/pallet_route_executor.rs @@ -15,43 +15,50 @@ // See the License for the specific language governing permissions and // limitations under the License. + //! Autogenerated weights for `pallet_route_executor` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-12-07, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// target/release/basilisk +// ./target/release/basilisk // benchmark // pallet -// --chain=dev -// --steps=10 -// --repeat=30 // --wasm-execution=compiled -// --heap-pages=4096 +// --pallet +// pallet-route-executor +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 // --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=pallet-route-executor -// --output=weights-1.1.0/route_executor.rs -// --extrinsic=* +// --json-file +// raw.json +// --output +// weights.rs +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] +#![allow(missing_docs)] -use frame_support::{ - traits::Get, - weights::{constants::RocksDbWeight, Weight}, -}; -use sp_std::marker::PhantomData; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; -use pallet_route_executor::weights::WeightInfo; +/// Weights for `pallet_route_executor`. +pub struct WeightInfo(PhantomData); +/// Weights for `pallet_route_executor` using the Basilisk node and recommended hardware. pub struct BasiliskWeight(PhantomData); - -impl WeightInfo for BasiliskWeight { +impl pallet_route_executor::WeightInfo for BasiliskWeight { /// Storage: `LBP::PoolData` (r:1 w:0) /// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`) /// Storage: `Tokens::Accounts` (r:5 w:5) @@ -63,14 +70,14 @@ impl WeightInfo for BasiliskWeight { /// Storage: `AssetRegistry::Assets` (r:2 w:0) /// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`) /// The range of component `c` is `[0, 1]`. - fn calculate_and_execute_sell_in_lbp(c: u32) -> Weight { + fn calculate_and_execute_sell_in_lbp(c: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `2792` + // Measured: `2920` // Estimated: `13905` - // Minimum execution time: 311_089_000 picoseconds. - Weight::from_parts(313_538_367, 13905) - // Standard Error: 135_932 - .saturating_add(Weight::from_parts(51_727_507, 0).saturating_mul(c.into())) + // Minimum execution time: 233_581_000 picoseconds. + Weight::from_parts(245_887_677, 13905) + // Standard Error: 2_192_620 + .saturating_add(Weight::from_parts(39_324_522, 0).saturating_mul(c.into())) .saturating_add(T::DbWeight::get().reads(12_u64)) .saturating_add(T::DbWeight::get().writes(7_u64)) } @@ -86,16 +93,16 @@ impl WeightInfo for BasiliskWeight { /// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`) /// The range of component `c` is `[1, 2]`. /// The range of component `b` is `[0, 1]`. - fn calculate_and_execute_buy_in_lbp(c: u32, b: u32) -> Weight { + fn calculate_and_execute_buy_in_lbp(c: u32, b: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `1534 + b * (1274 ±0)` - // Estimated: `6156 + b * (7749 ±99_524_913_928_918_768)` - // Minimum execution time: 73_124_000 picoseconds. - Weight::from_parts(73_641_000, 6156) - // Standard Error: 603_015 - .saturating_add(Weight::from_parts(2_335_052, 0).saturating_mul(c.into())) - // Standard Error: 1_323_790 - .saturating_add(Weight::from_parts(245_212_503, 0).saturating_mul(b.into())) + // Measured: `1563 + b * (1367 ±0)` + // Estimated: `6156 + b * (7749 ±7_072_116_491_613_192)` + // Minimum execution time: 58_351_000 picoseconds. + Weight::from_parts(59_930_000, 6156) + // Standard Error: 171_790 + .saturating_add(Weight::from_parts(1_239_175, 0).saturating_mul(c.into())) + // Standard Error: 382_625 + .saturating_add(Weight::from_parts(180_872_519, 0).saturating_mul(b.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().reads((9_u64).saturating_mul(b.into()))) .saturating_add(T::DbWeight::get().writes((7_u64).saturating_mul(b.into()))) @@ -103,29 +110,39 @@ impl WeightInfo for BasiliskWeight { } /// Storage: `Router::Routes` (r:1 w:1) /// Proof: `Router::Routes` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`) - /// Storage: `Tokens::Accounts` (r:12 w:0) + /// Storage: `System::Account` (r:7 w:0) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// Storage: `Tokens::Accounts` (r:15 w:0) /// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) - /// Storage: `Tokens::TotalIssuance` (r:2 w:0) - /// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`) - /// Storage: `AssetRegistry::Assets` (r:4 w:0) + /// Storage: `XYK::ShareToken` (r:6 w:0) + /// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) + /// Storage: `AssetRegistry::Assets` (r:5 w:0) /// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:5 w:0) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) /// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0) /// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) - /// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:4 w:0) + /// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:5 w:0) /// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`) - /// Storage: `XYK::ShareToken` (r:4 w:0) - /// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) /// Storage: `EmaOracle::Accumulator` (r:1 w:0) /// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(4441), added: 4936, mode: `MaxEncodedLen`) + /// Storage: `Tokens::TotalIssuance` (r:1 w:0) + /// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`) fn set_route_for_xyk() -> Weight { // Proof Size summary in bytes: - // Measured: `4396` - // Estimated: `31986` - // Minimum execution time: 1_640_100_000 picoseconds. - Weight::from_parts(1_648_958_000, 31986) - .saturating_add(T::DbWeight::get().reads(34_u64)) + // Measured: `5244` + // Estimated: `39735` + // Minimum execution time: 1_518_883_000 picoseconds. + Weight::from_parts(2_317_410_000, 39735) + .saturating_add(T::DbWeight::get().reads(42_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Router::Routes` (r:0 w:1) + /// Proof: `Router::Routes` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`) + fn force_insert_route() -> Weight { + // Proof Size summary in bytes: + // Measured: `963` + // Estimated: `0` + // Minimum execution time: 23_221_000 picoseconds. + Weight::from_parts(38_020_000, 0) .saturating_add(T::DbWeight::get().writes(1_u64)) } -} +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/scheduler.rs b/runtime/basilisk/src/weights/pallet_scheduler.rs similarity index 62% rename from runtime/basilisk/src/weights/scheduler.rs rename to runtime/basilisk/src/weights/pallet_scheduler.rs index 2b11409240a..c50fe1f21a3 100644 --- a/runtime/basilisk/src/weights/scheduler.rs +++ b/runtime/basilisk/src/weights/pallet_scheduler.rs @@ -15,65 +15,72 @@ // See the License for the specific language governing permissions and // limitations under the License. + //! Autogenerated weights for `pallet_scheduler` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-12-06, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// target/release/basilisk +// ./target/release/basilisk // benchmark // pallet -// --chain=dev -// --steps=10 -// --repeat=30 // --wasm-execution=compiled -// --heap-pages=4096 +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 // --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=pallet-scheduler -// --output=weights-1.1.0/scheduler.rs -// --extrinsic=* +// --json-file +// raw.json +// --output +// weights/ +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] +#![allow(missing_docs)] -use frame_support::{ - traits::Get, - weights::{constants::RocksDbWeight, Weight}, -}; -use sp_std::marker::PhantomData; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; -use pallet_scheduler::weights::WeightInfo; +/// Weights for `pallet_scheduler`. +pub struct WeightInfo(PhantomData); +/// Weights for `pallet_scheduler` using the Basilisk node and recommended hardware. pub struct BasiliskWeight(PhantomData); - -impl WeightInfo for BasiliskWeight { +impl pallet_scheduler::WeightInfo for BasiliskWeight { /// Storage: `Scheduler::IncompleteSince` (r:1 w:1) /// Proof: `Scheduler::IncompleteSince` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) fn service_agendas_base() -> Weight { // Proof Size summary in bytes: // Measured: `31` // Estimated: `1489` - // Minimum execution time: 4_587_000 picoseconds. - Weight::from_parts(4_667_000, 1489) + // Minimum execution time: 2_600_000 picoseconds. + Weight::from_parts(2_760_000, 1489) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: `Scheduler::Agenda` (r:1 w:1) /// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`) /// The range of component `s` is `[0, 50]`. - fn service_agenda_base(s: u32) -> Weight { + fn service_agenda_base(s: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `78 + s * (177 ±0)` // Estimated: `42428` - // Minimum execution time: 4_573_000 picoseconds. - Weight::from_parts(7_765_796, 42428) - // Standard Error: 6_034 - .saturating_add(Weight::from_parts(919_183, 0).saturating_mul(s.into())) + // Minimum execution time: 3_590_000 picoseconds. + Weight::from_parts(5_975_558, 42428) + // Standard Error: 2_787 + .saturating_add(Weight::from_parts(450_967, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -81,23 +88,25 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 8_192_000 picoseconds. - Weight::from_parts(8_344_000, 0) + // Minimum execution time: 3_470_000 picoseconds. + Weight::from_parts(3_610_000, 0) } /// Storage: `Preimage::PreimageFor` (r:1 w:1) /// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `Measured`) - /// Storage: `Preimage::StatusFor` (r:1 w:1) + /// Storage: `Preimage::StatusFor` (r:1 w:0) /// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) + /// Storage: `Preimage::RequestStatusFor` (r:1 w:1) + /// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`) /// The range of component `s` is `[128, 4194304]`. - fn service_task_fetched(s: u32) -> Weight { + fn service_task_fetched(s: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `246 + s * (1 ±0)` - // Estimated: `3709 + s * (1 ±0)` - // Minimum execution time: 27_177_000 picoseconds. - Weight::from_parts(27_454_000, 3709) - // Standard Error: 4 - .saturating_add(Weight::from_parts(1_161, 0).saturating_mul(s.into())) - .saturating_add(T::DbWeight::get().reads(2_u64)) + // Estimated: `3711 + s * (1 ±0)` + // Minimum execution time: 17_911_000 picoseconds. + Weight::from_parts(18_060_000, 3711) + // Standard Error: 1 + .saturating_add(Weight::from_parts(772, 0).saturating_mul(s.into())) + .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) .saturating_add(Weight::from_parts(0, 1).saturating_mul(s.into())) } @@ -107,41 +116,42 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 10_288_000 picoseconds. - Weight::from_parts(10_607_000, 0).saturating_add(T::DbWeight::get().writes(1_u64)) + // Minimum execution time: 5_070_000 picoseconds. + Weight::from_parts(5_250_000, 0) + .saturating_add(T::DbWeight::get().writes(1_u64)) } fn service_task_periodic() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 8_217_000 picoseconds. - Weight::from_parts(8_355_000, 0) + // Minimum execution time: 3_370_000 picoseconds. + Weight::from_parts(3_470_000, 0) } fn execute_dispatch_signed() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_572_000 picoseconds. - Weight::from_parts(4_670_000, 0) + // Minimum execution time: 2_760_000 picoseconds. + Weight::from_parts(2_870_000, 0) } fn execute_dispatch_unsigned() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 4_400_000 picoseconds. - Weight::from_parts(4_513_000, 0) + // Minimum execution time: 2_640_000 picoseconds. + Weight::from_parts(2_740_000, 0) } /// Storage: `Scheduler::Agenda` (r:1 w:1) /// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`) /// The range of component `s` is `[0, 49]`. - fn schedule(s: u32) -> Weight { + fn schedule(s: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `78 + s * (177 ±0)` // Estimated: `42428` - // Minimum execution time: 18_375_000 picoseconds. - Weight::from_parts(21_573_549, 42428) - // Standard Error: 5_764 - .saturating_add(Weight::from_parts(922_228, 0).saturating_mul(s.into())) + // Minimum execution time: 10_360_000 picoseconds. + Weight::from_parts(13_060_730, 42428) + // Standard Error: 3_232 + .saturating_add(Weight::from_parts(473_762, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -150,14 +160,14 @@ impl WeightInfo for BasiliskWeight { /// Storage: `Scheduler::Lookup` (r:0 w:1) /// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`) /// The range of component `s` is `[1, 50]`. - fn cancel(s: u32) -> Weight { + fn cancel(s: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `78 + s * (177 ±0)` // Estimated: `42428` - // Minimum execution time: 24_061_000 picoseconds. - Weight::from_parts(22_976_505, 42428) - // Standard Error: 1_824 - .saturating_add(Weight::from_parts(1_634_940, 0).saturating_mul(s.into())) + // Minimum execution time: 14_840_000 picoseconds. + Weight::from_parts(13_169_507, 42428) + // Standard Error: 4_166 + .saturating_add(Weight::from_parts(733_142, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -166,14 +176,14 @@ impl WeightInfo for BasiliskWeight { /// Storage: `Scheduler::Agenda` (r:1 w:1) /// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`) /// The range of component `s` is `[0, 49]`. - fn schedule_named(s: u32) -> Weight { + fn schedule_named(s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `192 + s * (187 ±0)` + // Measured: `255 + s * (185 ±0)` // Estimated: `42428` - // Minimum execution time: 22_951_000 picoseconds. - Weight::from_parts(26_389_660, 42428) - // Standard Error: 6_664 - .saturating_add(Weight::from_parts(980_392, 0).saturating_mul(s.into())) + // Minimum execution time: 13_380_000 picoseconds. + Weight::from_parts(17_008_802, 42428) + // Standard Error: 3_328 + .saturating_add(Weight::from_parts(498_329, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -182,15 +192,15 @@ impl WeightInfo for BasiliskWeight { /// Storage: `Scheduler::Agenda` (r:1 w:1) /// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`) /// The range of component `s` is `[1, 50]`. - fn cancel_named(s: u32) -> Weight { + fn cancel_named(s: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `263 + s * (186 ±0)` + // Measured: `281 + s * (185 ±0)` // Estimated: `42428` - // Minimum execution time: 26_389_000 picoseconds. - Weight::from_parts(25_843_381, 42428) - // Standard Error: 2_318 - .saturating_add(Weight::from_parts(1_657_000, 0).saturating_mul(s.into())) + // Minimum execution time: 15_860_000 picoseconds. + Weight::from_parts(15_298_490, 42428) + // Standard Error: 4_632 + .saturating_add(Weight::from_parts(750_412, 0).saturating_mul(s.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } -} +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/state_trie.rs b/runtime/basilisk/src/weights/pallet_state_trie_migration.rs similarity index 55% rename from runtime/basilisk/src/weights/state_trie.rs rename to runtime/basilisk/src/weights/pallet_state_trie_migration.rs index 863068a8ce8..ca4643e6c35 100644 --- a/runtime/basilisk/src/weights/state_trie.rs +++ b/runtime/basilisk/src/weights/pallet_state_trie_migration.rs @@ -15,51 +15,63 @@ // See the License for the specific language governing permissions and // limitations under the License. + //! Autogenerated weights for `pallet_state_trie_migration` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2024-01-26, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// target/release/basilisk +// ./target/release/basilisk // benchmark // pallet -// --chain=dev -// --steps=10 -// --repeat=30 // --wasm-execution=compiled -// --heap-pages=4096 +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 // --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=pallet-state-trie-migration -// --output=weights-1.1.0/state_trie.rs -// --extrinsic=* +// --json-file +// raw.json +// --output +// weights/ +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] +#![allow(missing_docs)] -use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; -use pallet_state_trie_migration::weights::WeightInfo; +/// Weights for `pallet_state_trie_migration`. +pub struct WeightInfo(PhantomData); /// Weights for `pallet_state_trie_migration` using the Basilisk node and recommended hardware. pub struct BasiliskWeight(PhantomData); -impl WeightInfo for BasiliskWeight { +impl pallet_state_trie_migration::WeightInfo for BasiliskWeight { /// Storage: `StateTrieMigration::SignedMigrationMaxLimits` (r:1 w:0) /// Proof: `StateTrieMigration::SignedMigrationMaxLimits` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`) + /// Storage: `Balances::Holds` (r:1 w:0) + /// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`) /// Storage: `StateTrieMigration::MigrationProcess` (r:1 w:1) /// Proof: `StateTrieMigration::MigrationProcess` (`max_values`: Some(1), `max_size`: Some(1042), added: 1537, mode: `MaxEncodedLen`) fn continue_migrate() -> Weight { // Proof Size summary in bytes: // Measured: `141` - // Estimated: `2527` - // Minimum execution time: 23_654_000 picoseconds. - Weight::from_parts(24_101_000, 2527) - .saturating_add(T::DbWeight::get().reads(2_u64)) + // Estimated: `3550` + // Minimum execution time: 19_200_000 picoseconds. + Weight::from_parts(20_090_000, 3550) + .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } /// Storage: `StateTrieMigration::SignedMigrationMaxLimits` (r:1 w:0) @@ -68,58 +80,69 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `109` // Estimated: `1493` - // Minimum execution time: 7_170_000 picoseconds. - Weight::from_parts(7_487_000, 1493).saturating_add(T::DbWeight::get().reads(1_u64)) + // Minimum execution time: 4_830_000 picoseconds. + Weight::from_parts(5_070_000, 1493) + .saturating_add(T::DbWeight::get().reads(1_u64)) } + /// Storage: `Balances::Holds` (r:1 w:0) + /// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`) fn migrate_custom_top_success() -> Weight { // Proof Size summary in bytes: // Measured: `0` - // Estimated: `0` - // Minimum execution time: 13_335_000 picoseconds. - Weight::from_parts(13_596_000, 0) + // Estimated: `3550` + // Minimum execution time: 11_510_000 picoseconds. + Weight::from_parts(12_190_000, 3550) + .saturating_add(T::DbWeight::get().reads(1_u64)) } + /// Storage: `Balances::Holds` (r:1 w:1) + /// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`) /// Storage: UNKNOWN KEY `0x666f6f` (r:1 w:1) /// Proof: UNKNOWN KEY `0x666f6f` (r:1 w:1) fn migrate_custom_top_fail() -> Weight { // Proof Size summary in bytes: // Measured: `146` // Estimated: `3611` - // Minimum execution time: 40_202_000 picoseconds. - Weight::from_parts(40_793_000, 3611) - .saturating_add(T::DbWeight::get().reads(1_u64)) - .saturating_add(T::DbWeight::get().writes(1_u64)) + // Minimum execution time: 68_381_000 picoseconds. + Weight::from_parts(71_370_000, 3611) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } + /// Storage: `Balances::Holds` (r:1 w:0) + /// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`) fn migrate_custom_child_success() -> Weight { // Proof Size summary in bytes: // Measured: `0` - // Estimated: `0` - // Minimum execution time: 13_441_000 picoseconds. - Weight::from_parts(13_910_000, 0) + // Estimated: `3550` + // Minimum execution time: 12_120_000 picoseconds. + Weight::from_parts(12_680_000, 3550) + .saturating_add(T::DbWeight::get().reads(1_u64)) } + /// Storage: `Balances::Holds` (r:1 w:1) + /// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`) /// Storage: UNKNOWN KEY `0x666f6f` (r:1 w:1) /// Proof: UNKNOWN KEY `0x666f6f` (r:1 w:1) fn migrate_custom_child_fail() -> Weight { // Proof Size summary in bytes: // Measured: `106` // Estimated: `3571` - // Minimum execution time: 39_284_000 picoseconds. - Weight::from_parts(39_823_000, 3571) - .saturating_add(T::DbWeight::get().reads(1_u64)) - .saturating_add(T::DbWeight::get().writes(1_u64)) + // Minimum execution time: 70_851_000 picoseconds. + Weight::from_parts(72_610_000, 3571) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) } /// Storage: UNKNOWN KEY `0x6b6579` (r:1 w:1) /// Proof: UNKNOWN KEY `0x6b6579` (r:1 w:1) /// The range of component `v` is `[1, 4194304]`. - fn process_top_key(v: u32) -> Weight { + fn process_top_key(v: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `262 + v * (1 ±0)` - // Estimated: `3725 + v * (1 ±0)` - // Minimum execution time: 6_940_000 picoseconds. - Weight::from_parts(7_084_000, 3725) - // Standard Error: 2 - .saturating_add(Weight::from_parts(1_372, 0).saturating_mul(v.into())) + // Estimated: `3727 + v * (1 ±0)` + // Minimum execution time: 5_000_000 picoseconds. + Weight::from_parts(5_080_000, 3727) + // Standard Error: 1 + .saturating_add(Weight::from_parts(1_081, 0).saturating_mul(v.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) .saturating_add(Weight::from_parts(0, 1).saturating_mul(v.into())) } -} +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/timestamp.rs b/runtime/basilisk/src/weights/pallet_timestamp.rs similarity index 61% rename from runtime/basilisk/src/weights/timestamp.rs rename to runtime/basilisk/src/weights/pallet_timestamp.rs index e8c4a958256..050b2708fc4 100644 --- a/runtime/basilisk/src/weights/timestamp.rs +++ b/runtime/basilisk/src/weights/pallet_timestamp.rs @@ -15,51 +15,58 @@ // See the License for the specific language governing permissions and // limitations under the License. + //! Autogenerated weights for `pallet_timestamp` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-12-06, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// target/release/basilisk +// ./target/release/basilisk // benchmark // pallet -// --chain=dev -// --steps=10 -// --repeat=30 // --wasm-execution=compiled -// --heap-pages=4096 +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 // --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=pallet-timestamp -// --output=weights-1.1.0/timestamp.rs -// --extrinsic=* +// --json-file +// raw.json +// --output +// weights/ +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] +#![allow(missing_docs)] -use frame_support::{ - traits::Get, - weights::{constants::RocksDbWeight, Weight}, -}; -use sp_std::marker::PhantomData; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; -use pallet_timestamp::weights::WeightInfo; +/// Weights for `pallet_timestamp`. +pub struct WeightInfo(PhantomData); +/// Weights for `pallet_timestamp` using the Basilisk node and recommended hardware. pub struct BasiliskWeight(PhantomData); - -impl WeightInfo for BasiliskWeight { +impl pallet_timestamp::WeightInfo for BasiliskWeight { /// Storage: `Timestamp::Now` (r:1 w:1) /// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`) fn set() -> Weight { // Proof Size summary in bytes: // Measured: `42` // Estimated: `1493` - // Minimum execution time: 10_265_000 picoseconds. - Weight::from_parts(10_513_000, 1493) + // Minimum execution time: 5_520_000 picoseconds. + Weight::from_parts(5_860_000, 1493) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -67,7 +74,7 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `94` // Estimated: `0` - // Minimum execution time: 5_546_000 picoseconds. - Weight::from_parts(5_705_000, 0) + // Minimum execution time: 3_750_000 picoseconds. + Weight::from_parts(4_000_000, 0) } -} +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/tips.rs b/runtime/basilisk/src/weights/pallet_tips.rs similarity index 72% rename from runtime/basilisk/src/weights/tips.rs rename to runtime/basilisk/src/weights/pallet_tips.rs index ba5009ec661..23b2391b75d 100644 --- a/runtime/basilisk/src/weights/tips.rs +++ b/runtime/basilisk/src/weights/pallet_tips.rs @@ -18,38 +18,47 @@ //! Autogenerated weights for `pallet_tips` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2024-02-26, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// target/release/basilisk +// ./target/release/basilisk // benchmark // pallet -// --chain=dev -// --steps=10 -// --repeat=30 // --wasm-execution=compiled -// --heap-pages=4096 +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 // --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=pallet-tips -// --output=weights-1.1.0/tips.rs -// --extrinsic=* +// --json-file +// raw.json +// --output +// weights/ #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] #![allow(missing_docs)] -use frame_support::{traits::Get, weights::Weight}; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; use core::marker::PhantomData; -use pallet_tips::WeightInfo; + +/// Weights for `pallet_tips`. +pub struct WeightInfo(PhantomData); /// Weights for `pallet_tips` using the Basilisk node and recommended hardware. pub struct BasiliskWeight(PhantomData); -impl WeightInfo for BasiliskWeight { +impl pallet_tips::WeightInfo for BasiliskWeight { /// Storage: `Tips::Reasons` (r:1 w:1) /// Proof: `Tips::Reasons` (`max_values`: None, `max_size`: None, mode: `Measured`) /// Storage: `Tips::Tips` (r:1 w:1) @@ -59,10 +68,10 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `3` // Estimated: `3468` - // Minimum execution time: 39_914_000 picoseconds. - Weight::from_parts(40_759_457, 3468) - // Standard Error: 51 - .saturating_add(Weight::from_parts(1_534, 0).saturating_mul(r.into())) + // Minimum execution time: 26_051_000 picoseconds. + Weight::from_parts(27_276_448, 3468) + // Standard Error: 75 + .saturating_add(Weight::from_parts(939, 0).saturating_mul(r.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -74,8 +83,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `220` // Estimated: `3685` - // Minimum execution time: 37_195_000 picoseconds. - Weight::from_parts(37_632_000, 3685) + // Minimum execution time: 24_430_000 picoseconds. + Weight::from_parts(25_470_000, 3685) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } @@ -91,12 +100,12 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `238 + t * (64 ±0)` // Estimated: `3703 + t * (64 ±0)` - // Minimum execution time: 26_974_000 picoseconds. - Weight::from_parts(26_937_982, 3703) - // Standard Error: 37 - .saturating_add(Weight::from_parts(1_790, 0).saturating_mul(r.into())) - // Standard Error: 6_024 - .saturating_add(Weight::from_parts(97_556, 0).saturating_mul(t.into())) + // Minimum execution time: 16_460_000 picoseconds. + Weight::from_parts(17_165_076, 3703) + // Standard Error: 66 + .saturating_add(Weight::from_parts(1_672, 0).saturating_mul(r.into())) + // Standard Error: 10_339 + .saturating_add(Weight::from_parts(28_106, 0).saturating_mul(t.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) .saturating_add(Weight::from_parts(0, 64).saturating_mul(t.into())) @@ -110,10 +119,10 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `459 + t * (112 ±0)` // Estimated: `3924 + t * (112 ±0)` - // Minimum execution time: 21_124_000 picoseconds. - Weight::from_parts(21_367_368, 3924) - // Standard Error: 5_283 - .saturating_add(Weight::from_parts(197_604, 0).saturating_mul(t.into())) + // Minimum execution time: 14_211_000 picoseconds. + Weight::from_parts(14_878_422, 3924) + // Standard Error: 5_899 + .saturating_add(Weight::from_parts(95_139, 0).saturating_mul(t.into())) .saturating_add(T::DbWeight::get().reads(2_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) .saturating_add(Weight::from_parts(0, 112).saturating_mul(t.into())) @@ -130,26 +139,28 @@ impl WeightInfo for BasiliskWeight { fn close_tip(t: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `459 + t * (112 ±0)` - // Estimated: `3956 + t * (108 ±0)` - // Minimum execution time: 80_021_000 picoseconds. - Weight::from_parts(81_286_488, 3956) - // Standard Error: 19_506 - .saturating_add(Weight::from_parts(63_273, 0).saturating_mul(t.into())) + // Estimated: `3959 + t * (107 ±0)` + // Minimum execution time: 55_141_000 picoseconds. + Weight::from_parts(57_753_885, 3959) + // Standard Error: 19_515 + .saturating_add(Weight::from_parts(54_368, 0).saturating_mul(t.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(Weight::from_parts(0, 108).saturating_mul(t.into())) + .saturating_add(Weight::from_parts(0, 107).saturating_mul(t.into())) } /// Storage: `Tips::Tips` (r:1 w:1) /// Proof: `Tips::Tips` (`max_values`: None, `max_size`: None, mode: `Measured`) /// Storage: `Tips::Reasons` (r:0 w:1) /// Proof: `Tips::Reasons` (`max_values`: None, `max_size`: None, mode: `Measured`) /// The range of component `t` is `[1, 7]`. - fn slash_tip(_t: u32, ) -> Weight { + fn slash_tip(t: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `268` // Estimated: `3733` - // Minimum execution time: 20_188_000 picoseconds. - Weight::from_parts(20_632_387, 3733) + // Minimum execution time: 11_980_000 picoseconds. + Weight::from_parts(12_871_619, 3733) + // Standard Error: 4_640 + .saturating_add(Weight::from_parts(1_814, 0).saturating_mul(t.into())) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(2_u64)) } diff --git a/runtime/basilisk/src/weights/payment.rs b/runtime/basilisk/src/weights/pallet_transaction_multi_payment.rs similarity index 61% rename from runtime/basilisk/src/weights/payment.rs rename to runtime/basilisk/src/weights/pallet_transaction_multi_payment.rs index 8b5dbc7b87a..e1e5347bb18 100644 --- a/runtime/basilisk/src/weights/payment.rs +++ b/runtime/basilisk/src/weights/pallet_transaction_multi_payment.rs @@ -15,51 +15,58 @@ // See the License for the specific language governing permissions and // limitations under the License. + //! Autogenerated weights for `pallet_transaction_multi_payment` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-12-06, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// target/release/basilisk +// ./target/release/basilisk // benchmark // pallet -// --chain=dev -// --steps=10 -// --repeat=30 // --wasm-execution=compiled -// --heap-pages=4096 +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 // --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=pallet-transaction-multi-payment -// --output=weights-1.1.0/payment.rs -// --extrinsic=* +// --json-file +// raw.json +// --output +// weights/ +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] +#![allow(missing_docs)] -use frame_support::{ - traits::Get, - weights::{constants::RocksDbWeight, Weight}, -}; -use sp_std::marker::PhantomData; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; -use pallet_transaction_multi_payment::weights::WeightInfo; +/// Weights for `pallet_transaction_multi_payment`. +pub struct WeightInfo(PhantomData); +/// Weights for `pallet_transaction_multi_payment` using the Basilisk node and recommended hardware. pub struct BasiliskWeight(PhantomData); - -impl WeightInfo for BasiliskWeight { +impl pallet_transaction_multi_payment::WeightInfo for BasiliskWeight { /// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:1) /// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`) fn add_currency() -> Weight { // Proof Size summary in bytes: - // Measured: `1131` + // Measured: `1127` // Estimated: `3493` - // Minimum execution time: 25_024_000 picoseconds. - Weight::from_parts(25_413_000, 3493) + // Minimum execution time: 16_640_000 picoseconds. + Weight::from_parts(17_310_000, 3493) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -67,10 +74,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`) fn remove_currency() -> Weight { // Proof Size summary in bytes: - // Measured: `1162` + // Measured: `1158` // Estimated: `3493` - // Minimum execution time: 25_032_000 picoseconds. - Weight::from_parts(25_501_000, 3493) + // Minimum execution time: 17_040_000 picoseconds. + Weight::from_parts(17_660_000, 3493) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -80,10 +87,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) fn set_currency() -> Weight { // Proof Size summary in bytes: - // Measured: `1196` + // Measured: `1192` // Estimated: `3493` - // Minimum execution time: 30_094_000 picoseconds. - Weight::from_parts(30_402_000, 3493) + // Minimum execution time: 19_541_000 picoseconds. + Weight::from_parts(20_540_000, 3493) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -93,9 +100,20 @@ impl WeightInfo for BasiliskWeight { /// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`) fn get_oracle_price() -> Weight { // Proof Size summary in bytes: - // Measured: `3346` + // Measured: `3342` // Estimated: `27510` - // Minimum execution time: 96_786_000 picoseconds. - Weight::from_parts(97_647_000, 27510).saturating_add(T::DbWeight::get().reads(11_u64)) + // Minimum execution time: 77_460_000 picoseconds. + Weight::from_parts(79_771_000, 27510) + .saturating_add(T::DbWeight::get().reads(11_u64)) + } + /// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:0 w:1) + /// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) + fn reset_payment_currency() -> Weight { + // Proof Size summary in bytes: + // Measured: `963` + // Estimated: `0` + // Minimum execution time: 13_920_000 picoseconds. + Weight::from_parts(14_490_000, 0) + .saturating_add(T::DbWeight::get().writes(1_u64)) } -} +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/transaction_pause.rs b/runtime/basilisk/src/weights/pallet_transaction_pause.rs similarity index 64% rename from runtime/basilisk/src/weights/transaction_pause.rs rename to runtime/basilisk/src/weights/pallet_transaction_pause.rs index 2925a268914..9cbaacf3c31 100644 --- a/runtime/basilisk/src/weights/transaction_pause.rs +++ b/runtime/basilisk/src/weights/pallet_transaction_pause.rs @@ -15,51 +15,58 @@ // See the License for the specific language governing permissions and // limitations under the License. + //! Autogenerated weights for `pallet_transaction_pause` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-12-06, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// target/release/basilisk +// ./target/release/basilisk // benchmark // pallet -// --chain=dev -// --steps=10 -// --repeat=30 // --wasm-execution=compiled -// --heap-pages=4096 +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 // --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=pallet-transaction-pause -// --output=weights-1.1.0/transaction_pause.rs -// --extrinsic=* +// --json-file +// raw.json +// --output +// weights/ +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] +#![allow(missing_docs)] -use frame_support::{ - traits::Get, - weights::{constants::RocksDbWeight, Weight}, -}; -use sp_std::marker::PhantomData; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; -use pallet_transaction_pause::weights::WeightInfo; +/// Weights for `pallet_transaction_pause`. +pub struct WeightInfo(PhantomData); +/// Weights for `pallet_transaction_pause` using the Basilisk node and recommended hardware. pub struct BasiliskWeight(PhantomData); - -impl WeightInfo for BasiliskWeight { +impl pallet_transaction_pause::WeightInfo for BasiliskWeight { /// Storage: `TransactionPause::PausedTransactions` (r:1 w:1) /// Proof: `TransactionPause::PausedTransactions` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`) fn pause_transaction() -> Weight { // Proof Size summary in bytes: - // Measured: `147` + // Measured: `109` // Estimated: `3555` - // Minimum execution time: 16_518_000 picoseconds. - Weight::from_parts(17_068_000, 3555) + // Minimum execution time: 9_020_000 picoseconds. + Weight::from_parts(9_270_000, 3555) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } @@ -67,11 +74,11 @@ impl WeightInfo for BasiliskWeight { /// Proof: `TransactionPause::PausedTransactions` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`) fn unpause_transaction() -> Weight { // Proof Size summary in bytes: - // Measured: `198` + // Measured: `160` // Estimated: `3555` - // Minimum execution time: 18_239_000 picoseconds. - Weight::from_parts(18_522_000, 3555) + // Minimum execution time: 10_230_000 picoseconds. + Weight::from_parts(10_660_000, 3555) .saturating_add(T::DbWeight::get().reads(1_u64)) .saturating_add(T::DbWeight::get().writes(1_u64)) } -} +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/pallet_treasury.rs b/runtime/basilisk/src/weights/pallet_treasury.rs new file mode 100644 index 00000000000..4c20b741c67 --- /dev/null +++ b/runtime/basilisk/src/weights/pallet_treasury.rs @@ -0,0 +1,203 @@ +// This file is part of Basilisk. + +// Copyright (C) 2020-2023 Intergalactic, Limited (GIB). +// SPDX-License-Identifier: Apache-2.0 + +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + + +//! Autogenerated weights for `pallet_treasury` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` + +// Executed Command: +// ./target/release/basilisk +// benchmark +// pallet +// --wasm-execution=compiled +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 +// --template=.maintain/pallet-weight-template-no-back.hbs +// --json-file +// raw.json +// --output +// weights/ + +#![cfg_attr(rustfmt, rustfmt_skip)] +#![allow(unused_parens)] +#![allow(unused_imports)] +#![allow(missing_docs)] + +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; + +/// Weights for `pallet_treasury`. +pub struct WeightInfo(PhantomData); + +/// Weights for `pallet_treasury` using the Basilisk node and recommended hardware. +pub struct BasiliskWeight(PhantomData); +impl pallet_treasury::WeightInfo for BasiliskWeight { + /// Storage: `Treasury::ProposalCount` (r:1 w:1) + /// Proof: `Treasury::ProposalCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) + /// Storage: `Treasury::Approvals` (r:1 w:1) + /// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`) + /// Storage: `Treasury::Proposals` (r:0 w:1) + /// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) + fn spend_local() -> Weight { + // Proof Size summary in bytes: + // Measured: `109` + // Estimated: `1887` + // Minimum execution time: 11_330_000 picoseconds. + Weight::from_parts(12_380_000, 1887) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(3_u64)) + } + /// Storage: `Treasury::ProposalCount` (r:1 w:1) + /// Proof: `Treasury::ProposalCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) + /// Storage: `Treasury::Proposals` (r:0 w:1) + /// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) + fn propose_spend() -> Weight { + // Proof Size summary in bytes: + // Measured: `210` + // Estimated: `1489` + // Minimum execution time: 23_130_000 picoseconds. + Weight::from_parts(23_910_000, 1489) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + } + /// Storage: `Treasury::Proposals` (r:1 w:1) + /// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) + /// Storage: `System::Account` (r:1 w:1) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + fn reject_proposal() -> Weight { + // Proof Size summary in bytes: + // Measured: `368` + // Estimated: `3593` + // Minimum execution time: 34_300_000 picoseconds. + Weight::from_parts(35_410_000, 3593) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + } + /// Storage: `Treasury::Proposals` (r:1 w:0) + /// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) + /// Storage: `Treasury::Approvals` (r:1 w:1) + /// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`) + /// The range of component `p` is `[0, 99]`. + fn approve_proposal(p: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `537 + p * (8 ±0)` + // Estimated: `3573` + // Minimum execution time: 8_800_000 picoseconds. + Weight::from_parts(11_666_696, 3573) + // Standard Error: 1_137 + .saturating_add(Weight::from_parts(48_763, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Treasury::Approvals` (r:1 w:1) + /// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`) + fn remove_approval() -> Weight { + // Proof Size summary in bytes: + // Measured: `194` + // Estimated: `1887` + // Minimum execution time: 6_630_000 picoseconds. + Weight::from_parts(6_960_000, 1887) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Treasury::Deactivated` (r:1 w:1) + /// Proof: `Treasury::Deactivated` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`) + /// Storage: `Balances::InactiveIssuance` (r:1 w:1) + /// Proof: `Balances::InactiveIssuance` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`) + /// Storage: `Treasury::Approvals` (r:1 w:1) + /// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`) + /// Storage: `Treasury::Proposals` (r:99 w:99) + /// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) + /// Storage: `System::Account` (r:198 w:198) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// The range of component `p` is `[0, 99]`. + fn on_initialize_proposals(p: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `44 + p * (250 ±0)` + // Estimated: `1887 + p * (5206 ±0)` + // Minimum execution time: 16_810_000 picoseconds. + Weight::from_parts(20_191_570, 1887) + // Standard Error: 28_181 + .saturating_add(Weight::from_parts(33_762_459, 0).saturating_mul(p.into())) + .saturating_add(T::DbWeight::get().reads(3_u64)) + .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(p.into()))) + .saturating_add(T::DbWeight::get().writes(3_u64)) + .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(p.into()))) + .saturating_add(Weight::from_parts(0, 5206).saturating_mul(p.into())) + } + /// Storage: `Treasury::SpendCount` (r:1 w:1) + /// Proof: `Treasury::SpendCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) + /// Storage: `Treasury::Spends` (r:0 w:1) + /// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`) + fn spend() -> Weight { + // Proof Size summary in bytes: + // Measured: `109` + // Estimated: `1489` + // Minimum execution time: 10_560_000 picoseconds. + Weight::from_parts(10_800_000, 1489) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + } + /// Storage: `Treasury::Spends` (r:1 w:1) + /// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`) + /// Storage: `System::Account` (r:1 w:1) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + fn payout() -> Weight { + // Proof Size summary in bytes: + // Measured: `227` + // Estimated: `3593` + // Minimum execution time: 50_131_000 picoseconds. + Weight::from_parts(51_510_000, 3593) + .saturating_add(T::DbWeight::get().reads(2_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + } + /// Storage: `Treasury::Spends` (r:1 w:1) + /// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`) + fn check_status() -> Weight { + // Proof Size summary in bytes: + // Measured: `227` + // Estimated: `3534` + // Minimum execution time: 12_250_000 picoseconds. + Weight::from_parts(12_701_000, 3534) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } + /// Storage: `Treasury::Spends` (r:1 w:1) + /// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`) + fn void_spend() -> Weight { + // Proof Size summary in bytes: + // Measured: `227` + // Estimated: `3534` + // Minimum execution time: 11_290_000 picoseconds. + Weight::from_parts(11_600_000, 3534) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/utility.rs b/runtime/basilisk/src/weights/pallet_utility.rs similarity index 51% rename from runtime/basilisk/src/weights/utility.rs rename to runtime/basilisk/src/weights/pallet_utility.rs index f2485d2f988..8950c68080e 100644 --- a/runtime/basilisk/src/weights/utility.rs +++ b/runtime/basilisk/src/weights/pallet_utility.rs @@ -15,85 +15,92 @@ // See the License for the specific language governing permissions and // limitations under the License. + //! Autogenerated weights for `pallet_utility` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-12-06, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// target/release/basilisk +// ./target/release/basilisk // benchmark // pallet -// --chain=dev -// --steps=10 -// --repeat=30 // --wasm-execution=compiled -// --heap-pages=4096 +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 // --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=pallet-utility -// --output=weights-1.1.0/utility.rs -// --extrinsic=* +// --json-file +// raw.json +// --output +// weights/ +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] +#![allow(missing_docs)] -use frame_support::{ - traits::Get, - weights::{constants::RocksDbWeight, Weight}, -}; -use sp_std::marker::PhantomData; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; -use pallet_utility::weights::WeightInfo; +/// Weights for `pallet_utility`. +pub struct WeightInfo(PhantomData); +/// Weights for `pallet_utility` using the Basilisk node and recommended hardware. pub struct BasiliskWeight(PhantomData); - -impl WeightInfo for BasiliskWeight { +impl pallet_utility::WeightInfo for BasiliskWeight { /// The range of component `c` is `[0, 1000]`. - fn batch(c: u32) -> Weight { + fn batch(c: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 10_682_000 picoseconds. - Weight::from_parts(11_477_983, 0) - // Standard Error: 8_381 - .saturating_add(Weight::from_parts(6_924_986, 0).saturating_mul(c.into())) + // Minimum execution time: 4_840_000 picoseconds. + Weight::from_parts(5_598_611, 0) + // Standard Error: 3_829 + .saturating_add(Weight::from_parts(3_430_267, 0).saturating_mul(c.into())) } fn as_derivative() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 8_012_000 picoseconds. - Weight::from_parts(8_236_000, 0) + // Minimum execution time: 5_060_000 picoseconds. + Weight::from_parts(5_300_000, 0) } /// The range of component `c` is `[0, 1000]`. - fn batch_all(c: u32) -> Weight { + fn batch_all(c: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 10_691_000 picoseconds. - Weight::from_parts(17_408_249, 0) - // Standard Error: 5_637 - .saturating_add(Weight::from_parts(7_299_736, 0).saturating_mul(c.into())) + // Minimum execution time: 4_740_000 picoseconds. + Weight::from_parts(200_861, 0) + // Standard Error: 3_841 + .saturating_add(Weight::from_parts(3_712_542, 0).saturating_mul(c.into())) } fn dispatch_as() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 13_764_000 picoseconds. - Weight::from_parts(14_038_000, 0) + // Minimum execution time: 7_100_000 picoseconds. + Weight::from_parts(7_320_000, 0) } /// The range of component `c` is `[0, 1000]`. - fn force_batch(c: u32) -> Weight { + fn force_batch(c: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `0` - // Minimum execution time: 10_754_000 picoseconds. - Weight::from_parts(8_816_518, 0) - // Standard Error: 4_938 - .saturating_add(Weight::from_parts(6_883_918, 0).saturating_mul(c.into())) + // Minimum execution time: 4_740_000 picoseconds. + Weight::from_parts(4_890_000, 0) + // Standard Error: 2_098 + .saturating_add(Weight::from_parts(3_418_311, 0).saturating_mul(c.into())) } -} +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/xcm.rs b/runtime/basilisk/src/weights/pallet_xcm.rs similarity index 93% rename from runtime/basilisk/src/weights/xcm.rs rename to runtime/basilisk/src/weights/pallet_xcm.rs index 22613b8ee0a..665ce30cb3f 100644 --- a/runtime/basilisk/src/weights/xcm.rs +++ b/runtime/basilisk/src/weights/pallet_xcm.rs @@ -34,7 +34,7 @@ // --heap-pages=4096 // --template=.maintain/pallet-weight-template-no-back.hbs // --pallet=pallet-xcm -// --output=weights-1.1.0/xcm.rs +// --output=weights-1.1.0/pallet_xcm.rs // --extrinsic=* #![allow(unused_parens)] @@ -89,6 +89,15 @@ impl WeightInfo for BasiliskWeight { // Minimum execution time: 32_094_000 picoseconds. Weight::from_parts(32_796_000, 1489).saturating_add(T::DbWeight::get().reads(1_u64)) } + + fn transfer_assets() -> Weight { + // Proof Size summary in bytes: + // Measured: `0` + // Estimated: `0` + // Minimum execution time: 18_446_744_073_709_551_000 picoseconds. + Weight::from_parts(18_446_744_073_709_551_000, 0) + } + fn execute() -> Weight { // Proof Size summary in bytes: // Measured: `0` @@ -264,4 +273,24 @@ impl WeightInfo for BasiliskWeight { .saturating_add(T::DbWeight::get().reads(9_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } + + fn new_query() -> Weight { + // Proof Size summary in bytes: + // Measured: `69` + // Estimated: `1554` + // Minimum execution time: 4_930_000 picoseconds. + Weight::from_parts(5_220_000, 1554) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(2_u64)) + } + + fn take_response() -> Weight { + // Proof Size summary in bytes: + // Measured: `7706` + // Estimated: `11171` + // Minimum execution time: 32_740_000 picoseconds. + Weight::from_parts(33_280_000, 11171) + .saturating_add(T::DbWeight::get().reads(1_u64)) + .saturating_add(T::DbWeight::get().writes(1_u64)) + } } diff --git a/runtime/basilisk/src/weights/xyk.rs b/runtime/basilisk/src/weights/pallet_xyk.rs similarity index 63% rename from runtime/basilisk/src/weights/xyk.rs rename to runtime/basilisk/src/weights/pallet_xyk.rs index 0793385c1e9..e6b65cbf871 100644 --- a/runtime/basilisk/src/weights/xyk.rs +++ b/runtime/basilisk/src/weights/pallet_xyk.rs @@ -15,60 +15,67 @@ // See the License for the specific language governing permissions and // limitations under the License. + //! Autogenerated weights for `pallet_xyk` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-12-06, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// target/release/basilisk +// ./target/release/basilisk // benchmark // pallet -// --chain=dev -// --steps=10 -// --repeat=30 // --wasm-execution=compiled -// --heap-pages=4096 +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 // --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=pallet-xyk -// --output=weights-1.1.0/xyk.rs -// --extrinsic=* +// --json-file +// raw.json +// --output +// weights/ +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] +#![allow(missing_docs)] -use frame_support::{ - traits::Get, - weights::{constants::RocksDbWeight, Weight}, -}; -use sp_std::marker::PhantomData; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; -use pallet_xyk::weights::WeightInfo; +/// Weights for `pallet_xyk`. +pub struct WeightInfo(PhantomData); +/// Weights for `pallet_xyk` using the Basilisk node and recommended hardware. pub struct BasiliskWeight(PhantomData); - -impl WeightInfo for BasiliskWeight { +impl pallet_xyk::WeightInfo for BasiliskWeight { + /// Storage: `AssetRegistry::Assets` (r:2 w:1) + /// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`) /// Storage: `LBP::PoolData` (r:1 w:0) /// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`) /// Storage: `XYK::ShareToken` (r:1 w:1) /// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) - /// Storage: `Tokens::Accounts` (r:5 w:5) + /// Storage: `Tokens::Accounts` (r:6 w:5) /// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) /// Storage: `AssetRegistry::AssetIds` (r:1 w:1) /// Proof: `AssetRegistry::AssetIds` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`) /// Storage: `AssetRegistry::NextAssetId` (r:1 w:1) /// Proof: `AssetRegistry::NextAssetId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `AssetRegistry::Assets` (r:2 w:1) - /// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`) /// Storage: `System::Account` (r:2 w:2) /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - /// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:2 w:1) + /// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:2 w:0) /// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) - /// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0) + /// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:2 w:0) /// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`) /// Storage: `Tokens::TotalIssuance` (r:1 w:1) /// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`) @@ -80,16 +87,16 @@ impl WeightInfo for BasiliskWeight { /// Proof: `XYK::PoolAssets` (`max_values`: None, `max_size`: Some(56), added: 2531, mode: `MaxEncodedLen`) fn create_pool() -> Weight { // Proof Size summary in bytes: - // Measured: `1166` - // Estimated: `13905` - // Minimum execution time: 203_748_000 picoseconds. - Weight::from_parts(204_681_000, 13905) - .saturating_add(T::DbWeight::get().reads(17_u64)) - .saturating_add(T::DbWeight::get().writes(16_u64)) + // Measured: `2940` + // Estimated: `16488` + // Minimum execution time: 156_821_000 picoseconds. + Weight::from_parts(160_771_000, 16488) + .saturating_add(T::DbWeight::get().reads(19_u64)) + .saturating_add(T::DbWeight::get().writes(15_u64)) } /// Storage: `XYK::ShareToken` (r:1 w:0) /// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) - /// Storage: `Tokens::Accounts` (r:5 w:5) + /// Storage: `Tokens::Accounts` (r:6 w:5) /// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) /// Storage: `XYK::TotalLiquidity` (r:1 w:1) /// Proof: `XYK::TotalLiquidity` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`) @@ -97,134 +104,148 @@ impl WeightInfo for BasiliskWeight { /// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`) /// Storage: `System::Account` (r:1 w:1) /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - /// Storage: `Tokens::TotalIssuance` (r:1 w:1) - /// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`) /// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0) /// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) + /// Storage: `Tokens::TotalIssuance` (r:1 w:1) + /// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`) /// Storage: `EmaOracle::Accumulator` (r:1 w:1) /// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(4441), added: 4936, mode: `MaxEncodedLen`) fn add_liquidity() -> Weight { // Proof Size summary in bytes: - // Measured: `1731` - // Estimated: `13905` - // Minimum execution time: 175_371_000 picoseconds. - Weight::from_parts(176_317_000, 13905) - .saturating_add(T::DbWeight::get().reads(14_u64)) + // Measured: `3179` + // Estimated: `16488` + // Minimum execution time: 139_101_000 picoseconds. + Weight::from_parts(144_001_000, 16488) + .saturating_add(T::DbWeight::get().reads(15_u64)) .saturating_add(T::DbWeight::get().writes(9_u64)) } - /// Storage: `XYK::ShareToken` (r:1 w:0) + /// Storage: `XYK::ShareToken` (r:1 w:1) /// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) /// Storage: `XYK::TotalLiquidity` (r:1 w:1) /// Proof: `XYK::TotalLiquidity` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`) - /// Storage: `Tokens::Accounts` (r:5 w:5) + /// Storage: `Tokens::Accounts` (r:6 w:5) /// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) /// Storage: `AssetRegistry::Assets` (r:3 w:0) /// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:1 w:0) + /// Storage: `System::Account` (r:2 w:2) /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:2 w:1) + /// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) /// Storage: `Tokens::TotalIssuance` (r:1 w:1) /// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`) /// Storage: `EmaOracle::Accumulator` (r:1 w:1) /// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(4441), added: 4936, mode: `MaxEncodedLen`) + /// Storage: `Duster::AccountBlacklist` (r:1 w:1) + /// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`) + /// Storage: `XYK::PoolAssets` (r:0 w:1) + /// Proof: `XYK::PoolAssets` (`max_values`: None, `max_size`: Some(56), added: 2531, mode: `MaxEncodedLen`) fn remove_liquidity() -> Weight { // Proof Size summary in bytes: - // Measured: `1715` - // Estimated: `13905` - // Minimum execution time: 166_551_000 picoseconds. - Weight::from_parts(168_056_000, 13905) - .saturating_add(T::DbWeight::get().reads(13_u64)) - .saturating_add(T::DbWeight::get().writes(8_u64)) + // Measured: `3462` + // Estimated: `16488` + // Minimum execution time: 169_081_000 picoseconds. + Weight::from_parts(175_092_000, 16488) + .saturating_add(T::DbWeight::get().reads(18_u64)) + .saturating_add(T::DbWeight::get().writes(14_u64)) } /// Storage: `XYK::ShareToken` (r:1 w:0) /// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) - /// Storage: `Tokens::Accounts` (r:4 w:4) + /// Storage: `Tokens::Accounts` (r:5 w:4) /// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) /// Storage: `AssetRegistry::Assets` (r:2 w:0) /// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:2 w:0) + /// Storage: `System::Account` (r:2 w:1) /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0) + /// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) /// Storage: `EmaOracle::Accumulator` (r:1 w:1) /// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(4441), added: 4936, mode: `MaxEncodedLen`) fn sell() -> Weight { // Proof Size summary in bytes: - // Measured: `1420` - // Estimated: `11322` - // Minimum execution time: 124_550_000 picoseconds. - Weight::from_parts(125_458_000, 11322) - .saturating_add(T::DbWeight::get().reads(10_u64)) - .saturating_add(T::DbWeight::get().writes(5_u64)) + // Measured: `3036` + // Estimated: `13905` + // Minimum execution time: 111_741_000 picoseconds. + Weight::from_parts(116_010_000, 13905) + .saturating_add(T::DbWeight::get().reads(12_u64)) + .saturating_add(T::DbWeight::get().writes(6_u64)) } /// Storage: `XYK::ShareToken` (r:1 w:0) /// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) - /// Storage: `Tokens::Accounts` (r:4 w:4) + /// Storage: `Tokens::Accounts` (r:5 w:4) /// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) /// Storage: `AssetRegistry::Assets` (r:2 w:0) /// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:2 w:0) + /// Storage: `System::Account` (r:2 w:1) /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0) + /// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) /// Storage: `EmaOracle::Accumulator` (r:1 w:1) /// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(4441), added: 4936, mode: `MaxEncodedLen`) fn buy() -> Weight { // Proof Size summary in bytes: - // Measured: `1420` - // Estimated: `11322` - // Minimum execution time: 123_553_000 picoseconds. - Weight::from_parts(124_848_000, 11322) - .saturating_add(T::DbWeight::get().reads(10_u64)) - .saturating_add(T::DbWeight::get().writes(5_u64)) + // Measured: `3036` + // Estimated: `13905` + // Minimum execution time: 111_821_000 picoseconds. + Weight::from_parts(115_791_000, 13905) + .saturating_add(T::DbWeight::get().reads(12_u64)) + .saturating_add(T::DbWeight::get().writes(6_u64)) } /// Storage: `XYK::ShareToken` (r:1 w:0) /// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) - /// Storage: `Tokens::Accounts` (r:4 w:4) + /// Storage: `Tokens::Accounts` (r:5 w:4) /// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) /// Storage: `AssetRegistry::Assets` (r:2 w:0) /// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:2 w:0) + /// Storage: `System::Account` (r:2 w:1) /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0) + /// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) /// Storage: `EmaOracle::Accumulator` (r:1 w:1) /// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(4441), added: 4936, mode: `MaxEncodedLen`) /// The range of component `c` is `[1, 2]`. /// The range of component `e` is `[0, 1]`. - fn router_execution_sell(c: u32, e: u32) -> Weight { + fn router_execution_sell(c: u32, e: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `648 + e * (772 ±0)` - // Estimated: `6156 + e * (5166 ±213_489_293_787_578_112)` - // Minimum execution time: 21_419_000 picoseconds. - Weight::from_parts(5_368_826, 6156) - // Standard Error: 43_472 - .saturating_add(Weight::from_parts(8_257_461, 0).saturating_mul(c.into())) - // Standard Error: 43_472 - .saturating_add(Weight::from_parts(111_328_550, 0).saturating_mul(e.into())) + // Measured: `1186 + e * (1850 ±0)` + // Estimated: `6156 + e * (7749 ±2_594_596_928_286_404)` + // Minimum execution time: 17_920_000 picoseconds. + Weight::from_parts(6_703_871, 6156) + // Standard Error: 294_808 + .saturating_add(Weight::from_parts(6_262_722, 0).saturating_mul(c.into())) + // Standard Error: 294_808 + .saturating_add(Weight::from_parts(102_737_983, 0).saturating_mul(e.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) - .saturating_add(T::DbWeight::get().reads((7_u64).saturating_mul(e.into()))) - .saturating_add(T::DbWeight::get().writes((5_u64).saturating_mul(e.into()))) - .saturating_add(Weight::from_parts(0, 5166).saturating_mul(e.into())) + .saturating_add(T::DbWeight::get().reads((9_u64).saturating_mul(e.into()))) + .saturating_add(T::DbWeight::get().writes((6_u64).saturating_mul(e.into()))) + .saturating_add(Weight::from_parts(0, 7749).saturating_mul(e.into())) } /// Storage: `XYK::ShareToken` (r:1 w:0) /// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) - /// Storage: `Tokens::Accounts` (r:4 w:4) + /// Storage: `Tokens::Accounts` (r:5 w:4) /// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) /// Storage: `AssetRegistry::Assets` (r:2 w:0) /// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:2 w:0) + /// Storage: `System::Account` (r:2 w:1) /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0) + /// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`) /// Storage: `EmaOracle::Accumulator` (r:1 w:1) /// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(4441), added: 4936, mode: `MaxEncodedLen`) /// The range of component `c` is `[1, 3]`. /// The range of component `e` is `[0, 1]`. - fn router_execution_buy(c: u32, e: u32) -> Weight { + fn router_execution_buy(c: u32, e: u32, ) -> Weight { // Proof Size summary in bytes: - // Measured: `648 + e * (772 ±0)` - // Estimated: `6156 + e * (5166 ±0)` - // Minimum execution time: 28_991_000 picoseconds. - Weight::from_parts(6_265_074, 6156) - // Standard Error: 32_211 - .saturating_add(Weight::from_parts(7_766_482, 0).saturating_mul(c.into())) - // Standard Error: 54_650 - .saturating_add(Weight::from_parts(110_694_702, 0).saturating_mul(e.into())) + // Measured: `1186 + e * (1850 ±0)` + // Estimated: `6156 + e * (7749 ±3_757_244_018_954_750)` + // Minimum execution time: 24_280_000 picoseconds. + Weight::from_parts(3_573_959, 6156) + // Standard Error: 102_191 + .saturating_add(Weight::from_parts(7_363_230, 0).saturating_mul(c.into())) + // Standard Error: 170_101 + .saturating_add(Weight::from_parts(103_932_450, 0).saturating_mul(e.into())) .saturating_add(T::DbWeight::get().reads(3_u64)) - .saturating_add(T::DbWeight::get().reads((7_u64).saturating_mul(e.into()))) - .saturating_add(T::DbWeight::get().writes((5_u64).saturating_mul(e.into()))) - .saturating_add(Weight::from_parts(0, 5166).saturating_mul(e.into())) + .saturating_add(T::DbWeight::get().reads((9_u64).saturating_mul(e.into()))) + .saturating_add(T::DbWeight::get().writes((6_u64).saturating_mul(e.into()))) + .saturating_add(Weight::from_parts(0, 7749).saturating_mul(e.into())) } -} +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/xyk_liquidity_mining.rs b/runtime/basilisk/src/weights/pallet_xyk_liquidity_mining.rs similarity index 89% rename from runtime/basilisk/src/weights/xyk_liquidity_mining.rs rename to runtime/basilisk/src/weights/pallet_xyk_liquidity_mining.rs index 761251e72f8..06ff83ace05 100644 --- a/runtime/basilisk/src/weights/xyk_liquidity_mining.rs +++ b/runtime/basilisk/src/weights/pallet_xyk_liquidity_mining.rs @@ -15,43 +15,50 @@ // See the License for the specific language governing permissions and // limitations under the License. + //! Autogenerated weights for `pallet_xyk_liquidity_mining` //! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-12-06, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` +//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor` +//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024` // Executed Command: -// target/release/basilisk +// ./target/release/basilisk // benchmark // pallet -// --chain=dev -// --steps=10 -// --repeat=30 // --wasm-execution=compiled -// --heap-pages=4096 +// --pallet +// * +// --extrinsic +// * +// --heap-pages +// 4096 +// --steps +// 50 +// --repeat +// 20 // --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=pallet-xyk-liquidity-mining -// --output=weights-1.1.0/xyk_liquidity_mining.rs -// --extrinsic=* +// --json-file +// raw.json +// --output +// weights/ +#![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] #![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] +#![allow(missing_docs)] -use frame_support::{ - traits::Get, - weights::{constants::RocksDbWeight, Weight}, -}; -use sp_std::marker::PhantomData; +use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; +use core::marker::PhantomData; -use pallet_xyk_liquidity_mining::weights::WeightInfo; +/// Weights for `pallet_xyk_liquidity_mining`. +pub struct WeightInfo(PhantomData); +/// Weights for `pallet_xyk_liquidity_mining` using the Basilisk node and recommended hardware. pub struct BasiliskWeight(PhantomData); - -impl WeightInfo for BasiliskWeight { +impl pallet_xyk_liquidity_mining::WeightInfo for BasiliskWeight { /// Storage: `AssetRegistry::Assets` (r:1 w:0) /// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`) /// Storage: `System::Account` (r:2 w:2) @@ -64,10 +71,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`) fn create_global_farm() -> Weight { // Proof Size summary in bytes: - // Measured: `473` + // Measured: `506` // Estimated: `6196` - // Minimum execution time: 96_296_000 picoseconds. - Weight::from_parts(97_159_000, 6196) + // Minimum execution time: 63_200_000 picoseconds. + Weight::from_parts(65_850_000, 6196) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -79,10 +86,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn update_global_farm() -> Weight { // Proof Size summary in bytes: - // Measured: `879` + // Measured: `912` // Estimated: `6196` - // Minimum execution time: 100_686_000 picoseconds. - Weight::from_parts(101_525_000, 6196) + // Minimum execution time: 68_080_000 picoseconds. + Weight::from_parts(71_150_000, 6196) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -96,8 +103,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `1002` // Estimated: `6196` - // Minimum execution time: 97_204_000 picoseconds. - Weight::from_parts(97_998_000, 6196) + // Minimum execution time: 68_771_000 picoseconds. + Weight::from_parts(70_911_000, 6196) .saturating_add(T::DbWeight::get().reads(4_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -117,10 +124,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `XYKWarehouseLM::YieldFarm` (`max_values`: None, `max_size`: Some(226), added: 2701, mode: `MaxEncodedLen`) fn create_yield_farm() -> Weight { // Proof Size summary in bytes: - // Measured: `1213` + // Measured: `1246` // Estimated: `6196` - // Minimum execution time: 125_043_000 picoseconds. - Weight::from_parts(126_608_000, 6196) + // Minimum execution time: 86_101_000 picoseconds. + Weight::from_parts(89_641_000, 6196) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(6_u64)) } @@ -138,10 +145,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn update_yield_farm() -> Weight { // Proof Size summary in bytes: - // Measured: `1361` + // Measured: `1394` // Estimated: `6196` - // Minimum execution time: 132_512_000 picoseconds. - Weight::from_parts(133_771_000, 6196) + // Minimum execution time: 91_961_000 picoseconds. + Weight::from_parts(96_431_000, 6196) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -157,10 +164,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn stop_yield_farm() -> Weight { // Proof Size summary in bytes: - // Measured: `1195` + // Measured: `1228` // Estimated: `6196` - // Minimum execution time: 127_486_000 picoseconds. - Weight::from_parts(128_704_000, 6196) + // Minimum execution time: 87_911_000 picoseconds. + Weight::from_parts(89_611_000, 6196) .saturating_add(T::DbWeight::get().reads(6_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } @@ -176,8 +183,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `904` // Estimated: `6196` - // Minimum execution time: 102_124_000 picoseconds. - Weight::from_parts(102_690_000, 6196) + // Minimum execution time: 72_831_000 picoseconds. + Weight::from_parts(76_331_000, 6196) .saturating_add(T::DbWeight::get().reads(5_u64)) .saturating_add(T::DbWeight::get().writes(4_u64)) } @@ -221,10 +228,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `XYKWarehouseLM::Deposit` (`max_values`: None, `max_size`: Some(413), added: 2888, mode: `MaxEncodedLen`) fn deposit_shares() -> Weight { // Proof Size summary in bytes: - // Measured: `3236` + // Measured: `3259` // Estimated: `11402` - // Minimum execution time: 262_054_000 picoseconds. - Weight::from_parts(265_093_000, 11402) + // Minimum execution time: 182_692_000 picoseconds. + Weight::from_parts(189_742_000, 11402) .saturating_add(T::DbWeight::get().reads(22_u64)) .saturating_add(T::DbWeight::get().writes(13_u64)) } @@ -250,8 +257,8 @@ impl WeightInfo for BasiliskWeight { // Proof Size summary in bytes: // Measured: `2363` // Estimated: `3878` - // Minimum execution time: 82_532_000 picoseconds. - Weight::from_parts(83_433_000, 3878) + // Minimum execution time: 61_481_000 picoseconds. + Weight::from_parts(66_390_000, 3878) .saturating_add(T::DbWeight::get().reads(9_u64)) .saturating_add(T::DbWeight::get().writes(3_u64)) } @@ -269,10 +276,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn claim_rewards() -> Weight { // Proof Size summary in bytes: - // Measured: `2097` + // Measured: `2130` // Estimated: `8799` - // Minimum execution time: 181_069_000 picoseconds. - Weight::from_parts(182_671_000, 8799) + // Minimum execution time: 126_781_000 picoseconds. + Weight::from_parts(131_841_000, 8799) .saturating_add(T::DbWeight::get().reads(8_u64)) .saturating_add(T::DbWeight::get().writes(6_u64)) } @@ -312,10 +319,10 @@ impl WeightInfo for BasiliskWeight { /// Proof: `NFT::Items` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`) fn withdraw_shares() -> Weight { // Proof Size summary in bytes: - // Measured: `2928` + // Measured: `2951` // Estimated: `11402` - // Minimum execution time: 388_459_000 picoseconds. - Weight::from_parts(391_305_000, 11402) + // Minimum execution time: 269_572_000 picoseconds. + Weight::from_parts(284_533_000, 11402) .saturating_add(T::DbWeight::get().reads(19_u64)) .saturating_add(T::DbWeight::get().writes(15_u64)) } @@ -333,11 +340,11 @@ impl WeightInfo for BasiliskWeight { /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) fn resume_yield_farm() -> Weight { // Proof Size summary in bytes: - // Measured: `1469` + // Measured: `1502` // Estimated: `6196` - // Minimum execution time: 127_081_000 picoseconds. - Weight::from_parts(128_240_000, 6196) + // Minimum execution time: 88_080_000 picoseconds. + Weight::from_parts(91_241_000, 6196) .saturating_add(T::DbWeight::get().reads(7_u64)) .saturating_add(T::DbWeight::get().writes(5_u64)) } -} +} \ No newline at end of file diff --git a/runtime/basilisk/src/weights/treasury.rs b/runtime/basilisk/src/weights/treasury.rs deleted file mode 100644 index 5da71744110..00000000000 --- a/runtime/basilisk/src/weights/treasury.rs +++ /dev/null @@ -1,140 +0,0 @@ -// This file is part of Basilisk. - -// Copyright (C) 2020-2023 Intergalactic, Limited (GIB). -// SPDX-License-Identifier: Apache-2.0 - -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//! Autogenerated weights for `pallet_treasury` -//! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-12-06, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` - -// Executed Command: -// target/release/basilisk -// benchmark -// pallet -// --chain=dev -// --steps=10 -// --repeat=30 -// --wasm-execution=compiled -// --heap-pages=4096 -// --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=pallet-treasury -// --output=weights-1.1.0/treasury.rs -// --extrinsic=* - -#![allow(unused_parens)] -#![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] - -use frame_support::{ - traits::Get, - weights::{constants::RocksDbWeight, Weight}, -}; -use sp_std::marker::PhantomData; - -use pallet_treasury::weights::WeightInfo; - -pub struct BasiliskWeight(PhantomData); - -impl WeightInfo for BasiliskWeight { - fn spend() -> Weight { - // Proof Size summary in bytes: - // Measured: `0` - // Estimated: `0` - // Minimum execution time: 386_000 picoseconds. - Weight::from_parts(414_000, 0) - } - /// Storage: `Treasury::ProposalCount` (r:1 w:1) - /// Proof: `Treasury::ProposalCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `Treasury::Proposals` (r:0 w:1) - /// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) - fn propose_spend() -> Weight { - // Proof Size summary in bytes: - // Measured: `210` - // Estimated: `1489` - // Minimum execution time: 37_957_000 picoseconds. - Weight::from_parts(38_297_000, 1489) - .saturating_add(T::DbWeight::get().reads(1_u64)) - .saturating_add(T::DbWeight::get().writes(2_u64)) - } - /// Storage: `Treasury::Proposals` (r:1 w:1) - /// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:1 w:1) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - fn reject_proposal() -> Weight { - // Proof Size summary in bytes: - // Measured: `368` - // Estimated: `3593` - // Minimum execution time: 55_324_000 picoseconds. - Weight::from_parts(55_652_000, 3593) - .saturating_add(T::DbWeight::get().reads(2_u64)) - .saturating_add(T::DbWeight::get().writes(2_u64)) - } - /// Storage: `Treasury::Proposals` (r:1 w:0) - /// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) - /// Storage: `Treasury::Approvals` (r:1 w:1) - /// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`) - /// The range of component `p` is `[0, 99]`. - fn approve_proposal(p: u32) -> Weight { - // Proof Size summary in bytes: - // Measured: `571 + p * (7 ±0)` - // Estimated: `3573` - // Minimum execution time: 14_071_000 picoseconds. - Weight::from_parts(17_014_032, 3573) - // Standard Error: 2_942 - .saturating_add(Weight::from_parts(35_852, 0).saturating_mul(p.into())) - .saturating_add(T::DbWeight::get().reads(2_u64)) - .saturating_add(T::DbWeight::get().writes(1_u64)) - } - /// Storage: `Treasury::Approvals` (r:1 w:1) - /// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`) - fn remove_approval() -> Weight { - // Proof Size summary in bytes: - // Measured: `194` - // Estimated: `1887` - // Minimum execution time: 10_612_000 picoseconds. - Weight::from_parts(10_968_000, 1887) - .saturating_add(T::DbWeight::get().reads(1_u64)) - .saturating_add(T::DbWeight::get().writes(1_u64)) - } - /// Storage: `Treasury::Deactivated` (r:1 w:1) - /// Proof: `Treasury::Deactivated` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`) - /// Storage: `Balances::InactiveIssuance` (r:1 w:1) - /// Proof: `Balances::InactiveIssuance` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`) - /// Storage: `Treasury::Approvals` (r:1 w:1) - /// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`) - /// Storage: `Treasury::Proposals` (r:100 w:100) - /// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`) - /// Storage: `System::Account` (r:200 w:200) - /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) - /// The range of component `p` is `[0, 100]`. - fn on_initialize_proposals(p: u32) -> Weight { - // Proof Size summary in bytes: - // Measured: `43 + p * (250 ±0)` - // Estimated: `1887 + p * (5206 ±0)` - // Minimum execution time: 37_755_000 picoseconds. - Weight::from_parts(42_881_231, 1887) - // Standard Error: 38_744 - .saturating_add(Weight::from_parts(51_567_452, 0).saturating_mul(p.into())) - .saturating_add(T::DbWeight::get().reads(3_u64)) - .saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(p.into()))) - .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(p.into()))) - .saturating_add(Weight::from_parts(0, 5206).saturating_mul(p.into())) - } -} diff --git a/runtime/basilisk/src/weights/xcmp_queue.rs b/runtime/basilisk/src/weights/xcmp_queue.rs deleted file mode 100644 index d7a7740c2c4..00000000000 --- a/runtime/basilisk/src/weights/xcmp_queue.rs +++ /dev/null @@ -1,155 +0,0 @@ -// This file is part of Basilisk. - -// Copyright (C) 2020-2023 Intergalactic, Limited (GIB). -// SPDX-License-Identifier: Apache-2.0 - -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//! Autogenerated weights for `cumulus_pallet_xcmp_queue` -//! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-12-06, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024` - -// Executed Command: -// target/release/basilisk -// benchmark -// pallet -// --chain=dev -// --steps=10 -// --repeat=30 -// --wasm-execution=compiled -// --heap-pages=4096 -// --template=.maintain/pallet-weight-template-no-back.hbs -// --pallet=cumulus-pallet-xcmp-queue -// --output=weights-1.1.0/xcmp_queue.rs -// --extrinsic=* - -#![allow(unused_parens)] -#![allow(unused_imports)] -#![allow(clippy::unnecessary_cast)] - -use frame_support::{ - traits::Get, - weights::{constants::RocksDbWeight, Weight}, -}; -use sp_std::marker::PhantomData; - -use cumulus_pallet_xcmp_queue::weights::WeightInfo; - -pub struct BasiliskWeight(PhantomData); - -impl WeightInfo for BasiliskWeight { - /// Storage: `XcmpQueue::QueueConfig` (r:1 w:1) - /// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn set_config_with_u32() -> Weight { - // Proof Size summary in bytes: - // Measured: `109` - // Estimated: `1594` - // Minimum execution time: 8_755_000 picoseconds. - Weight::from_parts(8_941_000, 1594) - .saturating_add(T::DbWeight::get().reads(1_u64)) - .saturating_add(T::DbWeight::get().writes(1_u64)) - } - /// Storage: `XcmpQueue::QueueConfig` (r:1 w:1) - /// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - fn set_config_with_weight() -> Weight { - // Proof Size summary in bytes: - // Measured: `109` - // Estimated: `1594` - // Minimum execution time: 8_896_000 picoseconds. - Weight::from_parts(9_059_000, 1594) - .saturating_add(T::DbWeight::get().reads(1_u64)) - .saturating_add(T::DbWeight::get().writes(1_u64)) - } - /// Storage: `XcmpQueue::QueueConfig` (r:1 w:0) - /// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `XcmpQueue::QueueSuspended` (r:1 w:0) - /// Proof: `XcmpQueue::QueueSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `XcmpQueue::DeferredQueueSuspended` (r:1 w:0) - /// Proof: `XcmpQueue::DeferredQueueSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `XcmpQueue::DeferredIndices` (r:1 w:1) - /// Proof: `XcmpQueue::DeferredIndices` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `XcmpQueue::DeferredMessageBuckets` (r:3 w:3) - /// Proof: `XcmpQueue::DeferredMessageBuckets` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `XcmpQueue::CounterForOverweight` (r:1 w:1) - /// Proof: `XcmpQueue::CounterForOverweight` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`) - /// Storage: `XcmpQueue::OverweightCount` (r:1 w:1) - /// Proof: `XcmpQueue::OverweightCount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`) - /// Storage: `XcmpQueue::Overweight` (r:60 w:60) - /// Proof: `XcmpQueue::Overweight` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// The range of component `b` is `[1, 3]`. - fn service_deferred(b: u32) -> Weight { - // Proof Size summary in bytes: - // Measured: `6242 + b * (324357 ±0)` - // Estimated: `9707 + b * (373857 ±0)` - // Minimum execution time: 33_142_672_000 picoseconds. - Weight::from_parts(33_268_386_000, 9707) - // Standard Error: 602_125_184 - .saturating_add(Weight::from_parts(15_702_864_393, 0).saturating_mul(b.into())) - .saturating_add(T::DbWeight::get().reads(6_u64)) - .saturating_add(T::DbWeight::get().reads((21_u64).saturating_mul(b.into()))) - .saturating_add(T::DbWeight::get().writes(3_u64)) - .saturating_add(T::DbWeight::get().writes((21_u64).saturating_mul(b.into()))) - .saturating_add(Weight::from_parts(0, 373857).saturating_mul(b.into())) - } - /// Storage: `XcmpQueue::DeferredMessageBuckets` (r:1 w:1) - /// Proof: `XcmpQueue::DeferredMessageBuckets` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// The range of component `m` is `[1, 20]`. - fn discard_deferred_bucket(m: u32) -> Weight { - // Proof Size summary in bytes: - // Measured: `219 + m * (16216 ±0)` - // Estimated: `3683 + m * (16216 ±0)` - // Minimum execution time: 1_281_948_000 picoseconds. - Weight::from_parts(243_099_051, 3683) - // Standard Error: 419_944 - .saturating_add(Weight::from_parts(1_090_047_884, 0).saturating_mul(m.into())) - .saturating_add(T::DbWeight::get().reads(1_u64)) - .saturating_add(T::DbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_parts(0, 16216).saturating_mul(m.into())) - } - /// Storage: `XcmpQueue::DeferredMessageBuckets` (r:1 w:1) - /// Proof: `XcmpQueue::DeferredMessageBuckets` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// The range of component `m` is `[1, 20]`. - fn discard_deferred_individual(m: u32) -> Weight { - // Proof Size summary in bytes: - // Measured: `219 + m * (16216 ±0)` - // Estimated: `3683 + m * (16216 ±0)` - // Minimum execution time: 1_341_620_000 picoseconds. - Weight::from_parts(105_527_197, 3683) - // Standard Error: 366_172 - .saturating_add(Weight::from_parts(1_214_179_345, 0).saturating_mul(m.into())) - .saturating_add(T::DbWeight::get().reads(1_u64)) - .saturating_add(T::DbWeight::get().writes(1_u64)) - .saturating_add(Weight::from_parts(0, 16216).saturating_mul(m.into())) - } - /// Storage: `XcmpQueue::DeferredIndices` (r:1 w:1) - /// Proof: `XcmpQueue::DeferredIndices` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// Storage: `XcmpQueue::DeferredMessageBuckets` (r:1 w:1) - /// Proof: `XcmpQueue::DeferredMessageBuckets` (`max_values`: None, `max_size`: None, mode: `Measured`) - /// The range of component `m` is `[1, 20]`. - fn try_place_in_deferred_queue(m: u32) -> Weight { - // Proof Size summary in bytes: - // Measured: `0 + m * (16216 ±0)` - // Estimated: `9691 + m * (15020 ±55)` - // Minimum execution time: 107_001_000 picoseconds. - Weight::from_parts(123_947_871, 9691) - // Standard Error: 202_249 - .saturating_add(Weight::from_parts(6_781_886, 0).saturating_mul(m.into())) - .saturating_add(T::DbWeight::get().reads(2_u64)) - .saturating_add(T::DbWeight::get().writes(2_u64)) - .saturating_add(Weight::from_parts(0, 15020).saturating_mul(m.into())) - } -} diff --git a/runtime/basilisk/src/xcm.rs b/runtime/basilisk/src/xcm.rs index 6defe9fb96f..7f8fc0a59e7 100644 --- a/runtime/basilisk/src/xcm.rs +++ b/runtime/basilisk/src/xcm.rs @@ -20,14 +20,14 @@ use crate::governance::{MajorityTechCommitteeOrRoot, SuperMajorityCouncilOrRoot, use crate::system::WeightToFee; use codec::{Decode, Encode, MaxEncodedLen}; -use cumulus_primitives_core::ParaId; +use cumulus_primitives_core::{AggregateMessageOrigin, ParaId}; +use frame_support::traits::TransformOrigin; use frame_support::{ parameter_types, sp_runtime::traits::Convert, traits::{Contains, Everything, Get, Nothing}, PalletId, }; -use frame_system::EnsureRoot; use hydradx_adapters::xcm_exchange::XcmAssetExchanger; use hydradx_adapters::xcm_execute_filter::AllowTransferAndSwap; use hydradx_adapters::{MultiCurrencyTrader, ToFeeReceiver}; @@ -36,10 +36,18 @@ use orml_traits::{location::AbsoluteReserveProvider, parameter_type_with_key}; pub use orml_xcm_support::{DepositToAlternative, IsNativeConcrete, MultiCurrencyAdapter, MultiNativeAsset}; use pallet_transaction_multi_payment::DepositAll; use pallet_xcm::XcmPassthrough; +use parachains_common::message_queue::{NarrowOriginToSibling, ParaIdToSibling}; use polkadot_parachain::primitives::{RelayChainBlockNumber, Sibling}; -use polkadot_xcm::v3::{prelude::*, MultiLocation, Weight as XcmWeight}; +use polkadot_xcm::latest::{Asset, Junctions, Location}; +use polkadot_xcm::prelude::InteriorLocation; +use polkadot_xcm::v3::{ + prelude::{Here, NetworkId, Parachain}, + MultiLocation, Weight as XcmWeight, +}; use primitives::AssetId; use scale_info::TypeInfo; +use sp_runtime::traits::MaybeEquivalence; +use sp_runtime::Perbill; use xcm_builder::{ AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, DescribeAllTerminal, DescribeFamily, EnsureXcmOrigin, FixedWeightBounds, HashedDescription, ParentIsPreset, @@ -51,11 +59,30 @@ use xcm_executor::{Config, XcmExecutor}; #[derive(Debug, Default, Encode, Decode, Clone, PartialEq, Eq, TypeInfo, MaxEncodedLen)] pub struct AssetLocation(pub MultiLocation); +impl Into> for AssetLocation { + fn into(self) -> Option { + xcm_builder::V4V3LocationConverter::convert_back(&self.0) + } +} + +impl TryFrom for AssetLocation { + type Error = (); + + fn try_from(value: Location) -> Result { + let loc: MultiLocation = value.try_into()?; + Ok(AssetLocation(loc)) + } +} + pub const RELAY_CHAIN_ASSET_LOCATION: AssetLocation = AssetLocation(MultiLocation { parents: 1, interior: Here, }); +parameter_types! { + pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent; +} + pub type LocalOriginToLocation = SignedToAccountId32; pub type Barrier = ( @@ -73,8 +100,9 @@ pub type Barrier = ( >, ); +use sp_std::sync::Arc; parameter_types! { - pub SelfLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(ParachainInfo::get().into()))); + pub SelfLocation: Location = Location::new(1, cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::Parachain(ParachainInfo::get().into());1]))); } parameter_types! { @@ -111,7 +139,7 @@ parameter_types! { pub const BaseXcmWeight: XcmWeight = XcmWeight::from_parts(100_000_000, 0); pub const MaxInstructions: u32 = 100; pub const MaxAssetsForTransfer: usize = 2; - pub UniversalLocation: InteriorMultiLocation = X2(GlobalConsensus(RelayNetwork::get()), Parachain(ParachainInfo::parachain_id().into())); + pub UniversalLocation: InteriorLocation = [polkadot_xcm::v4::prelude::GlobalConsensus(RelayNetwork::get().into()), polkadot_xcm::v4::prelude::Parachain(ParachainInfo::parachain_id().into())].into(); } pub struct XcmConfig; @@ -155,6 +183,7 @@ impl Config for XcmConfig { type CallDispatcher = RuntimeCall; type SafeCallFilter = SafeCallFilter; type Aliasers = Nothing; + type TransactionalProcessor = xcm_builder::FrameTransactionalProcessor; } impl cumulus_pallet_xcm::Config for Runtime { @@ -166,34 +195,23 @@ parameter_types! { pub const MaxDeferredMessages: u32 = 20; pub const MaxDeferredBuckets: u32 = 1_000; pub const MaxBucketsProcessed: u32 = 3; + pub const MaxInboundSuspended: u32 = 1_000; } impl cumulus_pallet_xcmp_queue::Config for Runtime { type RuntimeEvent = RuntimeEvent; - type XcmExecutor = XcmExecutor; type ChannelInfo = ParachainSystem; type VersionWrapper = PolkadotXcm; - type ExecuteOverweightOrigin = MajorityTechCommitteeOrRoot; type ControllerOrigin = MajorityTechCommitteeOrRoot; type ControllerOriginConverter = XcmOriginToCallOrigin; - type PriceForSiblingDelivery = (); - type WeightInfo = weights::xcmp_queue::BasiliskWeight; - type ExecuteDeferredOrigin = EnsureRoot; - type MaxDeferredMessages = MaxDeferredMessages; - type MaxDeferredBuckets = MaxDeferredBuckets; - type MaxBucketsProcessed = MaxBucketsProcessed; - type RelayChainBlockNumberProvider = RelayChainBlockNumberProvider; - type XcmDeferFilter = XcmRateLimiter; -} - -impl cumulus_pallet_dmp_queue::Config for Runtime { - type RuntimeEvent = RuntimeEvent; - type XcmExecutor = XcmExecutor; - type ExecuteOverweightOrigin = MajorityTechCommitteeOrRoot; + type PriceForSiblingDelivery = polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery; + type WeightInfo = weights::cumulus_pallet_xcmp_queue::BasiliskWeight; + type XcmpQueue = TransformOrigin; + type MaxInboundSuspended = MaxInboundSuspended; } parameter_type_with_key! { - pub ParachainMinFee: |_location: MultiLocation| -> Option { + pub ParachainMinFee: |_location: Location| -> Option { None }; } @@ -203,16 +221,18 @@ impl orml_xtokens::Config for Runtime { type Balance = Balance; type CurrencyId = AssetId; type CurrencyIdConvert = CurrencyIdConvert; - type AccountIdToMultiLocation = AccountIdToMultiLocation; + type AccountIdToLocation = AccountIdToMultiLocation; type SelfLocation = SelfLocation; type MinXcmFee = ParachainMinFee; type XcmExecutor = XcmExecutor; - type MultiLocationsFilter = Everything; + type LocationsFilter = Everything; type Weigher = FixedWeightBounds; type BaseXcmWeight = BaseXcmWeight; type UniversalLocation = UniversalLocation; type MaxAssetsForTransfer = MaxAssetsForTransfer; type ReserveProvider = AbsoluteReserveProvider; + type RateLimiter = (); //TODO: what do ? + type RateLimiterId = (); //TODO: what do ? } impl orml_unknown_tokens::Config for Runtime { @@ -224,11 +244,6 @@ impl orml_xcm::Config for Runtime { type SovereignOrigin = SuperMajorityCouncilOrRoot; } -#[cfg(feature = "runtime-benchmarks")] -parameter_types! { - pub ReachableDest: Option = Some(Parent.into()); -} - parameter_types! { //Xcm asset exchange pub DefaultPoolType: PoolType = PoolType::XYK; @@ -259,9 +274,7 @@ impl pallet_xcm::Config for Runtime { type TrustedLockers = (); type SovereignAccountOf = (); type MaxLockers = ConstU32<8>; - type WeightInfo = weights::xcm::BasiliskWeight; - #[cfg(feature = "runtime-benchmarks")] - type ReachableDest = ReachableDest; + type WeightInfo = weights::pallet_xcm::BasiliskWeight; type AdminOrigin = SuperMajorityTechCommitteeOrRoot; type MaxRemoteLockConsumers = ConstU32<0>; type RemoteLockConsumerIdentifier = (); @@ -284,77 +297,100 @@ fn defer_duration_configuration() { DeferDuration::get() ); } + parameter_types! { pub DeferDuration: RelayChainBlockNumber = 600 * 36; // 36 hours pub MaxDeferDuration: RelayChainBlockNumber = 600 * 24 * 10; // 10 days + + pub MessageQueueServiceWeight: Weight = Perbill::from_percent(25) * BlockWeights::get().max_block; + pub const MessageQueueMaxStale: u32 = 8; + pub const MessageQueueHeapSize: u32 = 128 * 1048; } -impl pallet_xcm_rate_limiter::Config for Runtime { +impl pallet_message_queue::Config for Runtime { type RuntimeEvent = RuntimeEvent; - type AssetId = AssetId; - type DeferDuration = DeferDuration; - type MaxDeferDuration = MaxDeferDuration; - type RelayBlockNumberProvider = RelayChainBlockNumberProvider; - type CurrencyIdConvert = CurrencyIdConvert; - type RateLimitFor = pallet_asset_registry::XcmRateLimitsInRegistry; + type WeightInfo = weights::pallet_message_queue::BasiliskWeight; + #[cfg(feature = "runtime-benchmarks")] + type MessageProcessor = + pallet_message_queue::mock_helpers::NoopMessageProcessor; + #[cfg(not(feature = "runtime-benchmarks"))] + type MessageProcessor = xcm_builder::ProcessXcmMessage, RuntimeCall>; + type Size = u32; + type QueueChangeHandler = NarrowOriginToSibling; + type QueuePausedQuery = NarrowOriginToSibling; + type HeapSize = MessageQueueHeapSize; + type MaxStale = MessageQueueMaxStale; + type ServiceWeight = MessageQueueServiceWeight; } pub struct CurrencyIdConvert; use primitives::constants::chain::CORE_ASSET_ID; -impl Convert> for CurrencyIdConvert { - fn convert(id: AssetId) -> Option { +impl Convert> for CurrencyIdConvert { + fn convert(id: AssetId) -> Option { match id { - CORE_ASSET_ID => Some(MultiLocation::new( - 1, - X2(Parachain(ParachainInfo::get().into()), GeneralIndex(id.into())), - )), - _ => AssetRegistry::asset_to_location(id).map(|loc| loc.0), + CORE_ASSET_ID => Some(Location { + parents: 1, + interior: [ + polkadot_xcm::prelude::Parachain(ParachainInfo::get().into()), + polkadot_xcm::prelude::GeneralIndex(id.into()), + ] + .into(), + }), + _ => { + let loc = AssetRegistry::asset_to_location(id); + if let Some(location) = loc { + location.into() + } else { + None + } + } } } } -impl Convert> for CurrencyIdConvert { - fn convert(location: MultiLocation) -> Option { - match location { - MultiLocation { - parents, - interior: X2(Parachain(id), GeneralIndex(index)), - } if parents == 1 && ParaId::from(id) == ParachainInfo::get() && (index as u32) == CORE_ASSET_ID => { - // Handling native asset for this parachain +impl Convert> for CurrencyIdConvert { + fn convert(location: Location) -> Option { + let Location { parents, interior } = location.clone(); + + match interior { + Junctions::X2(a) + if parents == 1 + && a.contains(&polkadot_xcm::prelude::GeneralIndex(CORE_ASSET_ID.into())) + && a.contains(&polkadot_xcm::prelude::Parachain(ParachainInfo::get().into())) => + { Some(CORE_ASSET_ID) } - // handle reanchor canonical location: https://github.com/paritytech/polkadot/pull/4470 - MultiLocation { - parents: 0, - interior: X1(GeneralIndex(index)), - } if (index as u32) == CORE_ASSET_ID => Some(CORE_ASSET_ID), - // delegate to asset-registry - _ => AssetRegistry::location_to_asset(AssetLocation(location)), + Junctions::X1(a) + if parents == 0 && a.contains(&polkadot_xcm::prelude::GeneralIndex(CORE_ASSET_ID.into())) => + { + Some(CORE_ASSET_ID) + } + _ => { + let location: Option = location.try_into().ok(); + if let Some(location) = location { + AssetRegistry::location_to_asset(location) + } else { + None + } + } } } } -impl Convert> for CurrencyIdConvert { - fn convert(asset: MultiAsset) -> Option { - if let MultiAsset { - id: Concrete(location), .. - } = asset - { - Self::convert(location) - } else { - None - } +impl Convert> for CurrencyIdConvert { + fn convert(asset: Asset) -> Option { + Self::convert(asset.id.0) } } pub struct AccountIdToMultiLocation; -impl Convert for AccountIdToMultiLocation { - fn convert(account: AccountId) -> MultiLocation { - X1(AccountId32 { +impl Convert for AccountIdToMultiLocation { + fn convert(account: AccountId) -> Location { + [polkadot_xcm::prelude::AccountId32 { network: None, id: account.into(), - }) + }] .into() } } @@ -368,18 +404,6 @@ pub type XcmRouter = ( XcmpQueue, ); -// TODO: Remove after upgrading to `polkadot-v1.2.0` and replace types from xcm-builder. -pub struct DescribeBodyTerminal; -impl xcm_builder::DescribeLocation for DescribeBodyTerminal { - fn describe_location(l: &MultiLocation) -> Option> { - match (l.parents, &l.interior) { - (0, X1(Plurality { id, part })) => Some((b"Body", id, part).encode()), - _ => None, - } - } -} -pub type DescribeAllTerminalAndBody = (DescribeAllTerminal, DescribeBodyTerminal); - /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used /// when determining ownership of accounts for asset transacting and when attempting to use XCM /// `Transact` in order to determine the dispatch Origin. @@ -390,9 +414,8 @@ pub type LocationToAccountId = ( SiblingParachainConvertsVia, // Straight up local `AccountId32` origins just alias directly to `AccountId`. AccountId32Aliases, - // TODO: Replace DescribeAllTerminalAndBody with DescribeAllTerminal after upgrading to `polkadot-v1.2.0`. // Foreign locations alias into accounts according to a hash of their standard description. - HashedDescription>, + HashedDescription>, ); parameter_types! { diff --git a/rust-toolchain b/rust-toolchain index 4657c24c6ec..fa4029d55a7 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,5 +1,5 @@ [toolchain] -channel = "nightly-2023-05-22" -components = [ "rustfmt", "clippy" ] +channel = "1.75.0" +components = [ "rustfmt", "clippy", "rust-src" ] targets = [ "wasm32-unknown-unknown" ] profile = "minimal" diff --git a/scripts/benchmark.all.sh b/scripts/benchmark.all.sh deleted file mode 100644 index 764b66e1cca..00000000000 --- a/scripts/benchmark.all.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -pallets=("pallet-xyk:xyk" -"pallet-lbp:lbp" -"pallet-nft:nft" -"pallet-asset-registry:asset_registry" -"pallet-xyk-liquidity-mining:xyk_liquidity_mining" -"pallet-transaction-pause:transaction_pause" -"frame-system:system" -"pallet-balances:balances" -"pallet-collator-selection:collator_selection" -"pallet-timestamp:timestamp" -"pallet-democracy:democracy" -"pallet-treasury:treasury" -"pallet-scheduler:scheduler" -"pallet-utility:utility" -"pallet-tips:tips" -"pallet-xcm:xcm" -"cumulus-pallet-xcmp-queue:xcmp_queue" -"pallet-currencies:currencies" -"orml-tokens:tokens" -"orml-vesting:vesting" -"pallet-duster:duster" -"pallet-transaction-multi-payment:payment" -"pallet-route-executor:route_executor" -"pallet-marketplace:marketplace" -) - -command="cargo run --release --features=runtime-benchmarks -- benchmark pallet --pallet=[pallet] --chain=dev --extrinsic='*' --steps=5 --repeat=20 --output [output].rs --template .maintain/pallet-weight-template-no-back.hbs" - -for string in "${pallets[@]}"; do - - IFS=':' read -ra subvalues <<< "$string" - - pallet="${subvalues[0]}" - output="${subvalues[1]}" - - echo "Running benchmark for ${pallet}" - - replaced_command="${command/\[pallet\]/$pallet}" - replaced_command="${replaced_command/\[output\]/$output}" - - eval "$replaced_command" -done diff --git a/scripts/benchmarking.sh b/scripts/benchmarking.sh new file mode 100644 index 00000000000..7128382d1e3 --- /dev/null +++ b/scripts/benchmarking.sh @@ -0,0 +1,91 @@ +#!/usr/bin/env bash +# Created by Moonbeam/Purestake Developers. Shamelessly copied from Moonbeam's benchmarking script +# Original repository: https://github.com/moonbeam-foundation/moonbeam + +# This script can be used for running Basilisk's benchmarks. +# +# The basilisk binary is required to be compiled with --features=runtime-benchmarks +# in release mode. + +set -e + +BINARY="./target/release/basilisk" +STEPS=50 +REPEAT=20 + +if [[ ! -f "${BINARY}" ]]; then + echo "binary '${BINARY}' does not exist." + echo "ensure that the basilisk binary is compiled with '--features=runtime-benchmarks' and in release mode." + exit 1 +fi + +function help { + echo "USAGE:" + echo " ${0} [ ] [--check]" + echo "" + echo "EXAMPLES:" + echo " ${0} " "list all benchmarks and provide a selection to choose from" + echo " ${0} --check " "list all benchmarks and provide a selection to choose from, runs in 'check' mode (reduced steps and repetitions)" + echo " ${0} foo bar " "run a benchmark for pallet 'foo' and benchmark 'bar'" + echo " ${0} foo bar --check " "run a benchmark for pallet 'foo' and benchmark 'bar' in 'check' mode (reduced steps and repetitions)" + echo " ${0} foo bar --all " "run a benchmark for all pallets" + echo " ${0} foo bar --all --check " "run a benchmark for all pallets in 'check' mode (reduced steps and repetitions)" +} + +function choose_and_bench { + readarray -t options < <(${BINARY} benchmark pallet --list | sed 1d) + options+=('EXIT') + + select opt in "${options[@]}"; do + IFS=', ' read -ra parts <<< "${opt}" + [[ "${opt}" == 'EXIT' ]] && exit 0 + + bench "${parts[0]}" "${parts[1]}" "${1}" + break + done +} + +function bench { + OUTPUT=${4:-weights.rs} + echo "benchmarking '${1}::${2}' --check=${3}, writing results to '${OUTPUT}'" + + # Check enabled + if [[ "${3}" -eq 1 ]]; then + STEPS=16 + REPEAT=1 + fi + + WASMTIME_BACKTRACE_DETAILS=1 ${BINARY} benchmark pallet \ + --wasm-execution=compiled \ + --pallet "${1}" \ + --extrinsic "${2}" \ + --heap-pages 4096 \ + --steps "${STEPS}" \ + --repeat "${REPEAT}" \ + --template=scripts/pallet-weight-template.hbs \ + --output "${OUTPUT}" +} + +if [[ "${@}" =~ "--help" ]]; then + help +else + CHECK=0 + if [[ "${@}" =~ "--check" ]]; then + CHECK=1 + set -o noglob && set -- ${@/'--check'} && set +o noglob + fi + + ALL=0 + if [[ "${@}" =~ "--all" ]]; then + ALL=1 + fi + + if [[ "${ALL}" -eq 1 ]]; then + mkdir -p weights/ + bench '*' '*' "${CHECK}" "weights/" + elif [[ $# -ne 2 ]]; then + choose_and_bench "${CHECK}" + else + bench "${1}" "${2}" "${CHECK}" + fi +fi \ No newline at end of file diff --git a/scripts/check_performance.sh b/scripts/check_performance.sh deleted file mode 100755 index 4fb9a4a5a91..00000000000 --- a/scripts/check_performance.sh +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/bash - -# Need to run from the top-level node directory -[ -d ".maintain" ] || { - echo "This script must be executed from the top level node directory" - exit 1 -} - -echo "Basilisk node - Simple Performance check" -echo "---------------------------------------" - -echo -echo "Prerequisites" - -echo -n "Python version >= 3.8 ..... " - -PYTHON=python3 - -command -v $PYTHON >/dev/null 2>&1 || { - echo "python3 required. Please install first" - exit 1 -} - -if ! $PYTHON -c 'import sys; assert sys.version_info >= (3,8)' >/dev/null 2>&1; then - echo "Python version 3.8 or higher required." - exit 1 -fi - -echo "OK ($($PYTHON --version))" - -echo -n "Toolchain ...... " -TOOLCHAIN=$(rustup show active-toolchain) - -if [[ $TOOLCHAIN == "nightly"* ]]; then - echo "OK ($TOOLCHAIN)" -else - echo "Nightly toolchain required" - echo "Current toolchain $TOOLCHAIN" - exit 1 -fi - -EXPECTED_BENCHWIZARD_VERSION="0.5.0" - -echo -n "benchwizard >= $EXPECTED_BENCHWIZARD_VERSION ..... " - -$PYTHON -m bench_wizard >/dev/null 2>&1 || { - echo "benchwizard required. benchwizard is cli tool developed by Basilisk dev to streamline substrate benchmark process." - echo "Installation: pip3 install bench-wizard" - echo - read -p "Do you want to install it now? [Y/n] " -n 1 -r - echo # move to a new line - if [[ ! $REPLY =~ ^[Yy]$ ]]; then - exit 1 - fi - - pip3 install bench-wizard >/dev/null || { - echo "benchwizard installation failed." - exit 1 - } -} - -CURRENT_BENCH_VERSION=$($PYTHON -m bench_wizard version | tr -d '\n') - -if [[ $EXPECTED_BENCHWIZARD_VERSION > $CURRENT_BENCH_VERSION ]]; then - echo "Please upgrade benchwizard (current version $CURRENT_BENCH_VERSION): pip3 install bench-wizard --upgrade" - read -p "Do you want to upgrade it now? [Y/n] " -n 1 -r - echo # move to a new line - if [[ ! $REPLY =~ ^[Yy]$ ]]; then - exit 1 - fi - - pip3 install bench-wizard --upgrade >/dev/null || { - echo "benchwizard upgrade failed." - exit 1 - } -fi - -echo "OK ($($PYTHON -m bench_wizard version))" - -echo - -# Run the check -# shellcheck disable=SC2086 -$PYTHON -m bench_wizard pc -p pallet-xyk -p pallet-exchange -p pallet-transaction-multi-payment -rf .maintain/basilisk-bench-data.json - -echo - -# Run DB performance check -echo "Running DB disk performance" -if [ ! -d ./substrate ];then - echo "Cloning substrate ... " - git clone --branch=polkadot-v0.9.12 https://github.com/paritytech/substrate.git ./substrate >/dev/null 2>&1 -fi -$PYTHON -m bench_wizard db -d ./substrate - -echo - diff --git a/.maintain/pallet-weight-template-no-back.hbs b/scripts/pallet-weight-template.hbs similarity index 89% rename from .maintain/pallet-weight-template-no-back.hbs rename to scripts/pallet-weight-template.hbs index 7211afb55c9..e0345239b95 100644 --- a/.maintain/pallet-weight-template-no-back.hbs +++ b/scripts/pallet-weight-template.hbs @@ -37,24 +37,12 @@ use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}}; use core::marker::PhantomData; -/// Weight functions needed for `{{pallet}}`. -pub trait WeightInfo { - {{#each benchmarks as |benchmark|}} - fn {{benchmark.name~}} - ( - {{~#each benchmark.components as |c| ~}} - {{c.name}}: u32, {{/each~}} - ) -> Weight; - {{/each}} -} +/// Weights for `{{pallet}}`. +pub struct WeightInfo(PhantomData); /// Weights for `{{pallet}}` using the Basilisk node and recommended hardware. pub struct BasiliskWeight(PhantomData); -{{#if (eq pallet "frame_system")}} -impl WeightInfo for BasiliskWeight { -{{else}} -impl WeightInfo for BasiliskWeight { -{{/if}} +impl {{pallet}}::WeightInfo for BasiliskWeight { {{#each benchmarks as |benchmark|}} {{#each benchmark.comments as |comment|}} /// {{comment}}