Commit Graph

17 Commits

Author SHA1 Message Date
Oliver Tale-Yazdi e1c033ebe1 Use Message Queue as DMP and XCMP dispatch queue (#1246)
(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.

![Untitled
(1)](https://github.com/paritytech/cumulus/assets/10380170/6cf8b377-88c9-4aed-96df-baace266e04d)

## 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 <>
2023-11-02 15:31:38 +01:00
Przemek Rzad bfb241d7f3 Add missing licenses and tune the scanning workflow (#1288)
* Add missing Cumulus licenses

* Typo

* Add missing Substrate licenses

* Single job checking the sub-repos in steps

* Remove dates

* Remove dates

* Add missing (C)

* Update FRAME UI tests

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Update more UI tests

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

---------

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
2023-08-30 15:45:49 +03:00
Oleg Plakida fc83800e5e Update weights with VM runners (#2712)
* paritytech/ci-cd#697: Update weights with VM runners

 - Update weights using VM instances
 - Change runner tag for weights ci job to weights-vm

* ".git/.scripts/commands/bench/bench.sh" all

* ".git/.scripts/commands/bench-all/bench-all.sh" --target_dir=cumulus

---------

Co-authored-by: parity-processbot <>
Co-authored-by: Branislav Kontur <bkontur@gmail.com>
2023-08-01 17:37:18 +01:00
Egor_P a6597ba645 [Backport] weights 9430 to master (#2710)
* [benchmarks] pr with weights (#2667)

Co-authored-by: paritytech-ci <paritytech-ci@parity.io>

* [benchmarks] pr with weights (#2668)

Co-authored-by: paritytech-ci <paritytech-ci@parity.io>

* [benchmarks] pr with weights (#2669)

co-authored-by: paritytech-ci <paritytech-ci@parity.io>

---------

Co-authored-by: Paritytech CI <52199148+paritytech-ci@users.noreply.github.com>
Co-authored-by: paritytech-ci <paritytech-ci@parity.io>
2023-06-08 09:39:37 +00:00
Egor_P 83899e2f16 [Backport] weights from 9420 (#2562)
* [benchmarks] Update weights for collectives (#2532)

* [benchmarks] pr with weights

* bump zombienet version (#2525)

* bump zombienet version

* fix para registration args

---------

Co-authored-by: paritytech-ci <paritytech-ci@parity.io>
Co-authored-by: Javier Viola <javier@parity.io>

* [benchmarks] Update weights for bridge-hubs (#2533)

* [benchmarks] pr with weights

* bump zombienet version (#2525)

* bump zombienet version

* fix para registration args

---------

Co-authored-by: paritytech-ci <paritytech-ci@parity.io>
Co-authored-by: Javier Viola <javier@parity.io>

* [benchmarks] Update weights for statemine/t (#2535)

* [benchmarks] pr with weights

* bump zombienet version (#2525)

* bump zombienet version

* fix para registration args

---------

Co-authored-by: paritytech-ci <paritytech-ci@parity.io>
Co-authored-by: Javier Viola <javier@parity.io>

---------

Co-authored-by: Paritytech CI <52199148+paritytech-ci@users.noreply.github.com>
Co-authored-by: paritytech-ci <paritytech-ci@parity.io>
Co-authored-by: Javier Viola <javier@parity.io>
2023-05-11 06:22:19 +00:00
Egor_P eaf6c45445 [backport] weights 9400 (#2425)
* [benchmarks] pr with weights (#2373)

Co-authored-by: paritytech-ci <paritytech-ci@parity.io>

* [benchmarks] pr with weights (#2374)

Co-authored-by: paritytech-ci <paritytech-ci@parity.io>

* [benchmarks] pr with weights (#2375)

Co-authored-by: paritytech-ci <paritytech-ci@parity.io>

* Proof size in test wasn't sufficient

(due to updated weights.)

---------

Co-authored-by: Paritytech CI <52199148+paritytech-ci@users.noreply.github.com>
Co-authored-by: paritytech-ci <paritytech-ci@parity.io>
Co-authored-by: Giles Cope <gilescope@gmail.com>
2023-04-04 14:00:05 +00:00
Oliver Tale-Yazdi 70a0864e4c Migrate to Weight::from_parts (#2245)
* Migrate to from_parts

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Fix remaining files

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* cargo update -p polkadot-primitives

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* cargo update -p sp-io

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Use Master Cargo.lock

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* cargo update -p polkadot-primitives

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* cargo update -p sp-io

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

---------

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
2023-03-03 12:47:23 +00:00
Alexander Samusev 7e811c2c2f [ci] Return benchmark to bm machines (#2225)
* [WIP][ci] Return benchmark to bm machines

* run build on docker machines

* restart pipeline

* rm docker runner

* fix refs

* add weights

* return ci

* fix asset benchmark
2023-02-23 11:50:38 +01:00
Alexander Samusev cef3ebca56 [ci] Update runners for benchmarks (#2138)
* [ci] Update runners for benchmarks

* run benchmarks in this pr to get weights

* run benches only

* comment .post jobs

* add docker env to benches

* add git diff to artifacts

* divide assets

* update weights

* return ci

* fix refs for benchmarks
2023-01-26 15:46:02 +01:00
Egor_P cb87753ec7 Backport weights from 9360 (#2038)
* [benchmarks] pr with weights (#2026)

Co-authored-by: paritytech-ci <paritytech-ci@parity.io>

* [benchmarks] pr with weights Collectives (#2025)

* [benchmarks] pr with weights

* provide veto method for trait

Co-authored-by: paritytech-ci <paritytech-ci@parity.io>
Co-authored-by: muharem <ismailov.m.h@gmail.com>

* [benchmarks] pr with weights (#2027)

Co-authored-by: paritytech-ci <paritytech-ci@parity.io>

Co-authored-by: paritytech-ci <paritytech-ci@parity.io>
Co-authored-by: muharem <ismailov.m.h@gmail.com>
2022-12-29 10:54:45 +00:00
Squirrel 435d1b4e8d Backport collective weights from v9330 to master (#1959)
* [benchmarks] pr with weights (#1945)

Co-authored-by: paritytech-ci <paritytech-ci@parity.io>

* Use master for some methods

Co-authored-by: Egor_P <egor@parity.io>
Co-authored-by: paritytech-ci <paritytech-ci@parity.io>
2022-12-08 10:30:48 +00:00
Egor_P 693440673f [Backport] weights from v9320 release branch (#1890)
* [benchmarks] pr with weights (#1857)

Co-authored-by: paritytech-ci <paritytech-ci@parity.io>

* [benchmarks] Update weights for statemine/t (#1859)

* [benchmarks] pr with weights

* Update parachains/runtimes/assets/westmint/src/weights/pallet_uniques.rs

* Update parachains/runtimes/assets/westmint/src/weights/pallet_assets.rs

* Update parachains/runtimes/assets/statemine/src/weights/pallet_assets.rs

Co-authored-by: paritytech-ci <paritytech-ci@parity.io>
Co-authored-by: Squirrel <gilescope@gmail.com>

* fix weights for destroy

Co-authored-by: Paritytech CI <52199148+paritytech-ci@users.noreply.github.com>
Co-authored-by: paritytech-ci <paritytech-ci@parity.io>
Co-authored-by: Squirrel <gilescope@gmail.com>
Co-authored-by: parity-processbot <>
Co-authored-by: Anthony Alaribe <anthonyalaribe@gmail.com>
2022-11-21 14:06:32 +00:00
Shawn Tabrizi bb2a1a0220 Companion for #12283 (Anon -> Pure Proxy) (#1667)
* anon -> pure

* fn pure -> fn create_pure

* update lockfile for {"polkadot", "substrate"}

Co-authored-by: parity-processbot <>
2022-09-22 19:10:13 +00:00
Keith Yeung 36e721bf2a Companion for paritytech/substrate#12157 (#1590)
* Remove RefTimeWeight

* [ci] Apply cargo-fmt

* update lockfile for {"substrate", "polkadot"}

Co-authored-by: paritytech-ci <paritytech-ci@parity.io>
Co-authored-by: parity-processbot <>
2022-09-02 19:36:55 +00:00
Shawn Tabrizi 2c1e88522c Companion for Weight v1.5 Follow Up (#1584)
* fixes

* oopsie

* [ci] Apply cargo-fmt

* fixes

* [ci] Apply cargo-fmt

* fixes

* fix cumulus template

* fix merge

* update lockfile for {"polkadot", "substrate"}

Co-authored-by: paritytech-ci <paritytech-ci@parity.io>
Co-authored-by: parity-processbot <>
2022-09-01 19:25:05 +00:00
Shawn Tabrizi 48d4f1c57d Companion for Weight v1.5 (#1581)
* cargo test -p cumulus-primitives-utility

* cargo test -p cumulus-pallet-xcmp-queue

* cargo test -p cumulus-pallet-xcm

* cargo test -p cumulus-pallet-dmp-queue

* cargo test -p pallet-template

* cargo test -p cumulus-test-runtime

* fix weights

* fix more weights

* cargo test -p parachains-common

* cargo test -p parachain-template-runtime

* fix weights import

* cargo test -p collectives-polkadot-runtime

* cargo test -p contracts-rococo-runtime

* more

* unused

* fixes

* Update benchmarking.rs

* Update lib.rs

* Update lib.rs

* fix

* fix bug in conversion

* update lockfile for {"polkadot", "substrate"}

Co-authored-by: parity-processbot <>
2022-08-31 12:24:42 +00:00
joe petrowski 7bd426f31e Add Collectives Parachain (#1346)
* add new runtime and remove unnecessary pallets

* make runtime build

* add collectives to collator node

* sketch alliance config in runtime

* Slash handler was supposed to be commented out (for now)

* correct signature

* move to impls

* add alliance to runtime

* rustfmt

* IsReserve, remove Ping, update fn deposit

* add transaction_payment event

* Update parachains/runtimes/collectives/collectives-polkadot/src/lib.rs

Co-authored-by: Squirrel <gilescope@gmail.com>

* fmt

* add genesis config to chain spec

* fix merge

* local and dev configs only (for now)

* remove duplicate imports

* Collectives polkadot runtime to cargo workspace members (#1397)

* Collectives polkadot runtime: use unit type impl for identity verifier (#1398)

* apply fn rename

* fmt

* one less todo

* Less code in magic macros (#1407)

* Less code in magic macros

* cargo fmt

* Bench alliance (#1427)

* add benchmarks

* call one script from the other

* shebang changes so works on nixos too.

* bench in parallel as separate jobs

* hyphens can turn into underscores

* remove workaround to trigger bench

Co-authored-by: alvicsam <alvicsam@gmail.com>
Co-authored-by: paritytech-ci <paritytech-ci@parity.io>

* enable ci jobs

* fix publish bench results jobs

* chainspecs for collectives-westend (#1441)

* initial chainspecs for collections relay chain

* plumb in the collectives-westend chainspec

* add Runtime::CollectivesWestend

* lock

* Collectives: teleport slashed assets  (#1433)

* Collectives: teleport slashed assets

* fmt

* Cargo.lock > polkadot-parachain 0.9.25

* create temp account for imbalance

* treasury acc id from pallet id

* move accounts into constants, use here junction for assets

* assets location is relay chain, accounts as parameters

* fix typos

* fix typo

* Update parachains/runtimes/collectives/collectives-polkadot/src/constants.rs

Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com>

* Move alliance proposal provider to impls.rs (#1464)

* Move to impls alliance proposal provider

* rustfmt

* Bumping spec version

(so that we can redeploy with slashing change.)

* cargo lock

* slurp collectives digest to make appear in release notes (#1473)

* add slurp

* Slurp better :)

* Bring some order

Co-authored-by: Chevdor <chevdor@users.noreply.github.com>
Co-authored-by: Wilfried Kopp <wilfried@parity.io>

* reorder barrier

* Update parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs

Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>

* address review

* clean construct runtime

* fmt

* looks pretty but brings in too much

Co-authored-by: Squirrel <gilescope@gmail.com>
Co-authored-by: Muharem Ismailov <ismailov.m.h@gmail.com>
Co-authored-by: alvicsam <alvicsam@gmail.com>
Co-authored-by: paritytech-ci <paritytech-ci@parity.io>
Co-authored-by: Chevdor <chevdor@users.noreply.github.com>
Co-authored-by: Wilfried Kopp <wilfried@parity.io>
Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>
2022-08-11 11:11:10 +00:00