From 62590f3b6a64234bd3417fc90a06fdc262c4ed8e Mon Sep 17 00:00:00 2001 From: Serban Iorga Date: Fri, 1 Sep 2023 10:57:49 +0300 Subject: [PATCH] Backport `polkadot-sdk` changes to `polkadot-staging` (#2518) (#2519) * 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 * 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 * fix test warning * fix doc link --------- * 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 <> --------- * 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 --------- * 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 --------- * 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 * (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 --------- (cherry picked from commit 6ef1117685a56e98ead266a7d752355c10986704) * 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 8349c8d18af15c091b2f2a9f23f07a22ff2309cc) * Add missing workspace members (#3056) * Add dependencies * Add missing workspace members * Fix more --------- (cherry picked from commit 44499cf262e2e76dfbee432423d2b54a09c12415) * Add CI for monorepo (#1145) * Add CI for monorepo * fix frame tests * Format features * add note for skipping tests and disable test-linux-stable-all * Fix tests and compile issues (#1152) * Fix feature dependant import * Bump test timeout * Remove feature gate * Add resolver 2 * Remove old lockfile * Format features --------- * Fix check-dependency-rules * rm test-runtime * Actually fix script * enable cargo-check-each-crate-macos * Run check-each-crate on 6 machines (#1163) --------- (cherry picked from commit e49493442a9377be9344c06a4990e17423783d41) * Fix features (#1194) * Manually fix conflicting ? * Remove duplicates * 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 * Bump zepter * Add some duplicates * Revert "Add some duplicates" This reverts commit c6ce627273881c478f5b34f23d3a67db632dbebf. * Remove default enabled features * Bump Zepter * Bump in correct location :facepalm: * DNM: Add some mistakes * DNM: Add some mistakes * Revert "DNM: Add some mistakes" This reverts commit d469b3f0ba2aaed5f35f6ff5995f99e682da5800. * Revert "DNM: Add some mistakes" This reverts commit d892a73a35cac01e3721bdba74574b88bd04f83c. --------- (cherry picked from commit 0400ed90757d125f7769f49044632dac6b654cc4) * Fix build profiles (#1229) * Fix build profiles Closes https://github.com/paritytech/polkadot-sdk/issues/1155 * Manually set version to 1.0.0 * Use workspace repo * 'Authors and Edition from workspace --------- (cherry picked from commit dcda0e50f544c47634f4d994d41692e13a222294) * Set test crates to nopublish (#1240) * Set test crates to nopublish * Don't publish more crates * Set even more crates to nopublish --------- (cherry picked from commit 1c7ef1f23283bf4878410d4bc2d9c643fa34a279) * 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 * Update more UI tests --------- (cherry picked from commit bfb241d7f3e29152b9fe0ab3a0364ee0c89ec65c) * 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: command-bot <> (cherry picked from commit bdbe98297032e21a553bf191c530690b1d591405) * Fixes * Fix clippy --------- Co-authored-by: Chris Sosnin <48099298+slumber@users.noreply.github.com> Co-authored-by: Juan Co-authored-by: Oliver Tale-Yazdi Co-authored-by: Alexander Samusev <41779041+alvicsam@users.noreply.github.com> Co-authored-by: Lulu Co-authored-by: Przemek Rzad --- Cargo.lock | 7 ++++++ Cargo.toml | 6 +++++ bin/runtime-common/Cargo.toml | 24 +++++++++++-------- bin/runtime-common/src/integrity.rs | 2 +- bin/runtime-common/src/lib.rs | 4 ++-- bin/runtime-common/src/messages_api.rs | 2 +- .../src/messages_benchmarking.rs | 2 +- bin/runtime-common/src/messages_call_ext.rs | 6 ++--- bin/runtime-common/src/mock.rs | 2 +- .../src/parachains_benchmarking.rs | 5 ++-- bin/runtime-common/src/priority_calculator.rs | 6 ++--- .../src/refund_relayer_extension.rs | 10 ++++---- modules/grandpa/Cargo.toml | 12 ++++++---- modules/grandpa/src/benchmarking.rs | 2 +- modules/grandpa/src/call_ext.rs | 6 ++--- modules/grandpa/src/lib.rs | 2 +- modules/grandpa/src/mock.rs | 2 +- modules/grandpa/src/storage_types.rs | 2 +- modules/grandpa/src/weights.rs | 2 +- modules/messages/Cargo.toml | 14 +++++++---- modules/messages/src/benchmarking.rs | 2 +- modules/messages/src/inbound_lane.rs | 4 ++-- modules/messages/src/lib.rs | 2 +- modules/messages/src/outbound_lane.rs | 5 ++-- modules/messages/src/tests/mock.rs | 2 +- modules/messages/src/weights.rs | 2 +- modules/messages/src/weights_ext.rs | 2 +- modules/parachains/Cargo.toml | 14 +++++++---- modules/parachains/src/benchmarking.rs | 2 +- modules/parachains/src/call_ext.rs | 9 ++++--- modules/parachains/src/lib.rs | 2 +- modules/parachains/src/mock.rs | 2 +- modules/parachains/src/weights.rs | 2 +- modules/parachains/src/weights_ext.rs | 2 +- modules/relayers/Cargo.toml | 14 ++++++++--- modules/relayers/src/benchmarking.rs | 2 +- modules/relayers/src/lib.rs | 2 +- modules/relayers/src/mock.rs | 2 +- modules/relayers/src/payment_adapter.rs | 2 +- modules/relayers/src/stake_adapter.rs | 2 +- modules/relayers/src/weights.rs | 2 +- modules/relayers/src/weights_ext.rs | 2 +- modules/xcm-bridge-hub-router/Cargo.toml | 16 ++++++++----- .../xcm-bridge-hub-router/src/benchmarking.rs | 2 +- modules/xcm-bridge-hub-router/src/lib.rs | 2 +- modules/xcm-bridge-hub-router/src/mock.rs | 2 +- modules/xcm-bridge-hub-router/src/weights.rs | 2 +- .../chain-bridge-hub-cumulus/Cargo.toml | 14 +++++------ .../chain-bridge-hub-cumulus/src/lib.rs | 2 +- primitives/chain-bridge-hub-kusama/Cargo.toml | 8 ++++--- primitives/chain-bridge-hub-kusama/src/lib.rs | 4 ++-- .../chain-bridge-hub-polkadot/Cargo.toml | 10 ++++---- .../chain-bridge-hub-polkadot/src/lib.rs | 5 ++-- primitives/chain-bridge-hub-rococo/Cargo.toml | 8 ++++--- primitives/chain-bridge-hub-rococo/src/lib.rs | 10 +++----- primitives/chain-bridge-hub-wococo/Cargo.toml | 10 ++++---- primitives/chain-bridge-hub-wococo/src/lib.rs | 5 ++-- primitives/chain-kusama/Cargo.toml | 6 ++--- primitives/chain-kusama/src/lib.rs | 2 +- primitives/chain-polkadot/Cargo.toml | 6 ++--- primitives/chain-polkadot/src/lib.rs | 2 +- primitives/chain-rococo/Cargo.toml | 8 ++++--- primitives/chain-rococo/src/lib.rs | 5 ++-- primitives/chain-westend/Cargo.toml | 2 ++ primitives/chain-westend/src/lib.rs | 3 ++- primitives/chain-wococo/Cargo.toml | 8 +++---- primitives/chain-wococo/src/lib.rs | 2 +- primitives/header-chain/Cargo.toml | 8 +++---- .../header-chain/src/justification/mod.rs | 6 ++--- .../verification/equivocation.rs | 2 +- .../src/justification/verification/mod.rs | 5 ++-- .../justification/verification/optimizer.rs | 2 +- .../src/justification/verification/strict.rs | 2 +- primitives/header-chain/src/lib.rs | 2 +- primitives/header-chain/src/storage_keys.rs | 2 +- .../tests/implementation_match.rs | 2 +- .../tests/justification/equivocation.rs | 2 +- .../tests/justification/optimizer.rs | 2 +- .../tests/justification/strict.rs | 2 +- primitives/header-chain/tests/tests.rs | 16 +++++++++++++ primitives/messages/Cargo.toml | 12 +++++----- primitives/messages/src/lib.rs | 6 ++--- primitives/messages/src/source_chain.rs | 4 ++-- primitives/messages/src/storage_keys.rs | 2 +- primitives/messages/src/target_chain.rs | 5 ++-- primitives/parachains/Cargo.toml | 6 ++--- primitives/parachains/src/lib.rs | 6 ++--- primitives/polkadot-core/Cargo.toml | 8 +++---- primitives/polkadot-core/src/lib.rs | 2 +- primitives/polkadot-core/src/parachains.rs | 4 ++-- primitives/relayers/Cargo.toml | 6 ++--- primitives/relayers/src/lib.rs | 2 +- primitives/relayers/src/registration.rs | 2 +- primitives/runtime/Cargo.toml | 10 ++++---- primitives/runtime/src/chain.rs | 6 ++--- primitives/runtime/src/extensions.rs | 2 +- primitives/runtime/src/lib.rs | 10 ++++---- primitives/runtime/src/messages.rs | 5 ++-- primitives/runtime/src/storage_proof.rs | 6 ++--- primitives/runtime/src/storage_types.rs | 5 ++-- primitives/test-utils/Cargo.toml | 10 +++++--- primitives/test-utils/src/keyring.rs | 2 +- primitives/test-utils/src/lib.rs | 2 +- relays/client-substrate/src/test_chain.rs | 3 ++- 104 files changed, 305 insertions(+), 216 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6f9758ba6cc..a815154e72f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -964,6 +964,7 @@ dependencies = [ "bp-runtime", "frame-support", "sp-api", + "sp-runtime", "sp-std 8.0.0 (git+https://github.com/paritytech/substrate?branch=master)", ] @@ -976,6 +977,7 @@ dependencies = [ "bp-runtime", "frame-support", "sp-api", + "sp-runtime", "sp-std 8.0.0 (git+https://github.com/paritytech/substrate?branch=master)", ] @@ -988,6 +990,7 @@ dependencies = [ "bp-runtime", "frame-support", "sp-api", + "sp-runtime", "sp-std 8.0.0 (git+https://github.com/paritytech/substrate?branch=master)", ] @@ -1000,6 +1003,7 @@ dependencies = [ "bp-runtime", "frame-support", "sp-api", + "sp-runtime", "sp-std 8.0.0 (git+https://github.com/paritytech/substrate?branch=master)", ] @@ -1177,6 +1181,7 @@ dependencies = [ "bp-runtime", "frame-support", "sp-api", + "sp-runtime", "sp-std 8.0.0 (git+https://github.com/paritytech/substrate?branch=master)", ] @@ -1189,6 +1194,7 @@ dependencies = [ "hash-db", "hex-literal 0.4.1", "impl-trait-for-tuples", + "log", "num-traits", "parity-scale-codec", "scale-info", @@ -1230,6 +1236,7 @@ dependencies = [ "bp-runtime", "frame-support", "sp-api", + "sp-runtime", "sp-std 8.0.0 (git+https://github.com/paritytech/substrate?branch=master)", ] diff --git a/Cargo.toml b/Cargo.toml index 5d948cdebf7..303aae39c03 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,9 @@ +[workspace.package] +authors = ["Parity Technologies "] +edition = "2021" +repository = "https://github.com/paritytech/parity-bridges-common.git" +license = "GPL-3.0-only" + [workspace] resolver = "2" diff --git a/bin/runtime-common/Cargo.toml b/bin/runtime-common/Cargo.toml index c138ed00e72..66de7a6b15a 100644 --- a/bin/runtime-common/Cargo.toml +++ b/bin/runtime-common/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "bridge-runtime-common" version = "0.1.0" -authors = ["Parity Technologies "] -edition = "2021" -repository = "https://github.com/paritytech/parity-bridges-common/" +authors.workspace = true +edition.workspace = true +repository.workspace = true license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] @@ -41,8 +41,8 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", d sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } # Polkadot dependencies -xcm = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "master" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "master" } [dev-dependencies] bp-test-utils = { path = "../../primitives/test-utils" } @@ -50,12 +50,13 @@ pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "m pallet-bridge-messages = { path = "../../modules/messages", features = ["std", "test-helpers"] } [features] -default = ["std"] +default = [ "std" ] std = [ "bp-header-chain/std", "bp-messages/std", "bp-parachains/std", "bp-polkadot-core/std", + "bp-relayers/std", "bp-runtime/std", "bp-xcm-bridge-hub/std", "codec/std", @@ -76,17 +77,20 @@ std = [ "sp-runtime/std", "sp-std/std", "sp-trie/std", - "xcm/std", "xcm-builder/std", + "xcm/std", ] runtime-benchmarks = [ + "frame-support/runtime-benchmarks", + "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", "pallet-bridge-grandpa/runtime-benchmarks", "pallet-bridge-messages/runtime-benchmarks", "pallet-bridge-messages/test-helpers", "pallet-bridge-parachains/runtime-benchmarks", "pallet-bridge-relayers/runtime-benchmarks", + "pallet-utility/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", ] -integrity-test = [ - "static_assertions", -] +integrity-test = [ "static_assertions" ] diff --git a/bin/runtime-common/src/integrity.rs b/bin/runtime-common/src/integrity.rs index ac209654a46..80283cf51af 100644 --- a/bin/runtime-common/src/integrity.rs +++ b/bin/runtime-common/src/integrity.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/bin/runtime-common/src/lib.rs b/bin/runtime-common/src/lib.rs index 9a1df7fd311..e5849ab0671 100644 --- a/bin/runtime-common/src/lib.rs +++ b/bin/runtime-common/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -99,7 +99,7 @@ where #[macro_export] macro_rules! generate_bridge_reject_obsolete_headers_and_messages { ($call:ty, $account_id:ty, $($filter_call:ty),*) => { - #[derive(Clone, codec::Decode, Default, codec::Encode, Eq, PartialEq, frame_support::RuntimeDebug, scale_info::TypeInfo)] + #[derive(Clone, codec::Decode, Default, codec::Encode, Eq, PartialEq, sp_runtime::RuntimeDebug, scale_info::TypeInfo)] pub struct BridgeRejectObsoleteHeadersAndMessages; impl sp_runtime::traits::SignedExtension for BridgeRejectObsoleteHeadersAndMessages { const IDENTIFIER: &'static str = "BridgeRejectObsoleteHeadersAndMessages"; diff --git a/bin/runtime-common/src/messages_api.rs b/bin/runtime-common/src/messages_api.rs index 199e062fe98..ccf1c754041 100644 --- a/bin/runtime-common/src/messages_api.rs +++ b/bin/runtime-common/src/messages_api.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/bin/runtime-common/src/messages_benchmarking.rs b/bin/runtime-common/src/messages_benchmarking.rs index 245a5722470..6c4ccad3aa4 100644 --- a/bin/runtime-common/src/messages_benchmarking.rs +++ b/bin/runtime-common/src/messages_benchmarking.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/bin/runtime-common/src/messages_call_ext.rs b/bin/runtime-common/src/messages_call_ext.rs index 926aa9fb523..f06650a6a85 100644 --- a/bin/runtime-common/src/messages_call_ext.rs +++ b/bin/runtime-common/src/messages_call_ext.rs @@ -1,4 +1,4 @@ -// Copyright 2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -21,9 +21,9 @@ use bp_messages::{ target_chain::MessageDispatch, ChainWithMessages, InboundLaneData, LaneId, MessageNonce, }; use bp_runtime::AccountIdOf; -use frame_support::{dispatch::CallableCallFor, traits::IsSubType, RuntimeDebug}; +use frame_support::{dispatch::CallableCallFor, traits::IsSubType}; use pallet_bridge_messages::{BridgedChainOf, Config, Pallet}; -use sp_runtime::transaction_validity::TransactionValidity; +use sp_runtime::{transaction_validity::TransactionValidity, RuntimeDebug}; use sp_std::ops::RangeInclusive; /// Generic info about a messages delivery/confirmation proof. diff --git a/bin/runtime-common/src/mock.rs b/bin/runtime-common/src/mock.rs index 194f469b562..d7b294671ca 100644 --- a/bin/runtime-common/src/mock.rs +++ b/bin/runtime-common/src/mock.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/bin/runtime-common/src/parachains_benchmarking.rs b/bin/runtime-common/src/parachains_benchmarking.rs index b3c220b56f0..dc5469e9948 100644 --- a/bin/runtime-common/src/parachains_benchmarking.rs +++ b/bin/runtime-common/src/parachains_benchmarking.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -24,9 +24,10 @@ use bp_parachains::parachain_head_storage_key_at_source; use bp_polkadot_core::parachains::{ParaHash, ParaHead, ParaHeadsProof, ParaId}; use bp_runtime::{grow_storage_value, Chain, UnverifiedStorageProof, UnverifiedStorageProofParams}; use codec::Encode; -use frame_support::{traits::Get, StateVersion}; +use frame_support::traits::Get; use pallet_bridge_grandpa::BridgedChain; use pallet_bridge_parachains::{RelayBlockHash, RelayBlockHasher, RelayBlockNumber}; +use sp_runtime::StateVersion; use sp_std::prelude::*; use sp_trie::{LayoutV0, LayoutV1, MemoryDB, TrieConfiguration, TrieDBMutBuilder, TrieMut}; diff --git a/bin/runtime-common/src/priority_calculator.rs b/bin/runtime-common/src/priority_calculator.rs index deae78e91bf..d63ad2145b1 100644 --- a/bin/runtime-common/src/priority_calculator.rs +++ b/bin/runtime-common/src/priority_calculator.rs @@ -1,4 +1,4 @@ -// Copyright 2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -52,13 +52,13 @@ mod integrity_tests { use bp_messages::MessageNonce; use bp_runtime::PreComputedSize; use frame_support::{ - dispatch::{DispatchClass, DispatchInfo, Dispatchable, Pays, PostDispatchInfo}, + dispatch::{DispatchClass, DispatchInfo, Pays, PostDispatchInfo}, traits::Get, }; use pallet_bridge_messages::WeightInfoExt; use pallet_transaction_payment::OnChargeTransaction; use sp_runtime::{ - traits::{UniqueSaturatedInto, Zero}, + traits::{Dispatchable, UniqueSaturatedInto, Zero}, transaction_validity::TransactionPriority, FixedPointOperand, SaturatedConversion, Saturating, }; diff --git a/bin/runtime-common/src/refund_relayer_extension.rs b/bin/runtime-common/src/refund_relayer_extension.rs index 0fca846a848..50308a9687f 100644 --- a/bin/runtime-common/src/refund_relayer_extension.rs +++ b/bin/runtime-common/src/refund_relayer_extension.rs @@ -1,4 +1,4 @@ -// Copyright 2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -27,10 +27,10 @@ use bp_relayers::{RewardsAccountOwner, RewardsAccountParams}; use bp_runtime::{Chain, Parachain, ParachainIdOf, RangeInclusiveExt, StaticStrProvider}; use codec::{Decode, Encode}; use frame_support::{ - dispatch::{CallableCallFor, DispatchInfo, Dispatchable, PostDispatchInfo}, + dispatch::{CallableCallFor, DispatchInfo, PostDispatchInfo}, traits::IsSubType, weights::Weight, - CloneNoBound, DefaultNoBound, EqNoBound, PartialEqNoBound, RuntimeDebug, RuntimeDebugNoBound, + CloneNoBound, DefaultNoBound, EqNoBound, PartialEqNoBound, RuntimeDebugNoBound, }; use pallet_bridge_grandpa::{ CallSubType as GrandpaCallSubType, SubmitFinalityProofHelper, SubmitFinalityProofInfo, @@ -47,11 +47,11 @@ use pallet_transaction_payment::{Config as TransactionPaymentConfig, OnChargeTra use pallet_utility::{Call as UtilityCall, Config as UtilityConfig, Pallet as UtilityPallet}; use scale_info::TypeInfo; use sp_runtime::{ - traits::{DispatchInfoOf, Get, PostDispatchInfoOf, SignedExtension, Zero}, + traits::{DispatchInfoOf, Dispatchable, Get, PostDispatchInfoOf, SignedExtension, Zero}, transaction_validity::{ TransactionPriority, TransactionValidity, TransactionValidityError, ValidTransactionBuilder, }, - DispatchResult, FixedPointOperand, + DispatchResult, FixedPointOperand, RuntimeDebug, }; use sp_std::{marker::PhantomData, vec, vec::Vec}; diff --git a/modules/grandpa/Cargo.toml b/modules/grandpa/Cargo.toml index d04c6072979..a6004ab7e4d 100644 --- a/modules/grandpa/Cargo.toml +++ b/modules/grandpa/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "pallet-bridge-grandpa" version = "0.1.0" -authors = ["Parity Technologies "] -edition = "2021" +authors.workspace = true +edition.workspace = true license = "GPL-3.0-or-later WITH Classpath-exception-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -36,16 +36,16 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } [features] -default = ["std"] +default = [ "std" ] std = [ "bp-header-chain/std", "bp-runtime/std", "bp-test-utils/std", "codec/std", "finality-grandpa/std", + "frame-benchmarking/std", "frame-support/std", "frame-system/std", - "frame-benchmarking/std", "log/std", "scale-info/std", "sp-consensus-grandpa/std", @@ -56,8 +56,12 @@ std = [ runtime-benchmarks = [ "bp-test-utils", "frame-benchmarking/runtime-benchmarks", + "frame-support/runtime-benchmarks", + "frame-system/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/modules/grandpa/src/benchmarking.rs b/modules/grandpa/src/benchmarking.rs index aa222d6e4de..182b2f56eb1 100644 --- a/modules/grandpa/src/benchmarking.rs +++ b/modules/grandpa/src/benchmarking.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/modules/grandpa/src/call_ext.rs b/modules/grandpa/src/call_ext.rs index c83e88b7b56..e0648d5dd0f 100644 --- a/modules/grandpa/src/call_ext.rs +++ b/modules/grandpa/src/call_ext.rs @@ -1,4 +1,4 @@ -// Copyright 2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -18,11 +18,11 @@ use crate::{weights::WeightInfo, BridgedBlockNumber, BridgedHeader, Config, Erro use bp_header_chain::{justification::GrandpaJustification, ChainWithGrandpa}; use bp_runtime::BlockNumberOf; use codec::Encode; -use frame_support::{dispatch::CallableCallFor, traits::IsSubType, weights::Weight, RuntimeDebug}; +use frame_support::{dispatch::CallableCallFor, traits::IsSubType, weights::Weight}; use sp_runtime::{ traits::{Header, Zero}, transaction_validity::{InvalidTransaction, TransactionValidity, ValidTransaction}, - SaturatedConversion, + RuntimeDebug, SaturatedConversion, }; /// Info about a `SubmitParachainHeads` call which tries to update a single parachain. diff --git a/modules/grandpa/src/lib.rs b/modules/grandpa/src/lib.rs index af14a45f472..c40e79ae5ab 100644 --- a/modules/grandpa/src/lib.rs +++ b/modules/grandpa/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/modules/grandpa/src/mock.rs b/modules/grandpa/src/mock.rs index b802b72bfa4..600bc538592 100644 --- a/modules/grandpa/src/mock.rs +++ b/modules/grandpa/src/mock.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/modules/grandpa/src/storage_types.rs b/modules/grandpa/src/storage_types.rs index 59fcb5d3f07..6d1a7882dd4 100644 --- a/modules/grandpa/src/storage_types.rs +++ b/modules/grandpa/src/storage_types.rs @@ -1,4 +1,4 @@ -// Copyright 2022 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/modules/grandpa/src/weights.rs b/modules/grandpa/src/weights.rs index 4b94f7adfe7..89ed70d13ac 100644 --- a/modules/grandpa/src/weights.rs +++ b/modules/grandpa/src/weights.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/modules/messages/Cargo.toml b/modules/messages/Cargo.toml index e6b4e642aa5..56cca434636 100644 --- a/modules/messages/Cargo.toml +++ b/modules/messages/Cargo.toml @@ -2,8 +2,8 @@ name = "pallet-bridge-messages" description = "Module that allows bridged chains to exchange messages using lane concept." version = "0.1.0" -authors = ["Parity Technologies "] -edition = "2021" +authors.workspace = true +edition.workspace = true license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] @@ -37,15 +37,15 @@ sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } [features] -default = ["std"] +default = [ "std" ] std = [ "bp-header-chain/std", "bp-messages/std", "bp-runtime/std", "codec/std", + "frame-benchmarking/std", "frame-support/std", "frame-system/std", - "frame-benchmarking/std", "log/std", "num-traits/std", "scale-info/std", @@ -57,10 +57,16 @@ std = [ runtime-benchmarks = [ "bp-runtime/test-helpers", "frame-benchmarking/runtime-benchmarks", + "frame-support/runtime-benchmarks", + "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", + "sp-runtime/try-runtime", ] test-helpers = [ "sp-trie", diff --git a/modules/messages/src/benchmarking.rs b/modules/messages/src/benchmarking.rs index 4010414e6ca..ad3f9602925 100644 --- a/modules/messages/src/benchmarking.rs +++ b/modules/messages/src/benchmarking.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/modules/messages/src/inbound_lane.rs b/modules/messages/src/inbound_lane.rs index 6cff79bd4fe..8e5d213a844 100644 --- a/modules/messages/src/inbound_lane.rs +++ b/modules/messages/src/inbound_lane.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -25,8 +25,8 @@ use bp_messages::{ }; use bp_runtime::AccountIdOf; use codec::{Decode, Encode, EncodeLike, MaxEncodedLen}; -use frame_support::RuntimeDebug; use scale_info::{Type, TypeInfo}; +use sp_runtime::RuntimeDebug; use sp_std::prelude::PartialEq; /// Inbound lane storage. diff --git a/modules/messages/src/lib.rs b/modules/messages/src/lib.rs index b6b99ab854c..0a2bb2fce65 100644 --- a/modules/messages/src/lib.rs +++ b/modules/messages/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/modules/messages/src/outbound_lane.rs b/modules/messages/src/outbound_lane.rs index b43b3a8133e..cdca7e4194c 100644 --- a/modules/messages/src/outbound_lane.rs +++ b/modules/messages/src/outbound_lane.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -23,8 +23,9 @@ use bp_messages::{ OutboundLaneData, UnrewardedRelayer, VerificationError, }; use codec::{Decode, Encode}; -use frame_support::{traits::Get, BoundedVec, PalletError, RuntimeDebug}; +use frame_support::{traits::Get, BoundedVec, PalletError}; use scale_info::TypeInfo; +use sp_runtime::RuntimeDebug; use sp_std::{collections::vec_deque::VecDeque, marker::PhantomData, ops::RangeInclusive}; /// Outbound lane storage. diff --git a/modules/messages/src/tests/mock.rs b/modules/messages/src/tests/mock.rs index 84725219335..414d9bc61d3 100644 --- a/modules/messages/src/tests/mock.rs +++ b/modules/messages/src/tests/mock.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/modules/messages/src/weights.rs b/modules/messages/src/weights.rs index 64d66cc582c..4375ea63420 100644 --- a/modules/messages/src/weights.rs +++ b/modules/messages/src/weights.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/modules/messages/src/weights_ext.rs b/modules/messages/src/weights_ext.rs index 118dc99793d..b4d4a1049b2 100644 --- a/modules/messages/src/weights_ext.rs +++ b/modules/messages/src/weights_ext.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/modules/parachains/Cargo.toml b/modules/parachains/Cargo.toml index f7e2184a261..490cd838bdb 100644 --- a/modules/parachains/Cargo.toml +++ b/modules/parachains/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "pallet-bridge-parachains" version = "0.1.0" -authors = ["Parity Technologies "] -edition = "2021" +authors.workspace = true +edition.workspace = true license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] @@ -34,16 +34,16 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } [features] -default = ["std"] +default = [ "std" ] std = [ "bp-header-chain/std", "bp-parachains/std", "bp-polkadot-core/std", "bp-runtime/std", "codec/std", + "frame-benchmarking/std", "frame-support/std", "frame-system/std", - "frame-benchmarking/std", "log/std", "pallet-bridge-grandpa/std", "scale-info/std", @@ -53,8 +53,14 @@ std = [ ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", + "frame-support/runtime-benchmarks", + "frame-system/runtime-benchmarks", + "pallet-bridge-grandpa/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-bridge-grandpa/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/modules/parachains/src/benchmarking.rs b/modules/parachains/src/benchmarking.rs index b4603df9ac3..92ece6d688c 100644 --- a/modules/parachains/src/benchmarking.rs +++ b/modules/parachains/src/benchmarking.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/modules/parachains/src/call_ext.rs b/modules/parachains/src/call_ext.rs index 0210928f4d5..efd7dd2c44b 100644 --- a/modules/parachains/src/call_ext.rs +++ b/modules/parachains/src/call_ext.rs @@ -1,4 +1,4 @@ -// Copyright 2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -17,8 +17,11 @@ use crate::{Config, Pallet, RelayBlockNumber}; use bp_parachains::BestParaHeadHash; use bp_polkadot_core::parachains::{ParaHash, ParaId}; -use frame_support::{dispatch::CallableCallFor, traits::IsSubType, RuntimeDebug}; -use sp_runtime::transaction_validity::{InvalidTransaction, TransactionValidity, ValidTransaction}; +use frame_support::{dispatch::CallableCallFor, traits::IsSubType}; +use sp_runtime::{ + transaction_validity::{InvalidTransaction, TransactionValidity, ValidTransaction}, + RuntimeDebug, +}; /// Info about a `SubmitParachainHeads` call which tries to update a single parachain. #[derive(PartialEq, RuntimeDebug)] diff --git a/modules/parachains/src/lib.rs b/modules/parachains/src/lib.rs index 68201d92525..5993ee5a1c8 100644 --- a/modules/parachains/src/lib.rs +++ b/modules/parachains/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/modules/parachains/src/mock.rs b/modules/parachains/src/mock.rs index b039e75fd42..3600bf3c664 100644 --- a/modules/parachains/src/mock.rs +++ b/modules/parachains/src/mock.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/modules/parachains/src/weights.rs b/modules/parachains/src/weights.rs index d712c55f874..868cce45016 100644 --- a/modules/parachains/src/weights.rs +++ b/modules/parachains/src/weights.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/modules/parachains/src/weights_ext.rs b/modules/parachains/src/weights_ext.rs index eecdfe90359..13bc9ad2bbc 100644 --- a/modules/parachains/src/weights_ext.rs +++ b/modules/parachains/src/weights_ext.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/modules/relayers/Cargo.toml b/modules/relayers/Cargo.toml index f28043ea484..05f8eae1051 100644 --- a/modules/relayers/Cargo.toml +++ b/modules/relayers/Cargo.toml @@ -2,8 +2,8 @@ name = "pallet-bridge-relayers" description = "Module used to store relayer rewards and coordinate relayers set." version = "0.1.0" -authors = ["Parity Technologies "] -edition = "2021" +authors.workspace = true +edition.workspace = true license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] @@ -35,7 +35,7 @@ sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } [features] -default = ["std"] +default = [ "std" ] std = [ "bp-messages/std", "bp-relayers/std", @@ -53,8 +53,16 @@ std = [ ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", + "frame-support/runtime-benchmarks", + "frame-system/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "pallet-bridge-messages/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "pallet-balances/try-runtime", + "pallet-bridge-messages/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/modules/relayers/src/benchmarking.rs b/modules/relayers/src/benchmarking.rs index 69357aebbae..fe727109751 100644 --- a/modules/relayers/src/benchmarking.rs +++ b/modules/relayers/src/benchmarking.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/modules/relayers/src/lib.rs b/modules/relayers/src/lib.rs index e0cf5bd07d3..cbfeceb01bc 100644 --- a/modules/relayers/src/lib.rs +++ b/modules/relayers/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/modules/relayers/src/mock.rs b/modules/relayers/src/mock.rs index cc711894171..5c75f502ccb 100644 --- a/modules/relayers/src/mock.rs +++ b/modules/relayers/src/mock.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/modules/relayers/src/payment_adapter.rs b/modules/relayers/src/payment_adapter.rs index f2b81bd1546..beec412c120 100644 --- a/modules/relayers/src/payment_adapter.rs +++ b/modules/relayers/src/payment_adapter.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/modules/relayers/src/stake_adapter.rs b/modules/relayers/src/stake_adapter.rs index bdb66b007c5..a3851fef66b 100644 --- a/modules/relayers/src/stake_adapter.rs +++ b/modules/relayers/src/stake_adapter.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/modules/relayers/src/weights.rs b/modules/relayers/src/weights.rs index 1bc195a5424..2e064a3936d 100644 --- a/modules/relayers/src/weights.rs +++ b/modules/relayers/src/weights.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/modules/relayers/src/weights_ext.rs b/modules/relayers/src/weights_ext.rs index d459b0686bd..9cd25c47c37 100644 --- a/modules/relayers/src/weights_ext.rs +++ b/modules/relayers/src/weights_ext.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/modules/xcm-bridge-hub-router/Cargo.toml b/modules/xcm-bridge-hub-router/Cargo.toml index 067f05dc3fb..b8ddaf1c09f 100644 --- a/modules/xcm-bridge-hub-router/Cargo.toml +++ b/modules/xcm-bridge-hub-router/Cargo.toml @@ -2,8 +2,8 @@ name = "pallet-xcm-bridge-hub-router" description = "Bridge hub interface for sibling/parent chains with dynamic fees support." version = "0.1.0" -authors = ["Parity Technologies "] -edition = "2021" +authors.workspace = true +edition.workspace = true license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] @@ -25,8 +25,8 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", d # Polkadot Dependencies -xcm = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "master" } +xcm-builder = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "master" } [dev-dependencies] sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" } @@ -34,7 +34,7 @@ sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master" } [features] -default = ["std"] +default = [ "std" ] std = [ "bp-xcm-bridge-hub/std", "codec/std", @@ -45,14 +45,18 @@ std = [ "scale-info/std", "sp-runtime/std", "sp-std/std", - "xcm/std", "xcm-builder/std", + "xcm/std", ] runtime-benchmarks = [ "frame-benchmarking/runtime-benchmarks", + "frame-support/runtime-benchmarks", + "frame-system/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", "xcm-builder/runtime-benchmarks", ] try-runtime = [ "frame-support/try-runtime", "frame-system/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/modules/xcm-bridge-hub-router/src/benchmarking.rs b/modules/xcm-bridge-hub-router/src/benchmarking.rs index 5f16c79bded..79e15df5ca8 100644 --- a/modules/xcm-bridge-hub-router/src/benchmarking.rs +++ b/modules/xcm-bridge-hub-router/src/benchmarking.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/modules/xcm-bridge-hub-router/src/lib.rs b/modules/xcm-bridge-hub-router/src/lib.rs index 8081338a806..b24a365005a 100644 --- a/modules/xcm-bridge-hub-router/src/lib.rs +++ b/modules/xcm-bridge-hub-router/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/modules/xcm-bridge-hub-router/src/mock.rs b/modules/xcm-bridge-hub-router/src/mock.rs index 27565532780..e0d156e290e 100644 --- a/modules/xcm-bridge-hub-router/src/mock.rs +++ b/modules/xcm-bridge-hub-router/src/mock.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/modules/xcm-bridge-hub-router/src/weights.rs b/modules/xcm-bridge-hub-router/src/weights.rs index 497ab9e4f1d..7abfef6e0be 100644 --- a/modules/xcm-bridge-hub-router/src/weights.rs +++ b/modules/xcm-bridge-hub-router/src/weights.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/primitives/chain-bridge-hub-cumulus/Cargo.toml b/primitives/chain-bridge-hub-cumulus/Cargo.toml index 2bbe3d029a3..1880333d346 100644 --- a/primitives/chain-bridge-hub-cumulus/Cargo.toml +++ b/primitives/chain-bridge-hub-cumulus/Cargo.toml @@ -2,8 +2,8 @@ name = "bp-bridge-hub-cumulus" description = "Primitives of BridgeHubRococo parachain runtime." version = "0.1.0" -authors = ["Parity Technologies "] -edition = "2021" +authors.workspace = true +edition.workspace = true license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] @@ -21,17 +21,17 @@ sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", d sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } # Polkadot Dependencies -polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "master" } [features] -default = ["std"] +default = [ "std" ] std = [ - "bp-polkadot-core/std", "bp-messages/std", + "bp-polkadot-core/std", "bp-runtime/std", - "frame-system/std", "frame-support/std", + "frame-system/std", + "polkadot-primitives/std", "sp-api/std", "sp-std/std", - "polkadot-primitives/std", ] diff --git a/primitives/chain-bridge-hub-cumulus/src/lib.rs b/primitives/chain-bridge-hub-cumulus/src/lib.rs index cad506078b2..4c7a3ca2dce 100644 --- a/primitives/chain-bridge-hub-cumulus/src/lib.rs +++ b/primitives/chain-bridge-hub-cumulus/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2022 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/primitives/chain-bridge-hub-kusama/Cargo.toml b/primitives/chain-bridge-hub-kusama/Cargo.toml index 6d4334eaa57..1ad196d9ff6 100644 --- a/primitives/chain-bridge-hub-kusama/Cargo.toml +++ b/primitives/chain-bridge-hub-kusama/Cargo.toml @@ -2,8 +2,8 @@ name = "bp-bridge-hub-kusama" description = "Primitives of BridgeHubRococo parachain runtime." version = "0.1.0" -authors = ["Parity Technologies "] -edition = "2021" +authors.workspace = true +edition.workspace = true license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] @@ -17,15 +17,17 @@ bp-messages = { path = "../../primitives/messages", default-features = false } frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [features] -default = ["std"] +default = [ "std" ] std = [ "bp-bridge-hub-cumulus/std", "bp-messages/std", "bp-runtime/std", "frame-support/std", "sp-api/std", + "sp-runtime/std", "sp-std/std", ] diff --git a/primitives/chain-bridge-hub-kusama/src/lib.rs b/primitives/chain-bridge-hub-kusama/src/lib.rs index 0759f623bbf..29df2410c00 100644 --- a/primitives/chain-bridge-hub-kusama/src/lib.rs +++ b/primitives/chain-bridge-hub-kusama/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2022 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -28,8 +28,8 @@ use bp_runtime::{ use frame_support::{ dispatch::DispatchClass, sp_runtime::{MultiAddress, MultiSigner}, - RuntimeDebug, StateVersion, }; +use sp_runtime::{RuntimeDebug, StateVersion}; use sp_std::prelude::Vec; /// BridgeHubKusama parachain. diff --git a/primitives/chain-bridge-hub-polkadot/Cargo.toml b/primitives/chain-bridge-hub-polkadot/Cargo.toml index 2a0ab3213c8..2ddb30225fa 100644 --- a/primitives/chain-bridge-hub-polkadot/Cargo.toml +++ b/primitives/chain-bridge-hub-polkadot/Cargo.toml @@ -2,8 +2,8 @@ name = "bp-bridge-hub-polkadot" description = "Primitives of BridgeHubWococo parachain runtime." version = "0.1.0" -authors = ["Parity Technologies "] -edition = "2021" +authors.workspace = true +edition.workspace = true license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] @@ -18,15 +18,17 @@ bp-messages = { path = "../../primitives/messages", default-features = false } frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [features] -default = ["std"] +default = [ "std" ] std = [ "bp-bridge-hub-cumulus/std", - "bp-runtime/std", "bp-messages/std", + "bp-runtime/std", "frame-support/std", "sp-api/std", + "sp-runtime/std", "sp-std/std", ] diff --git a/primitives/chain-bridge-hub-polkadot/src/lib.rs b/primitives/chain-bridge-hub-polkadot/src/lib.rs index 1327894513a..aec6f0ff5d0 100644 --- a/primitives/chain-bridge-hub-polkadot/src/lib.rs +++ b/primitives/chain-bridge-hub-polkadot/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -25,7 +25,8 @@ use bp_messages::*; use bp_runtime::{ decl_bridge_finality_runtime_apis, decl_bridge_messages_runtime_apis, Chain, ChainId, Parachain, }; -use frame_support::{dispatch::DispatchClass, RuntimeDebug, StateVersion}; +use frame_support::dispatch::DispatchClass; +use sp_runtime::{RuntimeDebug, StateVersion}; use sp_std::prelude::Vec; /// BridgeHubPolkadot parachain. diff --git a/primitives/chain-bridge-hub-rococo/Cargo.toml b/primitives/chain-bridge-hub-rococo/Cargo.toml index 85c4225ab55..714d9aa48e1 100644 --- a/primitives/chain-bridge-hub-rococo/Cargo.toml +++ b/primitives/chain-bridge-hub-rococo/Cargo.toml @@ -2,8 +2,8 @@ name = "bp-bridge-hub-rococo" description = "Primitives of BridgeHubRococo parachain runtime." version = "0.1.0" -authors = ["Parity Technologies "] -edition = "2021" +authors.workspace = true +edition.workspace = true license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] @@ -17,15 +17,17 @@ bp-messages = { path = "../../primitives/messages", default-features = false } frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [features] -default = ["std"] +default = [ "std" ] std = [ "bp-bridge-hub-cumulus/std", "bp-messages/std", "bp-runtime/std", "frame-support/std", "sp-api/std", + "sp-runtime/std", "sp-std/std", ] diff --git a/primitives/chain-bridge-hub-rococo/src/lib.rs b/primitives/chain-bridge-hub-rococo/src/lib.rs index 85118905ba6..6ab84202aaa 100644 --- a/primitives/chain-bridge-hub-rococo/src/lib.rs +++ b/primitives/chain-bridge-hub-rococo/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2022 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -25,13 +25,9 @@ use bp_messages::*; use bp_runtime::{ decl_bridge_finality_runtime_apis, decl_bridge_messages_runtime_apis, Chain, ChainId, Parachain, }; -use frame_support::{ - dispatch::DispatchClass, - sp_runtime::{MultiAddress, MultiSigner}, - RuntimeDebug, StateVersion, -}; +use frame_support::dispatch::DispatchClass; +use sp_runtime::{MultiAddress, MultiSigner, RuntimeDebug, StateVersion}; use sp_std::prelude::Vec; - /// BridgeHubRococo parachain. #[derive(RuntimeDebug)] pub struct BridgeHubRococo; diff --git a/primitives/chain-bridge-hub-wococo/Cargo.toml b/primitives/chain-bridge-hub-wococo/Cargo.toml index 24ecdb7adbc..fb480b4a440 100644 --- a/primitives/chain-bridge-hub-wococo/Cargo.toml +++ b/primitives/chain-bridge-hub-wococo/Cargo.toml @@ -2,8 +2,8 @@ name = "bp-bridge-hub-wococo" description = "Primitives of BridgeHubWococo parachain runtime." version = "0.1.0" -authors = ["Parity Technologies "] -edition = "2021" +authors.workspace = true +edition.workspace = true license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] @@ -18,15 +18,17 @@ bp-messages = { path = "../../primitives/messages", default-features = false } frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [features] -default = ["std"] +default = [ "std" ] std = [ "bp-bridge-hub-cumulus/std", - "bp-runtime/std", "bp-messages/std", + "bp-runtime/std", "frame-support/std", "sp-api/std", + "sp-runtime/std", "sp-std/std", ] diff --git a/primitives/chain-bridge-hub-wococo/src/lib.rs b/primitives/chain-bridge-hub-wococo/src/lib.rs index 98056de7dab..1c322834d76 100644 --- a/primitives/chain-bridge-hub-wococo/src/lib.rs +++ b/primitives/chain-bridge-hub-wococo/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -25,7 +25,8 @@ use bp_messages::*; use bp_runtime::{ decl_bridge_finality_runtime_apis, decl_bridge_messages_runtime_apis, Chain, ChainId, Parachain, }; -use frame_support::{dispatch::DispatchClass, RuntimeDebug, StateVersion}; +use frame_support::dispatch::DispatchClass; +use sp_runtime::{RuntimeDebug, StateVersion}; use sp_std::prelude::Vec; /// BridgeHubWococo parachain. diff --git a/primitives/chain-kusama/Cargo.toml b/primitives/chain-kusama/Cargo.toml index 65b0729aa17..e4d59c9d159 100644 --- a/primitives/chain-kusama/Cargo.toml +++ b/primitives/chain-kusama/Cargo.toml @@ -2,8 +2,8 @@ name = "bp-kusama" description = "Primitives of Kusama runtime." version = "0.1.0" -authors = ["Parity Technologies "] -edition = "2021" +authors.workspace = true +edition.workspace = true license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] @@ -21,7 +21,7 @@ sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", d sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [features] -default = ["std"] +default = [ "std" ] std = [ "bp-header-chain/std", "bp-polkadot-core/std", diff --git a/primitives/chain-kusama/src/lib.rs b/primitives/chain-kusama/src/lib.rs index 8893d1a0995..9bda3033553 100644 --- a/primitives/chain-kusama/src/lib.rs +++ b/primitives/chain-kusama/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/primitives/chain-polkadot/Cargo.toml b/primitives/chain-polkadot/Cargo.toml index 1522f1dadb7..d67a4f10fd1 100644 --- a/primitives/chain-polkadot/Cargo.toml +++ b/primitives/chain-polkadot/Cargo.toml @@ -2,8 +2,8 @@ name = "bp-polkadot" description = "Primitives of Polkadot runtime." version = "0.1.0" -authors = ["Parity Technologies "] -edition = "2021" +authors.workspace = true +edition.workspace = true license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] @@ -21,7 +21,7 @@ sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", d sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [features] -default = ["std"] +default = [ "std" ] std = [ "bp-header-chain/std", "bp-polkadot-core/std", diff --git a/primitives/chain-polkadot/src/lib.rs b/primitives/chain-polkadot/src/lib.rs index a2dd4170031..cce0b160af6 100644 --- a/primitives/chain-polkadot/src/lib.rs +++ b/primitives/chain-polkadot/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/primitives/chain-rococo/Cargo.toml b/primitives/chain-rococo/Cargo.toml index 26e035b439a..9085f1e7c99 100644 --- a/primitives/chain-rococo/Cargo.toml +++ b/primitives/chain-rococo/Cargo.toml @@ -2,8 +2,8 @@ name = "bp-rococo" description = "Primitives of Rococo runtime." version = "0.1.0" -authors = ["Parity Technologies "] -edition = "2021" +authors.workspace = true +edition.workspace = true license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] @@ -17,16 +17,18 @@ bp-runtime = { path = "../runtime", default-features = false } # Substrate Based Dependencies sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [features] -default = ["std"] +default = [ "std" ] std = [ "bp-header-chain/std", "bp-polkadot-core/std", "bp-runtime/std", "frame-support/std", "sp-api/std", + "sp-runtime/std", "sp-std/std", ] diff --git a/primitives/chain-rococo/src/lib.rs b/primitives/chain-rococo/src/lib.rs index 0a1fcf319a5..9796a6ceed3 100644 --- a/primitives/chain-rococo/src/lib.rs +++ b/primitives/chain-rococo/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -23,7 +23,8 @@ pub use bp_polkadot_core::*; use bp_header_chain::ChainWithGrandpa; use bp_runtime::{decl_bridge_finality_runtime_apis, Chain, ChainId}; -use frame_support::{weights::Weight, StateVersion}; +use frame_support::weights::Weight; +use sp_runtime::StateVersion; use sp_std::prelude::Vec; /// Rococo Chain diff --git a/primitives/chain-westend/Cargo.toml b/primitives/chain-westend/Cargo.toml index a080b8d3527..8f2d0c638db 100644 --- a/primitives/chain-westend/Cargo.toml +++ b/primitives/chain-westend/Cargo.toml @@ -18,6 +18,7 @@ bp-runtime = { path = "../runtime", default-features = false } frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [features] @@ -28,5 +29,6 @@ std = [ "bp-runtime/std", "frame-support/std", "sp-api/std", + "sp-runtime/std", "sp-std/std", ] diff --git a/primitives/chain-westend/src/lib.rs b/primitives/chain-westend/src/lib.rs index aaaf3f66d91..787a51f37b9 100644 --- a/primitives/chain-westend/src/lib.rs +++ b/primitives/chain-westend/src/lib.rs @@ -20,7 +20,8 @@ #![cfg_attr(not(feature = "std"), no_std)] pub use bp_polkadot_core::*; -use frame_support::{sp_std, StateVersion}; +use frame_support::sp_std; +use sp_runtime::StateVersion; use sp_std::prelude::*; use bp_header_chain::ChainWithGrandpa; diff --git a/primitives/chain-wococo/Cargo.toml b/primitives/chain-wococo/Cargo.toml index 3bde102d8f2..c7e8a3af0a0 100644 --- a/primitives/chain-wococo/Cargo.toml +++ b/primitives/chain-wococo/Cargo.toml @@ -2,8 +2,8 @@ name = "bp-wococo" description = "Primitives of Wococo runtime." version = "0.1.0" -authors = ["Parity Technologies "] -edition = "2021" +authors.workspace = true +edition.workspace = true license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] @@ -22,12 +22,12 @@ sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", d sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [features] -default = ["std"] +default = [ "std" ] std = [ "bp-header-chain/std", "bp-polkadot-core/std", - "bp-runtime/std", "bp-rococo/std", + "bp-runtime/std", "frame-support/std", "sp-api/std", "sp-std/std", diff --git a/primitives/chain-wococo/src/lib.rs b/primitives/chain-wococo/src/lib.rs index c8f56f88b38..1bb4c0d17eb 100644 --- a/primitives/chain-wococo/src/lib.rs +++ b/primitives/chain-wococo/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/primitives/header-chain/Cargo.toml b/primitives/header-chain/Cargo.toml index c0afd80ba5d..3d66b210aea 100644 --- a/primitives/header-chain/Cargo.toml +++ b/primitives/header-chain/Cargo.toml @@ -2,8 +2,8 @@ name = "bp-header-chain" description = "A common interface for describing what a bridge pallet should be able to do." version = "0.1.0" -authors = ["Parity Technologies "] -edition = "2021" +authors.workspace = true +edition.workspace = true license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] @@ -30,7 +30,7 @@ hex = "0.4" hex-literal = "0.4" [features] -default = ["std"] +default = [ "std" ] std = [ "bp-runtime/std", "codec/std", @@ -38,8 +38,8 @@ std = [ "frame-support/std", "scale-info/std", "serde/std", - "sp-core/std", "sp-consensus-grandpa/std", + "sp-core/std", "sp-runtime/std", "sp-std/std", ] diff --git a/primitives/header-chain/src/justification/mod.rs b/primitives/header-chain/src/justification/mod.rs index fbb8af80b2c..72a5f68918d 100644 --- a/primitives/header-chain/src/justification/mod.rs +++ b/primitives/header-chain/src/justification/mod.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2023 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -32,10 +32,10 @@ pub use verification::{ use bp_runtime::{BlockNumberOf, Chain, HashOf, HeaderId}; use codec::{Decode, Encode, MaxEncodedLen}; -use frame_support::{RuntimeDebug, RuntimeDebugNoBound}; +use frame_support::RuntimeDebugNoBound; use scale_info::TypeInfo; use sp_consensus_grandpa::{AuthorityId, AuthoritySignature}; -use sp_runtime::{traits::Header as HeaderT, SaturatedConversion}; +use sp_runtime::{traits::Header as HeaderT, RuntimeDebug, SaturatedConversion}; use sp_std::prelude::*; /// A GRANDPA Justification is a proof that a given header was finalized diff --git a/primitives/header-chain/src/justification/verification/equivocation.rs b/primitives/header-chain/src/justification/verification/equivocation.rs index 2484fc4d6b2..e2d7a8e804c 100644 --- a/primitives/header-chain/src/justification/verification/equivocation.rs +++ b/primitives/header-chain/src/justification/verification/equivocation.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2023 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/primitives/header-chain/src/justification/verification/mod.rs b/primitives/header-chain/src/justification/verification/mod.rs index 7af5292256c..bb8aaadf327 100644 --- a/primitives/header-chain/src/justification/verification/mod.rs +++ b/primitives/header-chain/src/justification/verification/mod.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2023 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -24,9 +24,8 @@ use crate::{justification::GrandpaJustification, AuthoritySet}; use bp_runtime::HeaderId; use finality_grandpa::voter_set::VoterSet; -use frame_support::RuntimeDebug; use sp_consensus_grandpa::{AuthorityId, AuthoritySignature, SetId}; -use sp_runtime::traits::Header as HeaderT; +use sp_runtime::{traits::Header as HeaderT, RuntimeDebug}; use sp_std::{ collections::{btree_map::BTreeMap, btree_set::BTreeSet}, prelude::*, diff --git a/primitives/header-chain/src/justification/verification/optimizer.rs b/primitives/header-chain/src/justification/verification/optimizer.rs index 99ccdd50616..6552b359170 100644 --- a/primitives/header-chain/src/justification/verification/optimizer.rs +++ b/primitives/header-chain/src/justification/verification/optimizer.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2023 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/primitives/header-chain/src/justification/verification/strict.rs b/primitives/header-chain/src/justification/verification/strict.rs index a9d5f4c1f73..f899c6c8efc 100644 --- a/primitives/header-chain/src/justification/verification/strict.rs +++ b/primitives/header-chain/src/justification/verification/strict.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2023 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/primitives/header-chain/src/lib.rs b/primitives/header-chain/src/lib.rs index 60cae8e092e..3072f9ffdf5 100644 --- a/primitives/header-chain/src/lib.rs +++ b/primitives/header-chain/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/primitives/header-chain/src/storage_keys.rs b/primitives/header-chain/src/storage_keys.rs index c4dbe53bd9a..55d095afbf2 100644 --- a/primitives/header-chain/src/storage_keys.rs +++ b/primitives/header-chain/src/storage_keys.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/primitives/header-chain/tests/implementation_match.rs b/primitives/header-chain/tests/implementation_match.rs index db96961832d..f664a419621 100644 --- a/primitives/header-chain/tests/implementation_match.rs +++ b/primitives/header-chain/tests/implementation_match.rs @@ -1,4 +1,4 @@ -// Copyright 2020-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/primitives/header-chain/tests/justification/equivocation.rs b/primitives/header-chain/tests/justification/equivocation.rs index f3c133481fb..0bc084cc1a9 100644 --- a/primitives/header-chain/tests/justification/equivocation.rs +++ b/primitives/header-chain/tests/justification/equivocation.rs @@ -1,4 +1,4 @@ -// Copyright 2020-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/primitives/header-chain/tests/justification/optimizer.rs b/primitives/header-chain/tests/justification/optimizer.rs index bdc90a3b07c..21bcd7e86b5 100644 --- a/primitives/header-chain/tests/justification/optimizer.rs +++ b/primitives/header-chain/tests/justification/optimizer.rs @@ -1,4 +1,4 @@ -// Copyright 2020-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/primitives/header-chain/tests/justification/strict.rs b/primitives/header-chain/tests/justification/strict.rs index 9568f7f7cf9..188c9f5baba 100644 --- a/primitives/header-chain/tests/justification/strict.rs +++ b/primitives/header-chain/tests/justification/strict.rs @@ -1,4 +1,4 @@ -// Copyright 2020-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/primitives/header-chain/tests/tests.rs b/primitives/header-chain/tests/tests.rs index 7c525a9303a..269fde09bb7 100644 --- a/primitives/header-chain/tests/tests.rs +++ b/primitives/header-chain/tests/tests.rs @@ -1,3 +1,19 @@ +// Copyright (C) Parity Technologies (UK) Ltd. +// This file is part of Parity Bridges Common. + +// Parity Bridges Common 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. + +// Parity Bridges Common 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 Parity Bridges Common. If not, see . + mod justification { mod equivocation; mod optimizer; diff --git a/primitives/messages/Cargo.toml b/primitives/messages/Cargo.toml index ea9ba8fb036..05a7bab54d5 100644 --- a/primitives/messages/Cargo.toml +++ b/primitives/messages/Cargo.toml @@ -2,8 +2,8 @@ name = "bp-messages" description = "Primitives of messages module." version = "0.1.0" -authors = ["Parity Technologies "] -edition = "2021" +authors.workspace = true +edition.workspace = true license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] @@ -28,15 +28,15 @@ hex = "0.4" hex-literal = "0.4" [features] -default = ["std"] +default = [ "std" ] std = [ - "bp-runtime/std", "bp-header-chain/std", + "bp-runtime/std", "codec/std", "frame-support/std", "scale-info/std", "serde/std", "sp-core/std", - "sp-io/std", - "sp-std/std" + "sp-io/std", + "sp-std/std", ] diff --git a/primitives/messages/src/lib.rs b/primitives/messages/src/lib.rs index 50f64852ce4..85ea378871e 100644 --- a/primitives/messages/src/lib.rs +++ b/primitives/messages/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -25,13 +25,13 @@ use bp_runtime::{ RangeInclusiveExt, StorageProofError, UnderlyingChainOf, UnderlyingChainProvider, }; use codec::{Decode, Encode, MaxEncodedLen}; -use frame_support::{PalletError, RuntimeDebug}; +use frame_support::PalletError; // Weight is reexported to avoid additional frame-support dependencies in related crates. pub use frame_support::weights::Weight; use scale_info::TypeInfo; use serde::{Deserialize, Serialize}; use source_chain::RelayersRewards; -use sp_core::{TypeId, H256}; +use sp_core::{RuntimeDebug, TypeId, H256}; use sp_io::hashing::blake2_256; use sp_std::{collections::vec_deque::VecDeque, ops::RangeInclusive, prelude::*}; diff --git a/primitives/messages/src/source_chain.rs b/primitives/messages/src/source_chain.rs index 290216c8023..b4f91efb4f1 100644 --- a/primitives/messages/src/source_chain.rs +++ b/primitives/messages/src/source_chain.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -20,8 +20,8 @@ use crate::{LaneId, MessageNonce, UnrewardedRelayer}; use bp_runtime::{Size, UnverifiedStorageProof}; use codec::{Decode, Encode}; -use frame_support::RuntimeDebug; use scale_info::TypeInfo; +use sp_core::RuntimeDebug; use sp_std::{ collections::{btree_map::BTreeMap, vec_deque::VecDeque}, fmt::Debug, diff --git a/primitives/messages/src/storage_keys.rs b/primitives/messages/src/storage_keys.rs index 8908432653e..3e7b04a50b0 100644 --- a/primitives/messages/src/storage_keys.rs +++ b/primitives/messages/src/storage_keys.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/primitives/messages/src/target_chain.rs b/primitives/messages/src/target_chain.rs index 51484e1e32e..90ca24c3bd0 100644 --- a/primitives/messages/src/target_chain.rs +++ b/primitives/messages/src/target_chain.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -20,8 +20,9 @@ use crate::{LaneId, Message, MessageKey, MessageNonce, MessagePayload, OutboundL use bp_runtime::{messages::MessageDispatchResult, Size, UnverifiedStorageProof}; use codec::{Decode, Encode, Error as CodecError}; -use frame_support::{weights::Weight, RuntimeDebug}; +use frame_support::weights::Weight; use scale_info::TypeInfo; +use sp_core::RuntimeDebug; use sp_std::{fmt::Debug, marker::PhantomData, prelude::*}; /// Messages proof from bridged chain. diff --git a/primitives/parachains/Cargo.toml b/primitives/parachains/Cargo.toml index 6cd138c6224..40d62ff4138 100644 --- a/primitives/parachains/Cargo.toml +++ b/primitives/parachains/Cargo.toml @@ -2,8 +2,8 @@ name = "bp-parachains" description = "Primitives of parachains module." version = "0.1.0" -authors = ["Parity Technologies "] -edition = "2021" +authors.workspace = true +edition.workspace = true license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] @@ -25,7 +25,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [features] -default = ["std"] +default = [ "std" ] std = [ "bp-header-chain/std", "bp-polkadot-core/std", diff --git a/primitives/parachains/src/lib.rs b/primitives/parachains/src/lib.rs index 2c96a3b31dd..692bbd99ece 100644 --- a/primitives/parachains/src/lib.rs +++ b/primitives/parachains/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -30,10 +30,10 @@ use bp_runtime::{ StorageMapKeyProvider, }; use codec::{Decode, Encode, MaxEncodedLen}; -use frame_support::{Blake2_128Concat, RuntimeDebug, Twox64Concat}; +use frame_support::{Blake2_128Concat, Twox64Concat}; use scale_info::TypeInfo; use sp_core::storage::StorageKey; -use sp_runtime::traits::Header as HeaderT; +use sp_runtime::{traits::Header as HeaderT, RuntimeDebug}; use sp_std::{marker::PhantomData, prelude::*}; /// Best known parachain head hash. diff --git a/primitives/polkadot-core/Cargo.toml b/primitives/polkadot-core/Cargo.toml index b7ba4803473..694b78d1a07 100644 --- a/primitives/polkadot-core/Cargo.toml +++ b/primitives/polkadot-core/Cargo.toml @@ -2,8 +2,8 @@ name = "bp-polkadot-core" description = "Primitives of Polkadot-like runtime." version = "0.1.0" -authors = ["Parity Technologies "] -edition = "2021" +authors.workspace = true +edition.workspace = true license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] @@ -29,13 +29,13 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", d hex = "0.4" [features] -default = ["std"] +default = [ "std" ] std = [ "bp-messages/std", "bp-runtime/std", + "codec/std", "frame-support/std", "frame-system/std", - "codec/std", "parity-util-mem", "scale-info/std", "serde", diff --git a/primitives/polkadot-core/src/lib.rs b/primitives/polkadot-core/src/lib.rs index cb89625bfcd..4fec1e3660d 100644 --- a/primitives/polkadot-core/src/lib.rs +++ b/primitives/polkadot-core/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/primitives/polkadot-core/src/parachains.rs b/primitives/polkadot-core/src/parachains.rs index f3e24bb3502..18d7617c69d 100644 --- a/primitives/polkadot-core/src/parachains.rs +++ b/primitives/polkadot-core/src/parachains.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -24,9 +24,9 @@ use bp_runtime::{Size, UnverifiedStorageProof}; use codec::{CompactAs, Decode, Encode, MaxEncodedLen}; -use frame_support::RuntimeDebug; use scale_info::TypeInfo; use sp_core::Hasher; +use sp_runtime::RuntimeDebug; use sp_std::vec::Vec; #[cfg(feature = "std")] diff --git a/primitives/relayers/Cargo.toml b/primitives/relayers/Cargo.toml index fd2c9e19f98..6be26ec96b0 100644 --- a/primitives/relayers/Cargo.toml +++ b/primitives/relayers/Cargo.toml @@ -2,8 +2,8 @@ name = "bp-relayers" description = "Primitives of relayers module." version = "0.1.0" -authors = ["Parity Technologies "] -edition = "2021" +authors.workspace = true +edition.workspace = true license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] @@ -26,7 +26,7 @@ hex = "0.4" hex-literal = "0.4" [features] -default = ["std"] +default = [ "std" ] std = [ "bp-messages/std", "bp-runtime/std", diff --git a/primitives/relayers/src/lib.rs b/primitives/relayers/src/lib.rs index d80e9e0350c..c41d1d6b886 100644 --- a/primitives/relayers/src/lib.rs +++ b/primitives/relayers/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/primitives/relayers/src/registration.rs b/primitives/relayers/src/registration.rs index 7ab20844bdf..bc2d0d127ae 100644 --- a/primitives/relayers/src/registration.rs +++ b/primitives/relayers/src/registration.rs @@ -1,4 +1,4 @@ -// Copyright 2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/primitives/runtime/Cargo.toml b/primitives/runtime/Cargo.toml index a795613a4f8..cea035591a5 100644 --- a/primitives/runtime/Cargo.toml +++ b/primitives/runtime/Cargo.toml @@ -2,14 +2,15 @@ name = "bp-runtime" description = "Primitives that may be used at (bridges) runtime level." version = "0.1.0" -authors = ["Parity Technologies "] -edition = "2021" +authors.workspace = true +edition.workspace = true license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false } hash-db = { version = "0.16.0", default-features = false } impl-trait-for-tuples = "0.2.2" +log = { version = "0.4.19", default-features = false } num-traits = { version = "0.2", default-features = false } scale-info = { version = "2.9.0", default-features = false, features = ["derive", "serde"] } serde = { version = "1.0", default-features = false, features = ["alloc", "derive"] } @@ -30,20 +31,21 @@ trie-db = { version = "0.27.1", default-features = false } hex-literal = "0.4" [features] -default = ["std"] +default = [ "std" ] std = [ "codec/std", "frame-support/std", "frame-system/std", "hash-db/std", + "log/std", "num-traits/std", "scale-info/std", "serde/std", "sp-core/std", "sp-io/std", "sp-runtime/std", - "sp-std/std", "sp-state-machine/std", + "sp-std/std", "sp-trie/std", "trie-db/std", ] diff --git a/primitives/runtime/src/chain.rs b/primitives/runtime/src/chain.rs index 0b0de79c2d1..a251e51fde5 100644 --- a/primitives/runtime/src/chain.rs +++ b/primitives/runtime/src/chain.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -16,14 +16,14 @@ use crate::{ChainId, HeaderIdProvider}; use codec::{Decode, Encode, MaxEncodedLen}; -use frame_support::{weights::Weight, Parameter, StateVersion}; +use frame_support::{weights::Weight, Parameter}; use num_traits::{AsPrimitive, Bounded, CheckedSub, Saturating, SaturatingAdd, Zero}; use sp_runtime::{ traits::{ AtLeast32Bit, AtLeast32BitUnsigned, Hash as HashT, Header as HeaderT, MaybeDisplay, MaybeSerialize, MaybeSerializeDeserialize, Member, SimpleBitOps, Verify, }, - FixedPointOperand, + FixedPointOperand, StateVersion, }; use sp_std::{convert::TryFrom, fmt::Debug, hash::Hash, str::FromStr, vec, vec::Vec}; diff --git a/primitives/runtime/src/extensions.rs b/primitives/runtime/src/extensions.rs index fbe9b17cddf..63c244c5863 100644 --- a/primitives/runtime/src/extensions.rs +++ b/primitives/runtime/src/extensions.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/primitives/runtime/src/lib.rs b/primitives/runtime/src/lib.rs index 873b24e9241..2189e599725 100644 --- a/primitives/runtime/src/lib.rs +++ b/primitives/runtime/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -21,14 +21,16 @@ use codec::{Decode, Encode, FullCodec, MaxEncodedLen}; use frame_support::{ - log, pallet_prelude::DispatchResult, weights::Weight, PalletError, RuntimeDebug, StorageHasher, - StorageValue, + pallet_prelude::DispatchResult, weights::Weight, PalletError, StorageHasher, StorageValue, }; use frame_system::RawOrigin; use scale_info::TypeInfo; use serde::{Deserialize, Serialize}; use sp_core::storage::StorageKey; -use sp_runtime::traits::{BadOrigin, Header as HeaderT, UniqueSaturatedInto}; +use sp_runtime::{ + traits::{BadOrigin, Header as HeaderT, UniqueSaturatedInto}, + RuntimeDebug, +}; use sp_std::{convert::TryFrom, fmt::Debug, ops::RangeInclusive, vec, vec::Vec}; pub use chain::{ diff --git a/primitives/runtime/src/messages.rs b/primitives/runtime/src/messages.rs index d3085829578..0f219e984f7 100644 --- a/primitives/runtime/src/messages.rs +++ b/primitives/runtime/src/messages.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -17,8 +17,9 @@ //! Primitives that may be used by different message delivery and dispatch mechanisms. use codec::{Decode, Encode}; -use frame_support::{weights::Weight, RuntimeDebug}; +use frame_support::weights::Weight; use scale_info::TypeInfo; +use sp_runtime::RuntimeDebug; /// Message dispatch result. #[derive(Encode, Decode, RuntimeDebug, Clone, PartialEq, Eq, TypeInfo)] diff --git a/primitives/runtime/src/storage_proof.rs b/primitives/runtime/src/storage_proof.rs index e4836862132..53494da696c 100644 --- a/primitives/runtime/src/storage_proof.rs +++ b/primitives/runtime/src/storage_proof.rs @@ -1,4 +1,4 @@ -// Copyright 2019-2023 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -16,9 +16,9 @@ //! Logic for working with storage proofs. -use frame_support::{PalletError, StateVersion}; +use frame_support::PalletError; use sp_core::{storage::TrackedStorageKey, RuntimeDebug}; -use sp_runtime::SaturatedConversion; +use sp_runtime::{SaturatedConversion, StateVersion}; use sp_std::{default::Default, vec, vec::Vec}; use sp_trie::{ generate_trie_proof, verify_trie_proof, LayoutV0, LayoutV1, StorageProof, TrieDBBuilder, diff --git a/primitives/runtime/src/storage_types.rs b/primitives/runtime/src/storage_types.rs index b37f779d00b..91c5451805a 100644 --- a/primitives/runtime/src/storage_types.rs +++ b/primitives/runtime/src/storage_types.rs @@ -1,4 +1,4 @@ -// Copyright 2022 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify @@ -18,8 +18,9 @@ //! during conversion. use codec::{Decode, Encode, MaxEncodedLen}; -use frame_support::{traits::Get, RuntimeDebug}; +use frame_support::traits::Get; use scale_info::{Type, TypeInfo}; +use sp_runtime::RuntimeDebug; use sp_std::{marker::PhantomData, ops::Deref}; /// Error that is returned when the value size exceeds maximal configured size. diff --git a/primitives/test-utils/Cargo.toml b/primitives/test-utils/Cargo.toml index 76a6ea269d5..b7a60746111 100644 --- a/primitives/test-utils/Cargo.toml +++ b/primitives/test-utils/Cargo.toml @@ -1,9 +1,10 @@ [package] name = "bp-test-utils" version = "0.1.0" -authors = ["Parity Technologies "] -edition = "2021" +authors.workspace = true +edition.workspace = true license = "GPL-3.0-or-later WITH Classpath-exception-2.0" +publish = false [dependencies] bp-header-chain = { path = "../header-chain", default-features = false } @@ -21,10 +22,12 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", d sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } [features] -default = ["std"] +default = [ "std" ] std = [ "bp-header-chain/std", + "bp-parachains/std", "bp-polkadot-core/std", + "bp-runtime/std", "codec/std", "ed25519-dalek/std", "finality-grandpa/std", @@ -33,4 +36,5 @@ std = [ "sp-core/std", "sp-runtime/std", "sp-std/std", + "sp-trie/std", ] diff --git a/primitives/test-utils/src/keyring.rs b/primitives/test-utils/src/keyring.rs index 3c8c04d0aa5..841074987b6 100644 --- a/primitives/test-utils/src/keyring.rs +++ b/primitives/test-utils/src/keyring.rs @@ -1,4 +1,4 @@ -// Copyright 2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/primitives/test-utils/src/lib.rs b/primitives/test-utils/src/lib.rs index faab70cbce3..c3cb15d85d3 100644 --- a/primitives/test-utils/src/lib.rs +++ b/primitives/test-utils/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2021 Parity Technologies (UK) Ltd. +// Copyright (C) Parity Technologies (UK) Ltd. // This file is part of Parity Bridges Common. // Parity Bridges Common is free software: you can redistribute it and/or modify diff --git a/relays/client-substrate/src/test_chain.rs b/relays/client-substrate/src/test_chain.rs index ba85cf180f9..c9e6227744c 100644 --- a/relays/client-substrate/src/test_chain.rs +++ b/relays/client-substrate/src/test_chain.rs @@ -23,7 +23,8 @@ use crate::{Chain, ChainWithBalances}; use bp_runtime::ChainId; -use frame_support::{weights::Weight, StateVersion}; +use frame_support::weights::Weight; +use sp_runtime::StateVersion; use std::time::Duration; /// Chain that may be used in tests.