mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-22 03:21:03 +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 <>
339 lines
10 KiB
Rust
339 lines
10 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.
|
|
|
|
use super::*;
|
|
use crate as xcmp_queue;
|
|
use core::marker::PhantomData;
|
|
use cumulus_pallet_parachain_system::AnyRelayNumber;
|
|
use cumulus_primitives_core::{ChannelInfo, IsSystem, ParaId};
|
|
use frame_support::{
|
|
parameter_types,
|
|
traits::{ConstU32, Everything, Nothing, OriginTrait},
|
|
BoundedSlice,
|
|
};
|
|
use frame_system::EnsureRoot;
|
|
use sp_core::H256;
|
|
use sp_runtime::{
|
|
traits::{BlakeTwo256, IdentityLookup},
|
|
BuildStorage,
|
|
};
|
|
use xcm::prelude::*;
|
|
use xcm_builder::{CurrencyAdapter, FixedWeightBounds, IsConcrete, NativeAsset, ParentIsPreset};
|
|
use xcm_executor::traits::ConvertOrigin;
|
|
|
|
type Block = frame_system::mocking::MockBlock<Test>;
|
|
|
|
// Configure a mock runtime to test the pallet.
|
|
frame_support::construct_runtime!(
|
|
pub enum Test
|
|
{
|
|
System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
|
|
Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
|
|
ParachainSystem: cumulus_pallet_parachain_system::{
|
|
Pallet, Call, Config<T>, Storage, Inherent, Event<T>, ValidateUnsigned,
|
|
},
|
|
XcmpQueue: xcmp_queue::{Pallet, Call, Storage, Event<T>},
|
|
}
|
|
);
|
|
|
|
parameter_types! {
|
|
pub const BlockHashCount: u64 = 250;
|
|
pub const SS58Prefix: u8 = 42;
|
|
}
|
|
|
|
type AccountId = u64;
|
|
|
|
impl frame_system::Config for Test {
|
|
type BaseCallFilter = Everything;
|
|
type BlockWeights = ();
|
|
type BlockLength = ();
|
|
type DbWeight = ();
|
|
type RuntimeOrigin = RuntimeOrigin;
|
|
type RuntimeCall = RuntimeCall;
|
|
type Nonce = u64;
|
|
type Hash = H256;
|
|
type Hashing = BlakeTwo256;
|
|
type AccountId = AccountId;
|
|
type Lookup = IdentityLookup<Self::AccountId>;
|
|
type Block = Block;
|
|
type RuntimeEvent = RuntimeEvent;
|
|
type BlockHashCount = BlockHashCount;
|
|
type Version = ();
|
|
type PalletInfo = PalletInfo;
|
|
type AccountData = pallet_balances::AccountData<u64>;
|
|
type OnNewAccount = ();
|
|
type OnKilledAccount = ();
|
|
type SystemWeightInfo = ();
|
|
type SS58Prefix = SS58Prefix;
|
|
type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Test>;
|
|
type MaxConsumers = frame_support::traits::ConstU32<16>;
|
|
}
|
|
|
|
parameter_types! {
|
|
pub const ExistentialDeposit: u64 = 5;
|
|
pub const MaxReserves: u32 = 50;
|
|
}
|
|
|
|
pub type Balance = u64;
|
|
|
|
impl pallet_balances::Config for Test {
|
|
type Balance = Balance;
|
|
type RuntimeEvent = RuntimeEvent;
|
|
type DustRemoval = ();
|
|
type ExistentialDeposit = ExistentialDeposit;
|
|
type AccountStore = System;
|
|
type WeightInfo = ();
|
|
type MaxLocks = ();
|
|
type MaxReserves = MaxReserves;
|
|
type ReserveIdentifier = [u8; 8];
|
|
type RuntimeHoldReason = RuntimeHoldReason;
|
|
type RuntimeFreezeReason = RuntimeFreezeReason;
|
|
type FreezeIdentifier = ();
|
|
type MaxHolds = ConstU32<0>;
|
|
type MaxFreezes = ConstU32<0>;
|
|
}
|
|
|
|
impl cumulus_pallet_parachain_system::Config for Test {
|
|
type WeightInfo = ();
|
|
type RuntimeEvent = RuntimeEvent;
|
|
type OnSystemEvent = ();
|
|
type SelfParaId = ();
|
|
type OutboundXcmpMessageSource = XcmpQueue;
|
|
// Ignore all DMP messages by enqueueing them into `()`:
|
|
type DmpQueue = frame_support::traits::EnqueueWithOrigin<(), sp_core::ConstU8<0>>;
|
|
type ReservedDmpWeight = ();
|
|
type XcmpMessageHandler = XcmpQueue;
|
|
type ReservedXcmpWeight = ();
|
|
type CheckAssociatedRelayNumber = AnyRelayNumber;
|
|
type ConsensusHook = cumulus_pallet_parachain_system::consensus_hook::ExpectParentIncluded;
|
|
}
|
|
|
|
parameter_types! {
|
|
pub const RelayChain: MultiLocation = MultiLocation::parent();
|
|
pub UniversalLocation: InteriorMultiLocation = X1(Parachain(1u32));
|
|
pub UnitWeightCost: Weight = Weight::from_parts(1_000_000, 1024);
|
|
pub const MaxInstructions: u32 = 100;
|
|
pub const MaxAssetsIntoHolding: u32 = 64;
|
|
}
|
|
|
|
/// Means for transacting assets on this chain.
|
|
pub type LocalAssetTransactor = CurrencyAdapter<
|
|
// Use this currency:
|
|
Balances,
|
|
// Use this currency when it is a fungible asset matching the given location or name:
|
|
IsConcrete<RelayChain>,
|
|
// Do a simple punn to convert an AccountId32 MultiLocation into a native chain account ID:
|
|
LocationToAccountId,
|
|
// Our chain's account ID type (we can't get away without mentioning it explicitly):
|
|
AccountId,
|
|
// We don't track any teleports.
|
|
(),
|
|
>;
|
|
|
|
pub type LocationToAccountId = (ParentIsPreset<AccountId>,);
|
|
|
|
pub struct XcmConfig;
|
|
impl xcm_executor::Config for XcmConfig {
|
|
type RuntimeCall = RuntimeCall;
|
|
type XcmSender = XcmRouter;
|
|
// How to withdraw and deposit an asset.
|
|
type AssetTransactor = LocalAssetTransactor;
|
|
type OriginConverter = ();
|
|
type IsReserve = NativeAsset;
|
|
type IsTeleporter = NativeAsset;
|
|
type UniversalLocation = UniversalLocation;
|
|
type Barrier = ();
|
|
type Weigher = FixedWeightBounds<UnitWeightCost, RuntimeCall, MaxInstructions>;
|
|
type Trader = ();
|
|
type ResponseHandler = ();
|
|
type AssetTrap = ();
|
|
type AssetClaims = ();
|
|
type SubscriptionService = ();
|
|
type PalletInstancesInfo = AllPalletsWithSystem;
|
|
type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
|
|
type AssetLocker = ();
|
|
type AssetExchanger = ();
|
|
type FeeManager = ();
|
|
type MessageExporter = ();
|
|
type UniversalAliases = Nothing;
|
|
type CallDispatcher = RuntimeCall;
|
|
type SafeCallFilter = Everything;
|
|
type Aliasers = Nothing;
|
|
}
|
|
|
|
pub type XcmRouter = (
|
|
// XCMP to communicate with the sibling chains.
|
|
XcmpQueue,
|
|
);
|
|
|
|
pub struct SystemParachainAsSuperuser<RuntimeOrigin>(PhantomData<RuntimeOrigin>);
|
|
impl<RuntimeOrigin: OriginTrait> ConvertOrigin<RuntimeOrigin>
|
|
for SystemParachainAsSuperuser<RuntimeOrigin>
|
|
{
|
|
fn convert_origin(
|
|
origin: impl Into<MultiLocation>,
|
|
kind: OriginKind,
|
|
) -> Result<RuntimeOrigin, MultiLocation> {
|
|
let origin = origin.into();
|
|
if kind == OriginKind::Superuser &&
|
|
matches!(
|
|
origin,
|
|
MultiLocation {
|
|
parents: 1,
|
|
interior: X1(Parachain(id)),
|
|
} if ParaId::from(id).is_system(),
|
|
) {
|
|
Ok(RuntimeOrigin::root())
|
|
} else {
|
|
Err(origin)
|
|
}
|
|
}
|
|
}
|
|
|
|
parameter_types! {
|
|
pub static EnqueuedMessages: Vec<(ParaId, Vec<u8>)> = Default::default();
|
|
}
|
|
|
|
/// An `EnqueueMessage` implementation that puts all messages in thread-local storage.
|
|
pub struct EnqueueToLocalStorage<T>(PhantomData<T>);
|
|
|
|
impl<T: OnQueueChanged<ParaId>> EnqueueMessage<ParaId> for EnqueueToLocalStorage<T> {
|
|
type MaxMessageLen = sp_core::ConstU32<65_536>;
|
|
|
|
fn enqueue_message(message: BoundedSlice<u8, Self::MaxMessageLen>, origin: ParaId) {
|
|
let mut msgs = EnqueuedMessages::get();
|
|
msgs.push((origin, message.to_vec()));
|
|
EnqueuedMessages::set(msgs);
|
|
T::on_queue_changed(origin, Self::footprint(origin));
|
|
}
|
|
|
|
fn enqueue_messages<'a>(
|
|
iter: impl Iterator<Item = BoundedSlice<'a, u8, Self::MaxMessageLen>>,
|
|
origin: ParaId,
|
|
) {
|
|
let mut msgs = EnqueuedMessages::get();
|
|
msgs.extend(iter.map(|m| (origin, m.to_vec())));
|
|
EnqueuedMessages::set(msgs);
|
|
T::on_queue_changed(origin, Self::footprint(origin));
|
|
}
|
|
|
|
fn sweep_queue(origin: ParaId) {
|
|
let mut msgs = EnqueuedMessages::get();
|
|
msgs.retain(|(o, _)| o != &origin);
|
|
EnqueuedMessages::set(msgs);
|
|
T::on_queue_changed(origin, Self::footprint(origin));
|
|
}
|
|
|
|
fn footprint(origin: ParaId) -> QueueFootprint {
|
|
let msgs = EnqueuedMessages::get();
|
|
let mut footprint = QueueFootprint::default();
|
|
for (o, m) in msgs {
|
|
if o == origin {
|
|
footprint.storage.count += 1;
|
|
footprint.storage.size += m.len() as u64;
|
|
}
|
|
}
|
|
footprint.pages = footprint.storage.size as u32 / 16; // Number does not matter
|
|
footprint
|
|
}
|
|
}
|
|
|
|
parameter_types! {
|
|
/// The asset ID for the asset that we use to pay for message delivery fees.
|
|
pub FeeAssetId: AssetId = Concrete(RelayChain::get());
|
|
/// The base fee for the message delivery fees.
|
|
pub const BaseDeliveryFee: Balance = 300_000_000;
|
|
/// The fee per byte
|
|
pub const ByteFee: Balance = 1_000_000;
|
|
}
|
|
|
|
pub type PriceForSiblingParachainDelivery = polkadot_runtime_common::xcm_sender::ExponentialPrice<
|
|
FeeAssetId,
|
|
BaseDeliveryFee,
|
|
ByteFee,
|
|
XcmpQueue,
|
|
>;
|
|
|
|
impl Config for Test {
|
|
type RuntimeEvent = RuntimeEvent;
|
|
type ChannelInfo = MockedChannelInfo;
|
|
type VersionWrapper = ();
|
|
type XcmpQueue = EnqueueToLocalStorage<Pallet<Test>>;
|
|
type MaxInboundSuspended = sp_core::ConstU32<1_000>;
|
|
type ControllerOrigin = EnsureRoot<AccountId>;
|
|
type ControllerOriginConverter = SystemParachainAsSuperuser<RuntimeOrigin>;
|
|
type WeightInfo = ();
|
|
type PriceForSiblingDelivery = PriceForSiblingParachainDelivery;
|
|
}
|
|
|
|
pub fn new_test_ext() -> sp_io::TestExternalities {
|
|
frame_system::GenesisConfig::<Test>::default().build_storage().unwrap().into()
|
|
}
|
|
|
|
/// A para that we have an HRMP channel with.
|
|
pub const HRMP_PARA_ID: u32 = 7777;
|
|
|
|
pub struct MockedChannelInfo;
|
|
impl GetChannelInfo for MockedChannelInfo {
|
|
fn get_channel_status(id: ParaId) -> ChannelStatus {
|
|
if id == HRMP_PARA_ID.into() {
|
|
return ChannelStatus::Ready(usize::MAX, usize::MAX)
|
|
}
|
|
|
|
ParachainSystem::get_channel_status(id)
|
|
}
|
|
|
|
fn get_channel_info(id: ParaId) -> Option<ChannelInfo> {
|
|
if id == HRMP_PARA_ID.into() {
|
|
return Some(ChannelInfo {
|
|
max_capacity: u32::MAX,
|
|
max_total_size: u32::MAX,
|
|
max_message_size: u32::MAX,
|
|
msg_count: 0,
|
|
total_size: 0,
|
|
})
|
|
}
|
|
|
|
ParachainSystem::get_channel_info(id)
|
|
}
|
|
}
|
|
|
|
pub(crate) fn mk_page() -> Vec<u8> {
|
|
let mut page = Vec::<u8>::new();
|
|
|
|
for i in 0..100 {
|
|
page.extend(match i % 2 {
|
|
0 => v2_xcm().encode(),
|
|
1 => v3_xcm().encode(),
|
|
// We cannot push an undecodable XCM here since it would break the decode stream.
|
|
// This is expected and the whole reason to introduce `MaybeDoubleEncodedVersionedXcm`
|
|
// instead.
|
|
_ => unreachable!(),
|
|
});
|
|
}
|
|
|
|
page
|
|
}
|
|
|
|
pub(crate) fn v2_xcm() -> VersionedXcm<()> {
|
|
let instr = xcm::v2::Instruction::<()>::ClearOrigin;
|
|
VersionedXcm::V2(xcm::v2::Xcm::<()>(vec![instr; 3]))
|
|
}
|
|
|
|
pub(crate) fn v3_xcm() -> VersionedXcm<()> {
|
|
let instr = xcm::v3::Instruction::<()>::Trap(1);
|
|
VersionedXcm::V3(xcm::v3::Xcm::<()>(vec![instr; 3]))
|
|
}
|