mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-08-02 14:35:40 +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 <>
136 lines
3.7 KiB
Rust
136 lines
3.7 KiB
Rust
// Copyright (C) Parity Technologies (UK) Ltd.
|
|
// This file is part of Polkadot.
|
|
|
|
// Polkadot is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// Polkadot is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
use crate::MAX_XCM_DECODE_DEPTH;
|
|
use alloc::vec::Vec;
|
|
use parity_scale_codec::{Decode, DecodeLimit, Encode};
|
|
|
|
/// Wrapper around the encoded and decoded versions of a value.
|
|
/// Caches the decoded value once computed.
|
|
#[derive(Encode, Decode, scale_info::TypeInfo)]
|
|
#[codec(encode_bound())]
|
|
#[codec(decode_bound())]
|
|
#[scale_info(bounds(), skip_type_params(T))]
|
|
#[scale_info(replace_segment("staging_xcm", "xcm"))]
|
|
pub struct DoubleEncoded<T> {
|
|
encoded: Vec<u8>,
|
|
#[codec(skip)]
|
|
decoded: Option<T>,
|
|
}
|
|
|
|
impl<T> Clone for DoubleEncoded<T> {
|
|
fn clone(&self) -> Self {
|
|
Self { encoded: self.encoded.clone(), decoded: None }
|
|
}
|
|
}
|
|
|
|
impl<T> PartialEq for DoubleEncoded<T> {
|
|
fn eq(&self, other: &Self) -> bool {
|
|
self.encoded.eq(&other.encoded)
|
|
}
|
|
}
|
|
impl<T> Eq for DoubleEncoded<T> {}
|
|
|
|
impl<T> core::fmt::Debug for DoubleEncoded<T> {
|
|
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
|
|
self.encoded.fmt(f)
|
|
}
|
|
}
|
|
|
|
impl<T> From<Vec<u8>> for DoubleEncoded<T> {
|
|
fn from(encoded: Vec<u8>) -> Self {
|
|
Self { encoded, decoded: None }
|
|
}
|
|
}
|
|
|
|
impl<T> DoubleEncoded<T> {
|
|
pub fn into<S>(self) -> DoubleEncoded<S> {
|
|
DoubleEncoded::from(self)
|
|
}
|
|
|
|
pub fn from<S>(e: DoubleEncoded<S>) -> Self {
|
|
Self { encoded: e.encoded, decoded: None }
|
|
}
|
|
|
|
/// Provides an API similar to `AsRef` that provides access to the inner value.
|
|
/// `AsRef` implementation would expect an `&Option<T>` return type.
|
|
pub fn as_ref(&self) -> Option<&T> {
|
|
self.decoded.as_ref()
|
|
}
|
|
|
|
/// Access the encoded data.
|
|
pub fn into_encoded(self) -> Vec<u8> {
|
|
self.encoded
|
|
}
|
|
}
|
|
|
|
impl<T: Decode> DoubleEncoded<T> {
|
|
/// Decode the inner encoded value and store it.
|
|
/// Returns a reference to the value in case of success and `Err(())` in case the decoding
|
|
/// fails.
|
|
pub fn ensure_decoded(&mut self) -> Result<&T, ()> {
|
|
if self.decoded.is_none() {
|
|
self.decoded =
|
|
T::decode_all_with_depth_limit(MAX_XCM_DECODE_DEPTH, &mut &self.encoded[..]).ok();
|
|
}
|
|
self.decoded.as_ref().ok_or(())
|
|
}
|
|
|
|
/// Move the decoded value out or (if not present) decode `encoded`.
|
|
pub fn take_decoded(&mut self) -> Result<T, ()> {
|
|
self.decoded
|
|
.take()
|
|
.or_else(|| {
|
|
T::decode_all_with_depth_limit(MAX_XCM_DECODE_DEPTH, &mut &self.encoded[..]).ok()
|
|
})
|
|
.ok_or(())
|
|
}
|
|
|
|
/// Provides an API similar to `TryInto` that allows fallible conversion to the inner value
|
|
/// type. `TryInto` implementation would collide with std blanket implementation based on
|
|
/// `TryFrom`.
|
|
pub fn try_into(mut self) -> Result<T, ()> {
|
|
self.ensure_decoded()?;
|
|
self.decoded.ok_or(())
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn ensure_decoded_works() {
|
|
let val: u64 = 42;
|
|
let mut encoded: DoubleEncoded<_> = Encode::encode(&val).into();
|
|
assert_eq!(encoded.ensure_decoded(), Ok(&val));
|
|
}
|
|
|
|
#[test]
|
|
fn take_decoded_works() {
|
|
let val: u64 = 42;
|
|
let mut encoded: DoubleEncoded<_> = Encode::encode(&val).into();
|
|
assert_eq!(encoded.take_decoded(), Ok(val));
|
|
}
|
|
|
|
#[test]
|
|
fn try_into_works() {
|
|
let val: u64 = 42;
|
|
let encoded: DoubleEncoded<_> = Encode::encode(&val).into();
|
|
assert_eq!(encoded.try_into(), Ok(val));
|
|
}
|
|
}
|