Skip to content

Commit 9216b78

Browse files
serban300slumberjuangiriniggwpezalvicsam
authored and
bkchr
committed
Backport polkadot-sdk changes to polkadot-staging (#2518)
* Asynchronous backing PR (#2300) * Update substrate & polkadot * min changes to make async backing compile * (async backing) parachain-system: track limitations for unincluded blocks (#2438) * unincluded segment draft * read para head from storage proof * read_para_head -> read_included_para_head * Provide pub interface * add errors * fix unincluded segment update * BlockTracker -> Ancestor * add a dmp limit * Read para head depending on the storage switch * doc comments * storage items docs * add a sanity check on block initialize * Check watermark * append to the segment on block finalize * Move segment update into set_validation_data * Resolve para head todo * option watermark * fix comment * Drop dmq check * fix weight * doc-comments on inherent invariant * Remove TODO * add todo * primitives tests * pallet tests * doc comments * refactor unincluded segment length into a ConsensusHook (#2501) * refactor unincluded segment length into a ConsensusHook * add docs * refactor bandwidth_out calculation Co-authored-by: Chris Sosnin <[email protected]> * test for limits from impl * fmt * make tests compile * update comment * uncomment test * fix collator test by adding parent to state proof * patch HRMP watermark rules for unincluded segment * get consensus-common tests to pass, using unincluded segment * fix unincluded segment tests * get all tests passing * fmt * rustdoc CI * aura-ext: limit the number of authored blocks per slot (#2551) * aura_ext consensus hook * reverse dependency * include weight into hook * fix tests * remove stray println Co-authored-by: Chris Sosnin <[email protected]> * fix test warning * fix doc link --------- Co-authored-by: Chris Sosnin <[email protected]> Co-authored-by: Chris Sosnin <[email protected]> * parachain-system: ignore go ahead signal once upgrade is processed (#2594) * handle goahead signal for unincluded segment * doc comment * add test * parachain-system: drop processed messages from inherent data (#2590) * implement `drop_processed_messages` * drop messages based on relay parent number * adjust tests * drop changes to mqc * fix comment * drop test * drop more dead code * clippy * aura-ext: check slot in consensus hook and remove all `CheckInherents` logic (#2658) * aura-ext: check slot in consensus hook * convert relay chain slot * Make relay chain slot duration generic * use fixed velocity hook for pallets with aura * purge timestamp inherent * fix warning * adjust runtime tests * fix slots in tests * Make `xcm-emulator` test pass for new consensus hook (#2722) * add pallets on_initialize * tests pass * add AuraExt on_init * ".git/.scripts/commands/fmt/fmt.sh" --------- Co-authored-by: command-bot <> --------- Co-authored-by: Ignacio Palacios <[email protected]> * update polkadot git refs * CollationGenerationConfig closure is now optional (#2772) * CollationGenerationConfig closure is now optional * fix test * propagate network-protocol-staging feature (#2899) * Feature Flagging Consensus Hook Type Parameter (#2911) * First pass * fmt * Added as default feature in tomls * Changed to direct dependency feature * Dealing with clippy error * Update pallets/parachain-system/src/lib.rs Co-authored-by: asynchronous rob <[email protected]> --------- Co-authored-by: asynchronous rob <[email protected]> * fmt * bump deps and remove warning * parachain-system: update RelevantMessagingState according to the unincluded segment (#2948) * mostly address 2471 with a bug introduced * adjust relevant messaging state after computing total * fmt * max -> min * fix test implementation of xcmp source * add test * fix test message sending logic * fix + test * add more to unincluded segment test * fmt --------- Co-authored-by: Chris Sosnin <[email protected]> * Integrate new Aura / Parachain Consensus Logic in Parachain-Template / Polkadot-Parachain (#2864) * add a comment * refactor client/service utilities * deprecate start_collator * update parachain-template * update test-service in the same way * update polkadot-parachain crate * fmt * wire up new SubmitCollation message * some runtime utilities for implementing unincluded segment runtime APIs * allow parachains to configure their level of sybil-resistance when starting the network * make aura-ext compile * update to specify sybil resistance levels * fmt * specify relay chain slot duration in milliseconds * update Aura to explicitly produce Send futures also, make relay_chain_slot_duration a Duration * add authoring duration to basic collator and document params * integrate new basic collator into parachain-template * remove assert_send used for testing * basic-aura: only author when parent included * update polkadot-parachain-bin * fmt * some fixes * fixes * add a RelayNumberMonotonicallyIncreases * add a utility function for initializing subsystems * some logging for timestamp adjustment * fmt * some fixes for lookahead collator * add a log * update `find_potential_parents` to account for sessions * bound the loop * restore & deprecate old start_collator and start_full_node functions. * remove unnecessary await calls * fix warning * clippy * more clippy * remove unneeded logic * ci * update comment Co-authored-by: Marcin S. <[email protected]> * (async backing) restore `CheckInherents` for backwards-compatibility (#2977) * bring back timestamp * Restore CheckInherents * revert to empty CheckInherents * make CheckInherents optional * attempt * properly end system blocks * add some more comments * ignore failing system parachain tests * update refs after main feature branch merge * comment out the offending tests because CI runs ignored tests * fix warnings * fmt * revert to polkadot master * cargo update -p polkadot-primitives -p sp-io --------- Co-authored-by: asynchronous rob <[email protected]> Co-authored-by: Ignacio Palacios <[email protected]> Co-authored-by: Bradley Olson <[email protected]> Co-authored-by: Marcin S. <[email protected]> Co-authored-by: eskimor <[email protected]> Co-authored-by: Andronik <[email protected]> (cherry picked from commit 6ef1117) * Companion: restructure macro related exports (#3015) * restructure macro related exports * restructure macro related exports * wip * wip * update cargo lock * refactor RuntimeDebug on unincluded segment * fmt * Companion: restructure `benchmarking` macro related exports (#3039) * wip * wip * restructure benchmarking macro related exports * add cargo lock --------- Co-authored-by: parity-processbot <> (cherry picked from commit 8349c8d) * Add missing workspace members (#3056) * Add dependencies Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Add missing workspace members Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Fix more Signed-off-by: Oliver Tale-Yazdi <[email protected]> --------- Signed-off-by: Oliver Tale-Yazdi <[email protected]> (cherry picked from commit 44499cf) * Add CI for monorepo (#1145) * Add CI for monorepo * fix frame tests * Format features Signed-off-by: Oliver Tale-Yazdi <[email protected]> * add note for skipping tests and disable test-linux-stable-all * Fix tests and compile issues (#1152) * Fix feature dependant import Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Bump test timeout Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Remove feature gate Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Add resolver 2 Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Remove old lockfile Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Format features Signed-off-by: Oliver Tale-Yazdi <[email protected]> --------- Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Fix check-dependency-rules Signed-off-by: Oliver Tale-Yazdi <[email protected]> * rm test-runtime Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Actually fix script Signed-off-by: Oliver Tale-Yazdi <[email protected]> * enable cargo-check-each-crate-macos * Run check-each-crate on 6 machines (#1163) --------- Signed-off-by: Oliver Tale-Yazdi <[email protected]> Co-authored-by: Oliver Tale-Yazdi <[email protected]> (cherry picked from commit e494934) * Fix features (#1194) * Manually fix conflicting ? Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Remove duplicates Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Autofix feature propagation zepter lint propagate-feature --feature try-runtime --left-side-feature-missing=ignore --workspace --fix --feature-enables-dep="try-runtime:frame-try-runtime" zepter lint propagate-feature --feature runtime-benchmarks --left-side-feature-missing=ignore --workspace --fix --feature-enables-dep="runtime-benchmarks:frame-benchmarking" zepter lint propagate-feature --feature std --left-side-feature-missing=ignore --workspace --fix zepter f f Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Bump zepter Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Add some duplicates Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Revert "Add some duplicates" This reverts commit c6ce627. * Remove default enabled features Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Bump Zepter Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Bump in correct location 🤦 Signed-off-by: Oliver Tale-Yazdi <[email protected]> * DNM: Add some mistakes Signed-off-by: Oliver Tale-Yazdi <[email protected]> * DNM: Add some mistakes Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Revert "DNM: Add some mistakes" This reverts commit d469b3f. * Revert "DNM: Add some mistakes" This reverts commit d892a73. --------- Signed-off-by: Oliver Tale-Yazdi <[email protected]> (cherry picked from commit 0400ed9) * Fix build profiles (#1229) * Fix build profiles Closes #1155 Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Manually set version to 1.0.0 Signed-off-by: Oliver Tale-Yazdi <[email protected]> * Use workspace repo Signed-off-by: Oliver Tale-Yazdi <[email protected]> * 'Authors and Edition from workspace Signed-off-by: Oliver Tale-Yazdi <[email protected]> --------- Signed-off-by: Oliver Tale-Yazdi <[email protected]> (cherry picked from commit dcda0e5) * Set test crates to nopublish (#1240) * Set test crates to nopublish * Don't publish more crates * Set even more crates to nopublish --------- Co-authored-by: Oliver Tale-Yazdi <[email protected]> (cherry picked from commit 1c7ef1f) * 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 <[email protected]> * Update more UI tests Signed-off-by: Oliver Tale-Yazdi <[email protected]> --------- Signed-off-by: Oliver Tale-Yazdi <[email protected]> Co-authored-by: Oliver Tale-Yazdi <[email protected]> (cherry picked from commit bfb241d) * Restructure `dispatch` macro related exports (#1162) * restructure dispatch macro related exports * moved Dispatchable to lib.rs * fix .gitignore final newline * ".git/.scripts/commands/fmt/fmt.sh" * fix rustdocs * wip --------- Co-authored-by: Liam Aharon <[email protected]> Co-authored-by: command-bot <> Co-authored-by: ordian <[email protected]> (cherry picked from commit bdbe982) * Fixes * Fix clippy --------- Co-authored-by: Chris Sosnin <[email protected]> Co-authored-by: Juan <[email protected]> Co-authored-by: Oliver Tale-Yazdi <[email protected]> Co-authored-by: Alexander Samusev <[email protected]> Co-authored-by: Lulu <[email protected]> Co-authored-by: Przemek Rzad <[email protected]>
1 parent 1bbc77f commit 9216b78

File tree

108 files changed

+305
-240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+305
-240
lines changed

‎bridges/bin/runtime-common/Cargo.toml‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[package]
22
name = "bridge-runtime-common"
33
version = "0.1.0"
4-
authors = ["Parity Technologies <[email protected]>"]
5-
edition = "2021"
6-
repository = "https://github.com/paritytech/parity-bridges-common/"
4+
authors.workspace = true
5+
edition.workspace = true
6+
repository.workspace = true
77
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
88

99
[dependencies]
@@ -41,20 +41,21 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", d
4141
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
4242

4343
# Polkadot dependencies
44-
xcm = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false }
45-
xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false }
44+
xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "master" }
45+
xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "master" }
4646

