mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-07 06:08:03 +00:00
Oliver Tale-Yazdi
e1c033ebe1
(imported from https://github.com/paritytech/cumulus/pull/2157) ## Changes This MR refactores the XCMP, Parachains System and DMP pallets to use the [MessageQueue](https://github.com/paritytech/substrate/pull/12485) for delayed execution of incoming messages. The DMP pallet is entirely replaced by the MQ and thereby removed. This allows for PoV-bounded execution and resolves a number of issues that stem from the current work-around. All System Parachains adopt this change. The most important changes are in `primitives/core/src/lib.rs`, `parachains/common/src/process_xcm_message.rs`, `pallets/parachain-system/src/lib.rs`, `pallets/xcmp-queue/src/lib.rs` and the runtime configs. ### DMP Queue Pallet The pallet got removed and its logic refactored into parachain-system. Overweight message management can be done directly through the MQ pallet. Final undeployment migrations are provided by `cumulus_pallet_dmp_queue::UndeployDmpQueue` and `DeleteDmpQueue` that can be configured with an aux config trait like: ```rust parameter_types! { pub const DmpQueuePalletName: &'static str = \"DmpQueue\" < CHANGE ME; pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent; } impl cumulus_pallet_dmp_queue::MigrationConfig for Runtime { type PalletName = DmpQueuePalletName; type DmpHandler = frame_support::traits::EnqueueWithOrigin<MessageQueue, RelayOrigin>; type DbWeight = <Runtime as frame_system::Config>::DbWeight; } // And adding them to your Migrations tuple: pub type Migrations = ( ... cumulus_pallet_dmp_queue::UndeployDmpQueue<Runtime>, cumulus_pallet_dmp_queue::DeleteDmpQueue<Runtime>, ); ``` ### XCMP Queue pallet Removed all dispatch queue functionality. Incoming XCMP messages are now either: Immediately handled if they are Signals, enqueued into the MQ pallet otherwise. New config items for the XCMP queue pallet: ```rust /// The actual queue implementation that retains the messages for later processing. type XcmpQueue: EnqueueMessage<ParaId>; /// How a XCM over HRMP from a sibling parachain should be processed. type XcmpProcessor: ProcessMessage<Origin = ParaId>; /// The maximal number of suspended XCMP channels at the same time. #[pallet::constant] type MaxInboundSuspended: Get<u32>; ``` How to configure those: ```rust // Use the MessageQueue pallet to store messages for later processing. The `TransformOrigin` is needed since // the MQ pallet itself operators on `AggregateMessageOrigin` but we want to enqueue `ParaId`s. type XcmpQueue = TransformOrigin<MessageQueue, AggregateMessageOrigin, ParaId, ParaIdToSibling>; // Process XCMP messages from siblings. This is type-safe to only accept `ParaId`s. They will be dispatched // with origin `Junction::Sibling(…)`. type XcmpProcessor = ProcessFromSibling< ProcessXcmMessage< AggregateMessageOrigin, xcm_executor::XcmExecutor<xcm_config::XcmConfig>, RuntimeCall, >, >; // Not really important what to choose here. Just something larger than the maximal number of channels. type MaxInboundSuspended = sp_core::ConstU32<1_000>; ``` The `InboundXcmpStatus` storage item was replaced by `InboundXcmpSuspended` since it now only tracks inbound queue suspension and no message indices anymore. Now only sends the most recent channel `Signals`, as all prio ones are out-dated anyway. ### Parachain System pallet For `DMP` messages instead of forwarding them to the `DMP` pallet, it now pushes them to the configured `DmpQueue`. The message processing which was triggered in `set_validation_data` is now being done by the MQ pallet `on_initialize`. XCMP messages are still handed off to the `XcmpMessageHandler` (XCMP-Queue pallet) - no change here. New config items for the parachain system pallet: ```rust /// Queues inbound downward messages for delayed processing. /// /// Analogous to the `XcmpQueue` of the XCMP queue pallet. type DmpQueue: EnqueueMessage<AggregateMessageOrigin>; ``` How to configure: ```rust /// Use the MQ pallet to store DMP messages for delayed processing. type DmpQueue = MessageQueue; ``` ## Message Flow The flow of messages on the parachain side. Messages come in from the left via the `Validation Data` and finally end up at the `Xcm Executor` on the right.  ## Further changes - Bumped the default suspension, drop and resume thresholds in `QueueConfigData::default()`. - `XcmpQueue::{suspend_xcm_execution, resume_xcm_execution}` errors when they would be a noop. - Properly validate the `QueueConfigData` before setting it. - Marked weight files as auto-generated so they wont auto-expand in the MR files view. - Move the `hypothetical` asserts to `frame_support` under the name `experimental_hypothetically` Questions: - [ ] What about the ugly `#[cfg(feature = \"runtime-benchmarks\")]` in the runtimes? Not sure how to best fix. Just having them like this makes tests fail that rely on the real message processor when the feature is enabled. - [ ] Need a good weight for `MessageQueueServiceWeight`. The scheduler already takes 80% so I put it to 10% but that is quite low. TODO: - [x] Remove c&p code after https://github.com/paritytech/polkadot/pull/6271 - [x] Use `HandleMessage` once it is public in Substrate - [x] fix `runtime-benchmarks` feature https://github.com/paritytech/polkadot/pull/6966 - [x] Benchmarks - [x] Tests - [ ] Migrate `InboundXcmpStatus` to `InboundXcmpSuspended` - [x] Possibly cleanup Migrations (DMP+XCMP) - [x] optional: create `TransformProcessMessageOrigin` in Substrate and replace `ProcessFromSibling` - [ ] Rerun weights on ref HW --------- Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> Co-authored-by: Liam Aharon <liam.aharon@hotmail.com> Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com> Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com> Co-authored-by: command-bot <>
252 lines
12 KiB
Rust
252 lines
12 KiB
Rust
// Copyright (C) Parity Technologies (UK) Ltd.
|
|
// 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-09-15, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
|
|
//! WORST CASE MAP SIZE: `1000000`
|
|
//! HOSTNAME: `Olivers-MacBook-Pro.local`, CPU: `<UNKNOWN>`
|
|
//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("asset-hub-kusama-dev")`, DB CACHE: `1024`
|
|
|
|
// Executed Command:
|
|
// ./target/release/polkadot-parachain
|
|
// benchmark
|
|
// pallet
|
|
// --pallet
|
|
// cumulus-pallet-xcmp-queue
|
|
// --chain
|
|
// asset-hub-kusama-dev
|
|
// --output
|
|
// cumulus/pallets/xcmp-queue/src/weights.rs
|
|
// --template
|
|
// substrate/.maintain/frame-weight-template.hbs
|
|
// --extrinsic
|
|
//
|
|
|
|
#![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 `cumulus_pallet_xcmp_queue`.
|
|
pub trait WeightInfo {
|
|
fn set_config_with_u32() -> Weight;
|
|
fn enqueue_xcmp_message() -> Weight;
|
|
fn suspend_channel() -> Weight;
|
|
fn resume_channel() -> Weight;
|
|
fn take_first_concatenated_xcm() -> Weight;
|
|
fn on_idle_good_msg() -> Weight;
|
|
fn on_idle_large_msg() -> Weight;
|
|
}
|
|
|
|
/// Weights for `cumulus_pallet_xcmp_queue` using the Substrate node and recommended hardware.
|
|
pub struct SubstrateWeight<T>(PhantomData<T>);
|
|
impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
|
|
/// 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: `76`
|
|
// Estimated: `1561`
|
|
// Minimum execution time: 5_000_000 picoseconds.
|
|
Weight::from_parts(6_000_000, 1561)
|
|
.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(65585), added: 68060, mode: `MaxEncodedLen`)
|
|
fn enqueue_xcmp_message() -> Weight {
|
|
// Proof Size summary in bytes:
|
|
// Measured: `118`
|
|
// Estimated: `3517`
|
|
// Minimum execution time: 15_000_000 picoseconds.
|
|
Weight::from_parts(16_000_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: `76`
|
|
// Estimated: `1561`
|
|
// Minimum execution time: 3_000_000 picoseconds.
|
|
Weight::from_parts(4_000_000, 1561)
|
|
.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: `111`
|
|
// Estimated: `1596`
|
|
// Minimum execution time: 4_000_000 picoseconds.
|
|
Weight::from_parts(4_000_000, 1596)
|
|
.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: 44_000_000 picoseconds.
|
|
Weight::from_parts(45_000_000, 0)
|
|
}
|
|
/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
|
|
/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
|
|
/// Storage: `XcmpQueue::InboundXcmpMessages` (r:1 w:1)
|
|
/// Proof: `XcmpQueue::InboundXcmpMessages` (`max_values`: None, `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::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(65585), added: 68060, mode: `MaxEncodedLen`)
|
|
fn on_idle_good_msg() -> Weight {
|
|
// Proof Size summary in bytes:
|
|
// Measured: `65747`
|
|
// Estimated: `69212`
|
|
// Minimum execution time: 63_000_000 picoseconds.
|
|
Weight::from_parts(66_000_000, 69212)
|
|
.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)
|
|
fn on_idle_large_msg() -> Weight {
|
|
// Proof Size summary in bytes:
|
|
// Measured: `65710`
|
|
// Estimated: `69175`
|
|
// Minimum execution time: 42_000_000 picoseconds.
|
|
Weight::from_parts(52_000_000, 69175)
|
|
.saturating_add(T::DbWeight::get().reads(2_u64))
|
|
.saturating_add(T::DbWeight::get().writes(2_u64))
|
|
}
|
|
}
|
|
|
|
// For backwards compatibility and tests.
|
|
impl WeightInfo for () {
|
|
/// 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: `76`
|
|
// Estimated: `1561`
|
|
// Minimum execution time: 5_000_000 picoseconds.
|
|
Weight::from_parts(6_000_000, 1561)
|
|
.saturating_add(RocksDbWeight::get().reads(1_u64))
|
|
.saturating_add(RocksDbWeight::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(65585), added: 68060, mode: `MaxEncodedLen`)
|
|
fn enqueue_xcmp_message() -> Weight {
|
|
// Proof Size summary in bytes:
|
|
// Measured: `118`
|
|
// Estimated: `3517`
|
|
// Minimum execution time: 15_000_000 picoseconds.
|
|
Weight::from_parts(16_000_000, 3517)
|
|
.saturating_add(RocksDbWeight::get().reads(4_u64))
|
|
.saturating_add(RocksDbWeight::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: `76`
|
|
// Estimated: `1561`
|
|
// Minimum execution time: 3_000_000 picoseconds.
|
|
Weight::from_parts(4_000_000, 1561)
|
|
.saturating_add(RocksDbWeight::get().reads(1_u64))
|
|
.saturating_add(RocksDbWeight::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: `111`
|
|
// Estimated: `1596`
|
|
// Minimum execution time: 4_000_000 picoseconds.
|
|
Weight::from_parts(4_000_000, 1596)
|
|
.saturating_add(RocksDbWeight::get().reads(1_u64))
|
|
.saturating_add(RocksDbWeight::get().writes(1_u64))
|
|
}
|
|
fn take_first_concatenated_xcm() -> Weight {
|
|
// Proof Size summary in bytes:
|
|
// Measured: `0`
|
|
// Estimated: `0`
|
|
// Minimum execution time: 44_000_000 picoseconds.
|
|
Weight::from_parts(45_000_000, 0)
|
|
}
|
|
/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
|
|
/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
|
|
/// Storage: `XcmpQueue::InboundXcmpMessages` (r:1 w:1)
|
|
/// Proof: `XcmpQueue::InboundXcmpMessages` (`max_values`: None, `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::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(65585), added: 68060, mode: `MaxEncodedLen`)
|
|
fn on_idle_good_msg() -> Weight {
|
|
// Proof Size summary in bytes:
|
|
// Measured: `65747`
|
|
// Estimated: `69212`
|
|
// Minimum execution time: 63_000_000 picoseconds.
|
|
Weight::from_parts(66_000_000, 69212)
|
|
.saturating_add(RocksDbWeight::get().reads(6_u64))
|
|
.saturating_add(RocksDbWeight::get().writes(5_u64))
|
|
}
|
|
/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
|
|
/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
|
|
fn on_idle_large_msg() -> Weight {
|
|
// Proof Size summary in bytes:
|
|
// Measured: `65710`
|
|
// Estimated: `69175`
|
|
// Minimum execution time: 42_000_000 picoseconds.
|
|
Weight::from_parts(52_000_000, 69175)
|
|
.saturating_add(RocksDbWeight::get().reads(2_u64))
|
|
.saturating_add(RocksDbWeight::get().writes(2_u64))
|
|
}
|
|
}
|