Skip to content

Commit 468e8b6

Browse files
mordamaxmordamax
committed
merge master & conflicts
2 parents 66e3f61 + 60146ba commit 468e8b6

File tree

65 files changed

+2244
-886
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+2244
-886
lines changed

‎Cargo.lock

+30-27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cumulus/client/relay-chain-rpc-interface/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ rand = { workspace = true, default-features = true }
4848
schnellru = { workspace = true }
4949
serde = { workspace = true, default-features = true }
5050
serde_json = { workspace = true, default-features = true }
51-
smoldot = { default_features = false, features = ["std"], workspace = true }
52-
smoldot-light = { default_features = false, features = ["std"], workspace = true }
51+
smoldot = { default-features = false, features = ["std"], workspace = true }
52+
smoldot-light = { default-features = false, features = ["std"], workspace = true }
5353
thiserror = { workspace = true }
5454
tracing = { workspace = true, default-features = true }
5555
url = { workspace = true }

‎cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1648,7 +1648,7 @@ impl_runtime_apis! {
16481648
Vec<frame_benchmarking::BenchmarkList>,
16491649
Vec<frame_support::traits::StorageInfo>,
16501650
) {
1651-
use frame_benchmarking::{Benchmarking, BenchmarkList};
1651+
use frame_benchmarking::BenchmarkList;
16521652
use frame_support::traits::StorageInfoTrait;
16531653
use frame_system_benchmarking::Pallet as SystemBench;
16541654
use frame_system_benchmarking::extensions::Pallet as SystemExtensionsBench;
@@ -1682,7 +1682,7 @@ impl_runtime_apis! {
16821682
fn dispatch_benchmark(
16831683
config: frame_benchmarking::BenchmarkConfig
16841684
) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, alloc::string::String> {
1685-
use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError};
1685+
use frame_benchmarking::{BenchmarkBatch, BenchmarkError};
16861686
use sp_storage::TrackedStorageKey;
16871687

16881688
use frame_system_benchmarking::Pallet as SystemBench;

‎cumulus/parachains/runtimes/assets/asset-hub-rococo/src/weights/pallet_message_queue.rs

+36-22
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
//! Autogenerated weights for `pallet_message_queue`
1717
//!
1818
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
19-
//! DATE: 2025-02-11, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
19+
//! DATE: 2025-02-12, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
2020
//! WORST CASE MAP SIZE: `1000000`
21-
//! HOSTNAME: `a7901b5928f1`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
21+
//! HOSTNAME: `793863dddfdf`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
2222
//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: 1024
2323
2424
// Executed Command:
@@ -58,8 +58,8 @@ impl<T: frame_system::Config> pallet_message_queue::WeightInfo for WeightInfo<T>
5858
// Proof Size summary in bytes:
5959
// Measured: `260`
6060
// Estimated: `6044`
61-
// Minimum execution time: 14_352_000 picoseconds.
62-
Weight::from_parts(14_857_000, 0)
61+
// Minimum execution time: 14_658_000 picoseconds.
62+
Weight::from_parts(14_990_000, 0)
6363
.saturating_add(Weight::from_parts(0, 6044))
6464
.saturating_add(T::DbWeight::get().reads(3))
6565
.saturating_add(T::DbWeight::get().writes(2))
@@ -72,8 +72,8 @@ impl<T: frame_system::Config> pallet_message_queue::WeightInfo for WeightInfo<T>
7272
// Proof Size summary in bytes:
7373
// Measured: `255`
7474
// Estimated: `6044`
75-
// Minimum execution time: 13_075_000 picoseconds.
76-
Weight::from_parts(13_817_000, 0)
75+
// Minimum execution time: 13_260_000 picoseconds.
76+
Weight::from_parts(13_568_000, 0)
7777
.saturating_add(Weight::from_parts(0, 6044))
7878
.saturating_add(T::DbWeight::get().reads(3))
7979
.saturating_add(T::DbWeight::get().writes(3))
@@ -84,8 +84,8 @@ impl<T: frame_system::Config> pallet_message_queue::WeightInfo for WeightInfo<T>
8484
// Proof Size summary in bytes:
8585
// Measured: `42`
8686
// Estimated: `3517`
87-
// Minimum execution time: 4_959_000 picoseconds.
88-
Weight::from_parts(5_094_000, 0)
87+
// Minimum execution time: 4_874_000 picoseconds.
88+
Weight::from_parts(5_076_000, 0)
8989
.saturating_add(Weight::from_parts(0, 3517))
9090
.saturating_add(T::DbWeight::get().reads(1))
9191
.saturating_add(T::DbWeight::get().writes(1))
@@ -96,8 +96,8 @@ impl<T: frame_system::Config> pallet_message_queue::WeightInfo for WeightInfo<T>
9696
// Proof Size summary in bytes:
9797
// Measured: `109`
9898
// Estimated: `108986`
99-
// Minimum execution time: 7_190_000 picoseconds.
100-
Weight::from_parts(7_344_000, 0)
99+
// Minimum execution time: 7_154_000 picoseconds.
100+
Weight::from_parts(7_424_000, 0)
101101
.saturating_add(Weight::from_parts(0, 108986))
102102
.saturating_add(T::DbWeight::get().reads(1))
103103
.saturating_add(T::DbWeight::get().writes(1))
@@ -108,8 +108,8 @@ impl<T: frame_system::Config> pallet_message_queue::WeightInfo for WeightInfo<T>
108108
// Proof Size summary in bytes:
109109
// Measured: `109`
110110
// Estimated: `108986`
111-
// Minimum execution time: 7_302_000 picoseconds.
112-
Weight::from_parts(7_534_000, 0)
111+
// Minimum execution time: 7_372_000 picoseconds.
112+
Weight::from_parts(7_549_000, 0)
113113
.saturating_add(Weight::from_parts(0, 108986))
114114
.saturating_add(T::DbWeight::get().reads(1))
115115
.saturating_add(T::DbWeight::get().writes(1))
@@ -122,8 +122,8 @@ impl<T: frame_system::Config> pallet_message_queue::WeightInfo for WeightInfo<T>
122122
// Proof Size summary in bytes:
123123
// Measured: `0`
124124
// Estimated: `0`
125-
// Minimum execution time: 261_755_000 picoseconds.
126-
Weight::from_parts(264_922_000, 0)
125+
// Minimum execution time: 268_796_000 picoseconds.
126+
Weight::from_parts(275_170_000, 0)
127127
.saturating_add(Weight::from_parts(0, 0))
128128
.saturating_add(T::DbWeight::get().writes(2))
129129
}
@@ -135,12 +135,26 @@ impl<T: frame_system::Config> pallet_message_queue::WeightInfo for WeightInfo<T>
135135
// Proof Size summary in bytes:
136136
// Measured: `208`
137137
// Estimated: `3517`
138-
// Minimum execution time: 8_601_000 picoseconds.
139-
Weight::from_parts(8_993_000, 0)
138+
// Minimum execution time: 8_531_000 picoseconds.
139+
Weight::from_parts(8_923_000, 0)
140140
.saturating_add(Weight::from_parts(0, 3517))
141141
.saturating_add(T::DbWeight::get().reads(2))
142142
.saturating_add(T::DbWeight::get().writes(1))
143143
}
144+
/// Storage: `MessageQueue::BookStateFor` (r:1 w:0)
145+
/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
146+
/// Storage: `MessageQueue::ServiceHead` (r:0 w:1)
147+
/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
148+
fn set_service_head() -> Weight {
149+
// Proof Size summary in bytes:
150+
// Measured: `198`
151+
// Estimated: `3517`
152+
// Minimum execution time: 7_083_000 picoseconds.
153+
Weight::from_parts(7_351_000, 0)
154+
.saturating_add(Weight::from_parts(0, 3517))
155+
.saturating_add(T::DbWeight::get().reads(1))
156+
.saturating_add(T::DbWeight::get().writes(1))
157+
}
144158
/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
145159
/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
146160
/// Storage: `MessageQueue::Pages` (r:1 w:1)
@@ -149,8 +163,8 @@ impl<T: frame_system::Config> pallet_message_queue::WeightInfo for WeightInfo<T>
149163
// Proof Size summary in bytes:
150164
// Measured: `105646`
151165
// Estimated: `108986`
152-
// Minimum execution time: 83_338_000 picoseconds.
153-
Weight::from_parts(84_755_000, 0)
166+
// Minimum execution time: 88_053_000 picoseconds.
167+
Weight::from_parts(89_630_000, 0)
154168
.saturating_add(Weight::from_parts(0, 108986))
155169
.saturating_add(T::DbWeight::get().reads(2))
156170
.saturating_add(T::DbWeight::get().writes(2))
@@ -163,8 +177,8 @@ impl<T: frame_system::Config> pallet_message_queue::WeightInfo for WeightInfo<T>
163177
// Proof Size summary in bytes:
164178
// Measured: `105646`
165179
// Estimated: `108986`
166-
// Minimum execution time: 110_110_000 picoseconds.
167-
Weight::from_parts(112_286_000, 0)
180+
// Minimum execution time: 113_929_000 picoseconds.
181+
Weight::from_parts(117_331_000, 0)
168182
.saturating_add(Weight::from_parts(0, 108986))
169183
.saturating_add(T::DbWeight::get().reads(2))
170184
.saturating_add(T::DbWeight::get().writes(2))
@@ -177,8 +191,8 @@ impl<T: frame_system::Config> pallet_message_queue::WeightInfo for WeightInfo<T>
177191
// Proof Size summary in bytes:
178192
// Measured: `105646`
179193
// Estimated: `108986`
180-
// Minimum execution time: 172_848_000 picoseconds.
181-
Weight::from_parts(175_267_000, 0)
194+
// Minimum execution time: 181_265_000 picoseconds.
195+
Weight::from_parts(191_245_000, 0)
182196
.saturating_add(Weight::from_parts(0, 108986))
183197
.saturating_add(T::DbWeight::get().reads(2))
184198
.saturating_add(T::DbWeight::get().writes(2))

‎cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1844,7 +1844,7 @@ impl_runtime_apis! {
18441844
Vec<frame_benchmarking::BenchmarkList>,
18451845
Vec<frame_support::traits::StorageInfo>,
18461846
) {
1847-
use frame_benchmarking::{Benchmarking, BenchmarkList};
1847+
use frame_benchmarking::BenchmarkList;
18481848
use frame_support::traits::StorageInfoTrait;
18491849
use frame_system_benchmarking::Pallet as SystemBench;
18501850
use frame_system_benchmarking::extensions::Pallet as SystemExtensionsBench;
@@ -1878,7 +1878,7 @@ impl_runtime_apis! {
18781878
fn dispatch_benchmark(
18791879
config: frame_benchmarking::BenchmarkConfig
18801880
) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, alloc::string::String> {
1881-
use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError};
1881+
use frame_benchmarking::{BenchmarkBatch, BenchmarkError};
18821882
use sp_storage::TrackedStorageKey;
18831883

18841884
use frame_system_benchmarking::Pallet as SystemBench;

0 commit comments

Comments
 (0)