4747
[dev-dependencies]
4848
bp-test-utils = { path = "../../primitives/test-utils" }
4949
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master" }
5050

5151
[features]
52-
default = ["std"]
52+
default = [ "std" ]
5353
std = [
5454
"bp-header-chain/std",
5555
"bp-messages/std",
5656
"bp-parachains/std",
5757
"bp-polkadot-core/std",
58+
"bp-relayers/std",
5859
"bp-runtime/std",
5960
"bp-xcm-bridge-hub-router/std",
6061
"codec/std",
@@ -75,16 +76,19 @@ std = [
7576
"sp-runtime/std",
7677
"sp-std/std",
7778
"sp-trie/std",
78-
"xcm/std",
7979
"xcm-builder/std",
80+
"xcm/std",
8081
]
8182
runtime-benchmarks = [
83+
"frame-support/runtime-benchmarks",
84+
"frame-system/runtime-benchmarks",
85+
"pallet-balances/runtime-benchmarks",
8286
"pallet-bridge-grandpa/runtime-benchmarks",
8387
"pallet-bridge-messages/runtime-benchmarks",
8488
"pallet-bridge-parachains/runtime-benchmarks",
8589
"pallet-bridge-relayers/runtime-benchmarks",
90+
"pallet-utility/runtime-benchmarks",
91+
"sp-runtime/runtime-benchmarks",
8692
"xcm-builder/runtime-benchmarks",
8793
]
88-
integrity-test = [
89-
"static_assertions",
90-
]
94+
integrity-test = [ "static_assertions" ]

‎bridges/bin/runtime-common/src/integrity.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2019-2021 Parity Technologies (UK) Ltd.
1+
// Copyright (C) Parity Technologies (UK) Ltd.
22
// This file is part of Parity Bridges Common.
33

44
// Parity Bridges Common is free software: you can redistribute it and/or modify

‎bridges/bin/runtime-common/src/lib.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2019-2021 Parity Technologies (UK) Ltd.
1+
// Copyright (C) Parity Technologies (UK) Ltd.
22
// This file is part of Parity Bridges Common.
33

44
// Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -103,7 +103,7 @@ where
103103
#[macro_export]
104104
macro_rules! generate_bridge_reject_obsolete_headers_and_messages {
105105
($call:ty, $account_id:ty, $($filter_call:ty),*) => {
106-
#[derive(Clone, codec::Decode, Default, codec::Encode, Eq, PartialEq, frame_support::RuntimeDebug, scale_info::TypeInfo)]
106+
#[derive(Clone, codec::Decode, Default, codec::Encode, Eq, PartialEq, sp_runtime::RuntimeDebug, scale_info::TypeInfo)]
107107
pub struct BridgeRejectObsoleteHeadersAndMessages;
108108
impl sp_runtime::traits::SignedExtension for BridgeRejectObsoleteHeadersAndMessages {
109109
const IDENTIFIER: &'static str = "BridgeRejectObsoleteHeadersAndMessages";

‎bridges/bin/runtime-common/src/messages.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2019-2021 Parity Technologies (UK) Ltd.
1+
// Copyright (C) Parity Technologies (UK) Ltd.
22
// This file is part of Parity Bridges Common.
33

44
// Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -31,9 +31,10 @@ use bp_messages::{
3131
};
3232
use bp_runtime::{Chain, RawStorageProof, Size, StorageProofChecker};
3333
use codec::{Decode, Encode};
34-
use frame_support::{traits::Get, weights::Weight, RuntimeDebug};
34+
use frame_support::{traits::Get, weights::Weight};
3535
use hash_db::Hasher;
3636
use scale_info::TypeInfo;
37+
use sp_runtime::RuntimeDebug;
3738
use sp_std::{convert::TryFrom, marker::PhantomData, vec::Vec};
3839

3940
/// Bidirectional message bridge.

‎bridges/bin/runtime-common/src/messages_api.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2019-2021 Parity Technologies (UK) Ltd.
1+
// Copyright (C) Parity Technologies (UK) Ltd.
22
// This file is part of Parity Bridges Common.
33

44
// Parity Bridges Common is free software: you can redistribute it and/or modify

‎bridges/bin/runtime-common/src/messages_benchmarking.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2019-2021 Parity Technologies (UK) Ltd.
1+
// Copyright (C) Parity Technologies (UK) Ltd.
22
// This file is part of Parity Bridges Common.
33

44
// Parity Bridges Common is free software: you can redistribute it and/or modify

‎bridges/bin/runtime-common/src/messages_call_ext.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2021 Parity Technologies (UK) Ltd.
1+
// Copyright (C) Parity Technologies (UK) Ltd.
22
// This file is part of Parity Bridges Common.
33

44
// Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -21,10 +21,9 @@ use bp_messages::{target_chain::MessageDispatch, InboundLaneData, LaneId, Messag
2121
use frame_support::{
2222
dispatch::CallableCallFor,
2323
traits::{Get, IsSubType},
24-
RuntimeDebug,
2524
};
2625
use pallet_bridge_messages::{Config, Pallet};
27-
use sp_runtime::transaction_validity::TransactionValidity;
26+
use sp_runtime::{transaction_validity::TransactionValidity, RuntimeDebug};
2827
use sp_std::ops::RangeInclusive;
2928

3029
/// Generic info about a messages delivery/confirmation proof.

‎bridges/bin/runtime-common/src/messages_generation.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2019-2022 Parity Technologies (UK) Ltd.
1+
// Copyright (C) Parity Technologies (UK) Ltd.
22
// This file is part of Parity Bridges Common.
33

44
// Parity Bridges Common is free software: you can redistribute it and/or modify

‎bridges/bin/runtime-common/src/messages_xcm_extension.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2023 Parity Technologies (UK) Ltd.
1+
// Copyright (C) Parity Technologies (UK) Ltd.
22
// This file is part of Parity Bridges Common.
33

44
// Parity Bridges Common is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@ use bp_messages::{
2929
use bp_runtime::messages::MessageDispatchResult;
3030
use bp_xcm_bridge_hub_router::XcmChannelStatusProvider;
3131
use codec::{Decode, Encode};
32-
use frame_support::{dispatch::Weight, traits::Get, CloneNoBound, EqNoBound, PartialEqNoBound};
32+
use frame_support::{traits::Get, weights::Weight, CloneNoBound, EqNoBound, PartialEqNoBound};
3333
use pallet_bridge_messages::{
3434
Config as MessagesConfig, OutboundLanesCongestedSignals, Pallet as MessagesPallet,
3535
WeightInfoExt as MessagesPalletWeights,

‎bridges/bin/runtime-common/src/mock.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2019-2021 Parity Technologies (UK) Ltd.
1+
// Copyright (C) Parity Technologies (UK) Ltd.
22
// This file is part of Parity Bridges Common.
33

44
// Parity Bridges Common is free software: you can redistribute it and/or modify

0 commit comments

Comments
 (0)