mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-09 05:57:59 +00:00
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 <>
373 lines
11 KiB
Rust
373 lines
11 KiB
Rust
// This file is part of Substrate.
|
|
|
|
// 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.
|
|
|
|
//! Test helpers and runtime setup for the message queue pallet.
|
|
|
|
#![cfg(test)]
|
|
|
|
pub use super::mock_helpers::*;
|
|
use super::*;
|
|
|
|
use crate as pallet_message_queue;
|
|
use frame_support::{
|
|
parameter_types,
|
|
traits::{ConstU32, ConstU64},
|
|
};
|
|
use sp_core::H256;
|
|
use sp_runtime::{
|
|
traits::{BlakeTwo256, IdentityLookup},
|
|
BuildStorage,
|
|
};
|
|
use sp_std::collections::btree_map::BTreeMap;
|
|
|
|
type Block = frame_system::mocking::MockBlock<Test>;
|
|
|
|
frame_support::construct_runtime!(
|
|
pub enum Test
|
|
{
|
|
System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
|
|
MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event<T>},
|
|
}
|
|
);
|
|
impl frame_system::Config for Test {
|
|
type BaseCallFilter = frame_support::traits::Everything;
|
|
type BlockWeights = ();
|
|
type BlockLength = ();
|
|
type DbWeight = ();
|
|
type RuntimeOrigin = RuntimeOrigin;
|
|
type Nonce = u64;
|
|
type Hash = H256;
|
|
type RuntimeCall = RuntimeCall;
|
|
type Hashing = BlakeTwo256;
|
|
type AccountId = u64;
|
|
type Lookup = IdentityLookup<Self::AccountId>;
|
|
type Block = Block;
|
|
type RuntimeEvent = RuntimeEvent;
|
|
type BlockHashCount = ConstU64<250>;
|
|
type Version = ();
|
|
type PalletInfo = PalletInfo;
|
|
type AccountData = ();
|
|
type OnNewAccount = ();
|
|
type OnKilledAccount = ();
|
|
type SystemWeightInfo = ();
|
|
type SS58Prefix = ();
|
|
type OnSetCode = ();
|
|
type MaxConsumers = ConstU32<16>;
|
|
}
|
|
parameter_types! {
|
|
pub const HeapSize: u32 = 24;
|
|
pub const MaxStale: u32 = 2;
|
|
pub const ServiceWeight: Option<Weight> = Some(Weight::from_parts(100, 100));
|
|
}
|
|
impl Config for Test {
|
|
type RuntimeEvent = RuntimeEvent;
|
|
type WeightInfo = MockedWeightInfo;
|
|
type MessageProcessor = RecordingMessageProcessor;
|
|
type Size = u32;
|
|
type QueueChangeHandler = RecordingQueueChangeHandler;
|
|
type QueuePausedQuery = MockedQueuePauser;
|
|
type HeapSize = HeapSize;
|
|
type MaxStale = MaxStale;
|
|
type ServiceWeight = ServiceWeight;
|
|
}
|
|
|
|
/// Mocked `WeightInfo` impl with allows to set the weight per call.
|
|
pub struct MockedWeightInfo;
|
|
|
|
parameter_types! {
|
|
/// Storage for `MockedWeightInfo`, do not use directly.
|
|
pub static WeightForCall: BTreeMap<String, Weight> = Default::default();
|
|
pub static DefaultWeightForCall: Weight = Weight::zero();
|
|
}
|
|
|
|
/// Set the return value for a function from the `WeightInfo` trait.
|
|
impl MockedWeightInfo {
|
|
/// Set the weight of a specific weight function.
|
|
pub fn set_weight<T: Config>(call_name: &str, weight: Weight) {
|
|
let mut calls = WeightForCall::get();
|
|
calls.insert(call_name.into(), weight);
|
|
WeightForCall::set(calls);
|
|
}
|
|
}
|
|
|
|
impl crate::weights::WeightInfo for MockedWeightInfo {
|
|
fn reap_page() -> Weight {
|
|
WeightForCall::get().get("reap_page").copied().unwrap_or_default()
|
|
}
|
|
fn execute_overweight_page_updated() -> Weight {
|
|
WeightForCall::get()
|
|
.get("execute_overweight_page_updated")
|
|
.copied()
|
|
.unwrap_or(DefaultWeightForCall::get())
|
|
}
|
|
fn execute_overweight_page_removed() -> Weight {
|
|
WeightForCall::get()
|
|
.get("execute_overweight_page_removed")
|
|
.copied()
|
|
.unwrap_or(DefaultWeightForCall::get())
|
|
}
|
|
fn service_page_base_completion() -> Weight {
|
|
WeightForCall::get()
|
|
.get("service_page_base_completion")
|
|
.copied()
|
|
.unwrap_or(DefaultWeightForCall::get())
|
|
}
|
|
fn service_page_base_no_completion() -> Weight {
|
|
WeightForCall::get()
|
|
.get("service_page_base_no_completion")
|
|
.copied()
|
|
.unwrap_or(DefaultWeightForCall::get())
|
|
}
|
|
fn service_queue_base() -> Weight {
|
|
WeightForCall::get()
|
|
.get("service_queue_base")
|
|
.copied()
|
|
.unwrap_or(DefaultWeightForCall::get())
|
|
}
|
|
fn bump_service_head() -> Weight {
|
|
WeightForCall::get()
|
|
.get("bump_service_head")
|
|
.copied()
|
|
.unwrap_or(DefaultWeightForCall::get())
|
|
}
|
|
fn service_page_item() -> Weight {
|
|
WeightForCall::get()
|
|
.get("service_page_item")
|
|
.copied()
|
|
.unwrap_or(DefaultWeightForCall::get())
|
|
}
|
|
fn ready_ring_knit() -> Weight {
|
|
WeightForCall::get()
|
|
.get("ready_ring_knit")
|
|
.copied()
|
|
.unwrap_or(DefaultWeightForCall::get())
|
|
}
|
|
fn ready_ring_unknit() -> Weight {
|
|
WeightForCall::get()
|
|
.get("ready_ring_unknit")
|
|
.copied()
|
|
.unwrap_or(DefaultWeightForCall::get())
|
|
}
|
|
}
|
|
|
|
parameter_types! {
|
|
pub static MessagesProcessed: Vec<(Vec<u8>, MessageOrigin)> = vec![];
|
|
/// Queues that should return `Yield` upon being processed.
|
|
pub static YieldingQueues: Vec<MessageOrigin> = vec![];
|
|
}
|
|
|
|
/// A message processor which records all processed messages into [`MessagesProcessed`].
|
|
pub struct RecordingMessageProcessor;
|
|
impl ProcessMessage for RecordingMessageProcessor {
|
|
/// The transport from where a message originates.
|
|
type Origin = MessageOrigin;
|
|
|
|
/// Process the given message, using no more than `weight_limit` in weight to do so.
|
|
///
|
|
/// Consumes exactly `n` weight of all components if it starts `weight=n` and `1` otherwise.
|
|
/// Errors if given the `weight_limit` is insufficient to process the message or if the message
|
|
/// is `badformat`, `corrupt` or `unsupported` with the respective error.
|
|
fn process_message(
|
|
message: &[u8],
|
|
origin: Self::Origin,
|
|
meter: &mut WeightMeter,
|
|
_id: &mut [u8; 32],
|
|
) -> Result<bool, ProcessMessageError> {
|
|
processing_message(message, &origin)?;
|
|
|
|
let weight = if message.starts_with(&b"weight="[..]) {
|
|
let mut w: u64 = 0;
|
|
for &c in &message[7..] {
|
|
if (b'0'..=b'9').contains(&c) {
|
|
w = w * 10 + (c - b'0') as u64;
|
|
} else {
|
|
break
|
|
}
|
|
}
|
|
w
|
|
} else {
|
|
1
|
|
};
|
|
let required = Weight::from_parts(weight, weight);
|
|
|
|
if meter.try_consume(required).is_ok() {
|
|
let mut m = MessagesProcessed::get();
|
|
m.push((message.to_vec(), origin));
|
|
MessagesProcessed::set(m);
|
|
Ok(true)
|
|
} else {
|
|
Err(ProcessMessageError::Overweight(required))
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Processed a mocked message. Messages that end with `badformat`, `corrupt`, `unsupported` or
|
|
/// `yield` will fail with an error respectively.
|
|
fn processing_message(msg: &[u8], origin: &MessageOrigin) -> Result<(), ProcessMessageError> {
|
|
if YieldingQueues::get().contains(&origin) {
|
|
return Err(ProcessMessageError::Yield)
|
|
}
|
|
|
|
let msg = String::from_utf8_lossy(msg);
|
|
if msg.ends_with("badformat") {
|
|
Err(ProcessMessageError::BadFormat)
|
|
} else if msg.ends_with("corrupt") {
|
|
Err(ProcessMessageError::Corrupt)
|
|
} else if msg.ends_with("unsupported") {
|
|
Err(ProcessMessageError::Unsupported)
|
|
} else if msg.ends_with("yield") {
|
|
Err(ProcessMessageError::Yield)
|
|
} else {
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
parameter_types! {
|
|
pub static NumMessagesProcessed: usize = 0;
|
|
pub static NumMessagesErrored: usize = 0;
|
|
}
|
|
|
|
/// Similar to [`RecordingMessageProcessor`] but only counts the number of messages processed and
|
|
/// does always consume one weight per message.
|
|
///
|
|
/// The [`RecordingMessageProcessor`] is a bit too slow for the integration tests.
|
|
pub struct CountingMessageProcessor;
|
|
impl ProcessMessage for CountingMessageProcessor {
|
|
type Origin = MessageOrigin;
|
|
|
|
fn process_message(
|
|
message: &[u8],
|
|
origin: Self::Origin,
|
|
meter: &mut WeightMeter,
|
|
_id: &mut [u8; 32],
|
|
) -> Result<bool, ProcessMessageError> {
|
|
if let Err(e) = processing_message(message, &origin) {
|
|
NumMessagesErrored::set(NumMessagesErrored::get() + 1);
|
|
return Err(e)
|
|
}
|
|
let required = Weight::from_parts(1, 1);
|
|
|
|
if meter.try_consume(required).is_ok() {
|
|
NumMessagesProcessed::set(NumMessagesProcessed::get() + 1);
|
|
Ok(true)
|
|
} else {
|
|
Err(ProcessMessageError::Overweight(required))
|
|
}
|
|
}
|
|
}
|
|
|
|
parameter_types! {
|
|
/// Storage for `RecordingQueueChangeHandler`, do not use directly.
|
|
pub static QueueChanges: Vec<(MessageOrigin, u64, u64)> = vec![];
|
|
}
|
|
|
|
/// Records all queue changes into [`QueueChanges`].
|
|
pub struct RecordingQueueChangeHandler;
|
|
impl OnQueueChanged<MessageOrigin> for RecordingQueueChangeHandler {
|
|
fn on_queue_changed(id: MessageOrigin, fp: QueueFootprint) {
|
|
QueueChanges::mutate(|cs| cs.push((id, fp.storage.count, fp.storage.size)));
|
|
}
|
|
}
|
|
|
|
parameter_types! {
|
|
pub static PausedQueues: Vec<MessageOrigin> = vec![];
|
|
}
|
|
|
|
pub struct MockedQueuePauser;
|
|
impl QueuePausedQuery<MessageOrigin> for MockedQueuePauser {
|
|
fn is_paused(id: &MessageOrigin) -> bool {
|
|
PausedQueues::get().contains(id)
|
|
}
|
|
}
|
|
|
|
/// Create new test externalities.
|
|
///
|
|
/// Is generic since it is used by the unit test, integration tests and benchmarks.
|
|
pub fn new_test_ext<T: Config>() -> sp_io::TestExternalities
|
|
where
|
|
frame_system::pallet_prelude::BlockNumberFor<T>: From<u32>,
|
|
{
|
|
sp_tracing::try_init_simple();
|
|
WeightForCall::take();
|
|
QueueChanges::take();
|
|
NumMessagesErrored::take();
|
|
let t = frame_system::GenesisConfig::<T>::default().build_storage().unwrap();
|
|
let mut ext = sp_io::TestExternalities::new(t);
|
|
ext.execute_with(|| frame_system::Pallet::<T>::set_block_number(1.into()));
|
|
ext
|
|
}
|
|
|
|
/// Run the function pointer inside externalities and asserts the try_state hook at the end.
|
|
pub fn build_and_execute<T: Config>(test: impl FnOnce() -> ())
|
|
where
|
|
BlockNumberFor<T>: From<u32>,
|
|
{
|
|
new_test_ext::<T>().execute_with(|| {
|
|
test();
|
|
MessageQueue::do_try_state().expect("All invariants must hold after a test");
|
|
});
|
|
}
|
|
|
|
/// Set the weight of a specific weight function.
|
|
pub fn set_weight(name: &str, w: Weight) {
|
|
MockedWeightInfo::set_weight::<Test>(name, w);
|
|
}
|
|
|
|
/// Assert that exactly these pages are present. Assumes `Here` origin.
|
|
pub fn assert_pages(indices: &[u32]) {
|
|
assert_eq!(
|
|
Pages::<Test>::iter_keys().count(),
|
|
indices.len(),
|
|
"Wrong number of pages in the queue"
|
|
);
|
|
for i in indices {
|
|
assert!(Pages::<Test>::contains_key(MessageOrigin::Here, i));
|
|
}
|
|
}
|
|
|
|
/// Build a ring with three queues: `Here`, `There` and `Everywhere(0)`.
|
|
pub fn build_triple_ring() {
|
|
use MessageOrigin::*;
|
|
build_ring::<Test>(&[Here, There, Everywhere(0)])
|
|
}
|
|
|
|
/// Shim to get rid of the annoying `::<Test>` everywhere.
|
|
pub fn assert_ring(queues: &[MessageOrigin]) {
|
|
super::mock_helpers::assert_ring::<Test>(queues);
|
|
}
|
|
|
|
pub fn knit(queue: &MessageOrigin) {
|
|
super::mock_helpers::knit::<Test>(queue);
|
|
}
|
|
|
|
pub fn unknit(queue: &MessageOrigin) {
|
|
super::mock_helpers::unknit::<Test>(queue);
|
|
}
|
|
|
|
pub fn num_overweight_enqueued_events() -> u32 {
|
|
frame_system::Pallet::<Test>::events()
|
|
.into_iter()
|
|
.filter(|e| {
|
|
matches!(e.event, RuntimeEvent::MessageQueue(crate::Event::OverweightEnqueued { .. }))
|
|
})
|
|
.count() as u32
|
|
}
|
|
|
|
pub fn fp(pages: u32, count: u64, size: u64) -> QueueFootprint {
|
|
QueueFootprint { storage: Footprint { count, size }, pages }
|
|
}
|